diff options
| -rw-r--r-- | arch/arm/mach-mx3/mach-pcm043.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c index b3ecfb22d241..036ba1a4704b 100644 --- a/arch/arm/mach-mx3/mach-pcm043.c +++ b/arch/arm/mach-mx3/mach-pcm043.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <mach/mx3fb.h> | 40 | #include <mach/mx3fb.h> |
| 41 | #include <mach/ulpi.h> | 41 | #include <mach/ulpi.h> |
| 42 | #include <mach/audmux.h> | 42 | #include <mach/audmux.h> |
| 43 | #include <mach/esdhc.h> | ||
| 43 | 44 | ||
| 44 | #include "devices-imx35.h" | 45 | #include "devices-imx35.h" |
| 45 | #include "devices.h" | 46 | #include "devices.h" |
| @@ -217,11 +218,15 @@ static iomux_v3_cfg_t pcm043_pads[] = { | |||
| 217 | MX35_PAD_SD1_DATA1__ESDHC1_DAT1, | 218 | MX35_PAD_SD1_DATA1__ESDHC1_DAT1, |
| 218 | MX35_PAD_SD1_DATA2__ESDHC1_DAT2, | 219 | MX35_PAD_SD1_DATA2__ESDHC1_DAT2, |
| 219 | MX35_PAD_SD1_DATA3__ESDHC1_DAT3, | 220 | MX35_PAD_SD1_DATA3__ESDHC1_DAT3, |
| 221 | MX35_PAD_ATA_DATA10__GPIO2_23, /* WriteProtect */ | ||
| 222 | MX35_PAD_ATA_DATA11__GPIO2_24, /* CardDetect */ | ||
| 220 | }; | 223 | }; |
| 221 | 224 | ||
| 222 | #define AC97_GPIO_TXFS IMX_GPIO_NR(2, 31) | 225 | #define AC97_GPIO_TXFS IMX_GPIO_NR(2, 31) |
| 223 | #define AC97_GPIO_TXD IMX_GPIO_NR(2, 28) | 226 | #define AC97_GPIO_TXD IMX_GPIO_NR(2, 28) |
| 224 | #define AC97_GPIO_RESET IMX_GPIO_NR(2, 0) | 227 | #define AC97_GPIO_RESET IMX_GPIO_NR(2, 0) |
| 228 | #define SD1_GPIO_WP IMX_GPIO_NR(2, 23) | ||
| 229 | #define SD1_GPIO_CD IMX_GPIO_NR(2, 24) | ||
| 225 | 230 | ||
| 226 | static void pcm043_ac97_warm_reset(struct snd_ac97 *ac97) | 231 | static void pcm043_ac97_warm_reset(struct snd_ac97 *ac97) |
| 227 | { | 232 | { |
| @@ -346,6 +351,11 @@ static int __init pcm043_otg_mode(char *options) | |||
| 346 | } | 351 | } |
| 347 | __setup("otg_mode=", pcm043_otg_mode); | 352 | __setup("otg_mode=", pcm043_otg_mode); |
| 348 | 353 | ||
| 354 | static struct esdhc_platform_data sd1_pdata = { | ||
| 355 | .wp_gpio = SD1_GPIO_WP, | ||
| 356 | .cd_gpio = SD1_GPIO_CD, | ||
| 357 | }; | ||
| 358 | |||
| 349 | /* | 359 | /* |
| 350 | * Board specific initialization. | 360 | * Board specific initialization. |
| 351 | */ | 361 | */ |
| @@ -395,7 +405,7 @@ static void __init pcm043_init(void) | |||
| 395 | imx35_add_fsl_usb2_udc(&otg_device_pdata); | 405 | imx35_add_fsl_usb2_udc(&otg_device_pdata); |
| 396 | 406 | ||
| 397 | imx35_add_flexcan1(NULL); | 407 | imx35_add_flexcan1(NULL); |
| 398 | imx35_add_sdhci_esdhc_imx(0, NULL); | 408 | imx35_add_sdhci_esdhc_imx(0, &sd1_pdata); |
| 399 | } | 409 | } |
| 400 | 410 | ||
| 401 | static void __init pcm043_timer_init(void) | 411 | static void __init pcm043_timer_init(void) |
