PXA: Kill last remnants of set_GPIO_mode function

GPIO configuration shall never be done inside a driver, never.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Albert ARIBAUD <albert.u.boot@aribaud.net>

diff --git a/board/lubbock/lubbock.c b/board/lubbock/lubbock.c
index 437f9447159d5e655bcc2212d42c0d9b41f0b558..3527b381df6ddaf843386ce2d39b79f6b8433b72 100644 (file)
--- a/board/lubbock/lubbock.c
+++ b/board/lubbock/lubbock.c
@@ -28,6 +28,8 @@
 #include <common.h>
 #include <netdev.h>
 #include <asm/arch/pxa.h>
+#include <asm/arch/pxa-regs.h>
+#include <asm/io.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -47,6 +49,10 @@ int board_init (void)
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0xa0000100;
 
+       /* Configure GPIO6 and GPIO8 as OUT, AF1. */
+       setbits_le32(GPDR0, (1 << 6) | (1 << 8));
+       clrsetbits_le32(GAFR0_L, (3 << 12) | (3 << 16), (1 << 12) | (1 << 16));
+
        return 0;
 }
 

diff --git a/drivers/mmc/pxa_mmc.c b/drivers/mmc/pxa_mmc.c
index 2b58a98ac38afeeed8281d3f155b97ea36a60949..80c4445034eff59327adb4ec85ebb2cc10c366fb 100644 (file)
--- a/drivers/mmc/pxa_mmc.c
+++ b/drivers/mmc/pxa_mmc.c
@@ -560,11 +560,6 @@ mmc_legacy_init(int verbose)
        /* Reset device interface type */
        mmc_dev.if_type = IF_TYPE_UNKNOWN;
 
-#if defined(CONFIG_LUBBOCK) || \
-       (defined(CONFIG_GUMSTIX) && !defined(CONFIG_CPU_PXA27X))
-       set_GPIO_mode(GPIO6_MMCCLK_MD);
-       set_GPIO_mode(GPIO8_MMCCS0_MD);
-#endif
 #ifdef CONFIG_CPU_MONAHANS     /* pxa3xx */
        writel(readl(CKENA) | CKENA_12_MMC0 | CKENA_13_MMC1, CKENA);
 #else  /* pxa2xx */