1 files changed, 7 insertions, 58 deletions

diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index d1ae6a09979d..68c8375e45c6 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/arch/arm/mach-ux500/board-mop500-sdi.c
@@ -12,59 +12,14 @@
 #include <linux/mmc/host.h>
 #include <linux/platform_device.h>
 
-#include <plat/pincfg.h>
 #include <plat/ste_dma40.h>
 #include <mach/devices.h>
 #include <mach/hardware.h>
 
 #include "devices-db8500.h"
-#include "pins-db8500.h"
 #include "board-mop500.h"
 #include "ste-dma40-db8500.h"
 
-static pin_cfg_t mop500_sdi_pins[] = {
-        /* SDI0 (MicroSD slot) */
-        GPIO18_MC0_CMDDIR,
-        GPIO19_MC0_DAT0DIR,
-        GPIO20_MC0_DAT2DIR,
-        GPIO21_MC0_DAT31DIR,
-        GPIO22_MC0_FBCLK,
-        GPIO23_MC0_CLK,
-        GPIO24_MC0_CMD,
-        GPIO25_MC0_DAT0,
-        GPIO26_MC0_DAT1,
-        GPIO27_MC0_DAT2,
-        GPIO28_MC0_DAT3,
-
-        /* SDI4 (on-board eMMC) */
-        GPIO197_MC4_DAT3,
-        GPIO198_MC4_DAT2,
-        GPIO199_MC4_DAT1,
-        GPIO200_MC4_DAT0,
-        GPIO201_MC4_CMD,
-        GPIO202_MC4_FBCLK,
-        GPIO203_MC4_CLK,
-        GPIO204_MC4_DAT7,
-        GPIO205_MC4_DAT6,
-        GPIO206_MC4_DAT5,
-        GPIO207_MC4_DAT4,
-};
-
-static pin_cfg_t mop500_sdi2_pins[] = {
-        /* SDI2 (POP eMMC) */
-        GPIO128_MC2_CLK,
-        GPIO129_MC2_CMD,
-        GPIO130_MC2_FBCLK,
-        GPIO131_MC2_DAT0,
-        GPIO132_MC2_DAT1,
-        GPIO133_MC2_DAT2,
-        GPIO134_MC2_DAT3,
-        GPIO135_MC2_DAT4,
-        GPIO136_MC2_DAT5,
-        GPIO137_MC2_DAT6,
-        GPIO138_MC2_DAT7,
-};
-
 /*
  * SDI 0 (MicroSD slot)
  */
@@ -216,22 +171,16 @@ static struct mmci_platform_data mop500_sdi4_data = {
 
 void __init mop500_sdi_init(void)
 {
-        nmk_config_pins(mop500_sdi_pins, ARRAY_SIZE(mop500_sdi_pins));
+        /* PoP:ed eMMC on top of DB8500 v1.0 has problems with high speed */
+        if (!cpu_is_u8500v10())
+                mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED;
+        db8500_add_sdi2(&mop500_sdi2_data);
+
+        /* On-board eMMC */
+        db8500_add_sdi4(&mop500_sdi4_data);
 
         /*
          * sdi0 will finally be added when the TC35892 initializes and calls
          * mop500_sdi_tc35892_init() above.
          */
-
-        /* PoP:ed eMMC */
-        if (!cpu_is_u8500ed()) {
-                nmk_config_pins(mop500_sdi2_pins, ARRAY_SIZE(mop500_sdi2_pins));
-                /* POP eMMC on v1.0 has problems with high speed */
-                if (!cpu_is_u8500v10())
-                        mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED;
-                db8500_add_sdi2(&mop500_sdi2_data);
-        }
-
-        /* On-board eMMC */
-        db8500_add_sdi4(&mop500_sdi4_data);
 }