AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARM: pxa/colibri: use correct SD detect pin

Browse Source 
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>
This commit is contained in:
Bjørn Forsman 2010-12-23 16:01:02 +01:00 committed by Eric Miao
parent 0c7fbbe1a1
commit 57834a7224
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-pxa/colibri-evalboard.c
View File

@ -50,7 +50,7 @@ static void __init colibri_mmc_init(void)
GPIO0_COLIBRI_PXA270_SD_DETECT; GPIO0_COLIBRI_PXA270_SD_DETECT;
if (machine_is_colibri300()) /* PXA300 Colibri */ if (machine_is_colibri300()) /* PXA300 Colibri */
colibri_mci_platform_data.gpio_card_detect = colibri_mci_platform_data.gpio_card_detect =
GPIO39_COLIBRI_PXA300_SD_DETECT; GPIO13_COLIBRI_PXA300_SD_DETECT;
else /* PXA320 Colibri */ else /* PXA320 Colibri */
colibri_mci_platform_data.gpio_card_detect = colibri_mci_platform_data.gpio_card_detect =
GPIO28_COLIBRI_PXA320_SD_DETECT; GPIO28_COLIBRI_PXA320_SD_DETECT;

2
arch/arm/mach-pxa/colibri-pxa300.c
View File

@ -41,7 +41,7 @@ static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = {
GPIO4_MMC1_DAT1, GPIO4_MMC1_DAT1,
GPIO5_MMC1_DAT2, GPIO5_MMC1_DAT2,
GPIO6_MMC1_DAT3, GPIO6_MMC1_DAT3,
GPIO39_GPIO, /* SD detect */ GPIO13_GPIO, /* GPIO13_COLIBRI_PXA300_SD_DETECT */
/* UHC */ /* UHC */
GPIO0_2_USBH_PEN, GPIO0_2_USBH_PEN,

2
arch/arm/mach-pxa/include/mach/colibri.h
View File

@ -60,7 +60,7 @@ static inline void colibri_pxa3xx_init_nand(void) {}
#define GPIO113_COLIBRI_PXA270_TS_IRQ 113 #define GPIO113_COLIBRI_PXA270_TS_IRQ 113
/* GPIO definitions for Colibri PXA300/310 */ /* GPIO definitions for Colibri PXA300/310 */
#define GPIO39_COLIBRI_PXA300_SD_DETECT 39 #define GPIO13_COLIBRI_PXA300_SD_DETECT 13
/* GPIO definitions for Colibri PXA320 */ /* GPIO definitions for Colibri PXA320 */
#define GPIO28_COLIBRI_PXA320_SD_DETECT 28 #define GPIO28_COLIBRI_PXA320_SD_DETECT 28