From: Thomas Weber Date: Tue, 6 Sep 2011 15:11:49 +0000 (+0200) Subject: ARM: OMAP: Devkit8000: Remove double omap_mux_init_gpio X-Git-Tag: MMI-PSA29.97-13-9~18066^2~6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e9614f35ba0f50d985fc27cbbafcb0346e1d4daa;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ARM: OMAP: Devkit8000: Remove double omap_mux_init_gpio Remove the init of card detect pin because omap_mux_init_gpio() is called during hsmmc initialization for the write protect and card detect pin. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 42918940c530..90154e411da0 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c @@ -226,7 +226,6 @@ static int devkit8000_twl_gpio_setup(struct device *dev, { int ret; - omap_mux_init_gpio(29, OMAP_PIN_INPUT); /* gpio + 0 is "mmc0_cd" (input/IRQ) */ mmc[0].gpio_cd = gpio + 0; omap2_hsmmc_init(mmc);