ARM: kirkwood: nsa310: convert to pinctrl

Signed-off-by: Jason Cooper <jason@lakedaemon.net>

3 files changed, 0 insertions, 35 deletions

diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 05b3b7ea41f7..2e73e9d53f70 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -144,9 +144,6 @@ static void __init kirkwood_dt_init(void)
         if (of_machine_is_compatible("usi,topkick"))
                 usi_topkick_init();
 
-        if (of_machine_is_compatible("zyxel,nsa310"))
-                nsa310_init();
-
         of_platform_populate(NULL, kirkwood_dt_match_table, NULL, NULL);
 }
 
diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c
index 6966c86e0c34..544f83a46679 100644
--- a/arch/arm/mach-kirkwood/board-nsa310.c
+++ b/arch/arm/mach-kirkwood/board-nsa310.c
@@ -14,32 +14,6 @@
 #include <mach/kirkwood.h>
 #include <linux/of.h>
 #include "common.h"
-#include "mpp.h"
-
-static unsigned int nsa310_mpp_config[] __initdata = {
-        MPP12_GPIO, /* led esata green */
-        MPP13_GPIO, /* led esata red */
-        MPP15_GPIO, /* led usb green */
-        MPP16_GPIO, /* led usb red */
-        MPP21_GPIO, /* control usb power off */
-        MPP28_GPIO, /* led sys green */
-        MPP29_GPIO, /* led sys red */
-        MPP36_GPIO, /* key reset */
-        MPP37_GPIO, /* key copy */
-        MPP39_GPIO, /* led copy green */
-        MPP40_GPIO, /* led copy red */
-        MPP41_GPIO, /* led hdd green */
-        MPP42_GPIO, /* led hdd red */
-        MPP44_GPIO, /* ?? */
-        MPP46_GPIO, /* key power */
-        MPP48_GPIO, /* control power off */
-        0
-};
-
-void __init nsa310_init(void)
-{
-        kirkwood_mpp_conf(nsa310_mpp_config);
-}
 
 static int __init nsa310_pci_init(void)
 {
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
index 537bdf816af7..5ed70565c843 100644
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h
@@ -135,12 +135,6 @@ void ns2_init(void);
 static inline void ns2_init(void) {};
 #endif
 
-#ifdef CONFIG_MACH_NSA310_DT
-void nsa310_init(void);
-#else
-static inline void nsa310_init(void) {};
-#endif
-
 #ifdef CONFIG_MACH_OPENBLOCKS_A6_DT
 void openblocks_a6_init(void);
 #else