Commit a90c31a3 authored by Sascha Hauer's avatar Sascha Hauer

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 61533841
...@@ -39,7 +39,6 @@ static int pcm970_pins[] = { ...@@ -39,7 +39,6 @@ static int pcm970_pins[] = {
PB7_PF_SD2_D3, PB7_PF_SD2_D3,
PB8_PF_SD2_CMD, PB8_PF_SD2_CMD,
PB9_PF_SD2_CLK, PB9_PF_SD2_CLK,
GPIO_PORTC | 28 | GPIO_GPIO | GPIO_IN, /* card detect */
/* display */ /* display */
PA5_PF_LSCLK, PA5_PF_LSCLK,
PA6_PF_LD0, PA6_PF_LD0,
...@@ -228,6 +227,7 @@ void __init pcm970_baseboard_init(void) ...@@ -228,6 +227,7 @@ void __init pcm970_baseboard_init(void)
"PCM970"); "PCM970");
mxc_register_device(&mxc_fb_device, &pcm038_fb_data); 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); mxc_register_device(&mxc_sdhc_device1, &sdhc_pdata);
platform_device_register(&pcm970_sja1000); platform_device_register(&pcm970_sja1000);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment