Merge branch 'orion/cleanup' into orion/dt

[cascardo/linux.git] / arch / arm / mach-kirkwood / board-iconnect.c

diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
index 24f5aa7..c8ebde4 100644 (file)
--- a/arch/arm/mach-kirkwood/board-iconnect.c
+++ b/arch/arm/mach-kirkwood/board-iconnect.c
@@ -13,31 +13,13 @@
 #include <linux/of.h>
 #include <linux/mv643xx_eth.h>
 #include "common.h"
-#include "mpp.h"
 
 static struct mv643xx_eth_platform_data iconnect_ge00_data = {
        .phy_addr       = MV643XX_ETH_PHY_ADDR(11),
 };
 
-static unsigned int iconnect_mpp_config[] __initdata = {
-       MPP12_GPIO,
-       MPP35_GPIO,
-       MPP41_GPIO,
-       MPP42_GPIO,
-       MPP43_GPIO,
-       MPP44_GPIO,
-       MPP45_GPIO,
-       MPP46_GPIO,
-       MPP47_GPIO,
-       MPP48_GPIO,
-       0
-};
-
 void __init iconnect_init(void)
 {
-       kirkwood_mpp_conf(iconnect_mpp_config);
-
-       kirkwood_ehci_init();
        kirkwood_ge00_init(&iconnect_ge00_data);
 }