diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2010-12-23 10:01:02 -0500 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2011-02-09 10:05:03 -0500 |
| commit | 57834a722473848338b1967f7fdd9907c713b0a7 (patch) | |
| tree | 41b5680b150feeed439c5be95eebc7fc28a1babc /arch | |
| parent | 0c7fbbe1a15e419eb2f1a687444330c4016fdb8f (diff) | |
ARM: pxa/colibri: use correct SD detect pin
The use of wrong SD detect pin was introduced by this commit:
ARM: pxa: Push Colibri evalboard MFP into module files
This fixes it.
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/colibri-evalboard.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa300.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/colibri.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/colibri-evalboard.c b/arch/arm/mach-pxa/colibri-evalboard.c index 6b2c800a1133..28f667e52ef9 100644 --- a/arch/arm/mach-pxa/colibri-evalboard.c +++ b/arch/arm/mach-pxa/colibri-evalboard.c | |||
| @@ -50,7 +50,7 @@ static void __init colibri_mmc_init(void) | |||
| 50 | GPIO0_COLIBRI_PXA270_SD_DETECT; | 50 | GPIO0_COLIBRI_PXA270_SD_DETECT; |
| 51 | if (machine_is_colibri300()) /* PXA300 Colibri */ | 51 | if (machine_is_colibri300()) /* PXA300 Colibri */ |
| 52 | colibri_mci_platform_data.gpio_card_detect = | 52 | colibri_mci_platform_data.gpio_card_detect = |
| 53 | GPIO39_COLIBRI_PXA300_SD_DETECT; | 53 | GPIO13_COLIBRI_PXA300_SD_DETECT; |
| 54 | else /* PXA320 Colibri */ | 54 | else /* PXA320 Colibri */ |
| 55 | colibri_mci_platform_data.gpio_card_detect = | 55 | colibri_mci_platform_data.gpio_card_detect = |
| 56 | GPIO28_COLIBRI_PXA320_SD_DETECT; | 56 | GPIO28_COLIBRI_PXA320_SD_DETECT; |
diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c index fddb16d07eb0..66dd81cbc8a0 100644 --- a/arch/arm/mach-pxa/colibri-pxa300.c +++ b/arch/arm/mach-pxa/colibri-pxa300.c | |||
| @@ -41,7 +41,7 @@ static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = { | |||
| 41 | GPIO4_MMC1_DAT1, | 41 | GPIO4_MMC1_DAT1, |
| 42 | GPIO5_MMC1_DAT2, | 42 | GPIO5_MMC1_DAT2, |
| 43 | GPIO6_MMC1_DAT3, | 43 | GPIO6_MMC1_DAT3, |
| 44 | GPIO39_GPIO, /* SD detect */ | 44 | GPIO13_GPIO, /* GPIO13_COLIBRI_PXA300_SD_DETECT */ |
| 45 | 45 | ||
| 46 | /* UHC */ | 46 | /* UHC */ |
| 47 | GPIO0_2_USBH_PEN, | 47 | GPIO0_2_USBH_PEN, |
diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h index 388a96f1ef93..cb4236e98a0f 100644 --- a/arch/arm/mach-pxa/include/mach/colibri.h +++ b/arch/arm/mach-pxa/include/mach/colibri.h | |||
| @@ -60,7 +60,7 @@ static inline void colibri_pxa3xx_init_nand(void) {} | |||
| 60 | #define GPIO113_COLIBRI_PXA270_TS_IRQ 113 | 60 | #define GPIO113_COLIBRI_PXA270_TS_IRQ 113 |
| 61 | 61 | ||
| 62 | /* GPIO definitions for Colibri PXA300/310 */ | 62 | /* GPIO definitions for Colibri PXA300/310 */ |
| 63 | #define GPIO39_COLIBRI_PXA300_SD_DETECT 39 | 63 | #define GPIO13_COLIBRI_PXA300_SD_DETECT 13 |
| 64 | 64 | ||
| 65 | /* GPIO definitions for Colibri PXA320 */ | 65 | /* GPIO definitions for Colibri PXA320 */ |
| 66 | #define GPIO28_COLIBRI_PXA320_SD_DETECT 28 | 66 | #define GPIO28_COLIBRI_PXA320_SD_DETECT 28 |