Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57834a72 authored by Bjørn Forsman's avatar Bjørn Forsman Committed by Eric Miao
Browse files

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: default avatarEric Miao <eric.y.miao@gmail.com>
parent 0c7fbbe1

arch/arm/mach-pxa/colibri-evalboard.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static void __init colibri_mmc_init(void) 
			GPIO0_COLIBRI_PXA270_SD_DETECT;

	if (machine_is_colibri300())	/* PXA300 Colibri */

		colibri_mci_platform_data.gpio_card_detect =

			GPIO39_COLIBRI_PXA300_SD_DETECT;

			GPIO13_COLIBRI_PXA300_SD_DETECT;

	else				/* PXA320 Colibri */

		colibri_mci_platform_data.gpio_card_detect =

			GPIO28_COLIBRI_PXA320_SD_DETECT;

arch/arm/mach-pxa/colibri-pxa300.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = { 
	GPIO4_MMC1_DAT1,

	GPIO5_MMC1_DAT2,

	GPIO6_MMC1_DAT3,

	GPIO39_GPIO,	/* SD detect */

	GPIO13_GPIO,	/* GPIO13_COLIBRI_PXA300_SD_DETECT */



	/* UHC */

	GPIO0_2_USBH_PEN,

arch/arm/mach-pxa/include/mach/colibri.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static inline void colibri_pxa3xx_init_nand(void) {} 
#define GPIO113_COLIBRI_PXA270_TS_IRQ	113



/* 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 */

#define GPIO28_COLIBRI_PXA320_SD_DETECT	28