aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-10-06 09:18:17 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-10-13 10:24:07 +0200
commita90c31a3b70bcef915ffddacb8cbb4e63de33415 (patch)
tree6092e712e30d97db4cb9c44b72e4e2a9450e48ed
parent6153384161222c855bb95ca3eee3b3d89ae2c9dd (diff)
downloadkernel_samsung_smdk4412-a90c31a3b70bcef915ffddacb8cbb4e63de33415.zip
kernel_samsung_smdk4412-a90c31a3b70bcef915ffddacb8cbb4e63de33415.tar.gz
kernel_samsung_smdk4412-a90c31a3b70bcef915ffddacb8cbb4e63de33415.tar.bz2
pcm970 mmc: Fix ro switch
We have to use mxc_gpio_mode() for the card detection pin instead of mxc_gpio_setup_multiple_pins() because the latter does a gpio_request() and thus a later gpio_request() fails. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-mx2/pcm970-baseboard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/pcm970-baseboard.c b/arch/arm/mach-mx2/pcm970-baseboard.c
index c261f59..3cb7f45 100644
--- a/arch/arm/mach-mx2/pcm970-baseboard.c
+++ b/arch/arm/mach-mx2/pcm970-baseboard.c
@@ -39,7 +39,6 @@ static int pcm970_pins[] = {
PB7_PF_SD2_D3,
PB8_PF_SD2_CMD,
PB9_PF_SD2_CLK,
- GPIO_PORTC | 28 | GPIO_GPIO | GPIO_IN, /* card detect */
/* display */
PA5_PF_LSCLK,
PA6_PF_LD0,
@@ -228,6 +227,7 @@ void __init pcm970_baseboard_init(void)
"PCM970");
mxc_register_device(&mxc_fb_device, &pcm038_fb_data);
+ mxc_gpio_mode(GPIO_PORTC | 28 | GPIO_GPIO | GPIO_IN);
mxc_register_device(&mxc_sdhc_device1, &sdhc_pdata);
platform_device_register(&pcm970_sja1000);
}