Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-kirkwood / board-usi_topkick.c

diff --git a/arch/arm/mach-kirkwood/board-usi_topkick.c b/arch/arm/mach-kirkwood/board-usi_topkick.c
index 23d2dd1b1b1ed4079d61d20fd60ec898d9901de9..1cc04ec33f0b77d2363694e62fa8f81a153716fe 100644 (file)
--- a/arch/arm/mach-kirkwood/board-usi_topkick.c
+++ b/arch/arm/mach-kirkwood/board-usi_topkick.c
@@ -14,64 +14,16 @@
 #include <linux/init.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/gpio.h>
-#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
-#include "mpp.h"
 
 static struct mv643xx_eth_platform_data topkick_ge00_data = {
        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
 };
 
-static struct mvsdio_platform_data topkick_mvsdio_data = {
-       /* unfortunately the CD signal has not been connected */
-};
-
-/*
- * GPIO LED layout
- *
- *       /-SYS_LED(2)
- *       |
- *       |   /-DISK_LED
- *       |   |
- *       |   |   /-WLAN_LED(2)
- *       |   |   |
- * [SW] [*] [*] [*]
- */
-
-/*
- * Switch positions
- *
- *     /-SW_LEFT
- *     |
- *     |   /-SW_IDLE
- *     |   |
- *     |   |   /-SW_RIGHT
- *     |   |   |
- * PS [L] [I] [R] LEDS
- */
-
-static unsigned int topkick_mpp_config[] __initdata = {
-       MPP21_GPIO,     /* DISK_LED           (low active) - yellow */
-       MPP36_GPIO,     /* SATA0 power enable (high active) */
-       MPP37_GPIO,     /* SYS_LED2           (low active) - red */
-       MPP38_GPIO,     /* SYS_LED            (low active) - blue */
-       MPP39_GPIO,     /* WLAN_LED           (low active) - green */
-       MPP43_GPIO,     /* SW_LEFT            (low active) */
-       MPP44_GPIO,     /* SW_RIGHT           (low active) */
-       MPP45_GPIO,     /* SW_IDLE            (low active) */
-       MPP46_GPIO,     /* SW_LEFT            (low active) */
-       MPP48_GPIO,     /* WLAN_LED2          (low active) - yellow */
-       0
-};
-
 void __init usi_topkick_init(void)
 {
        /*
         * Basic setup. Needs to be called early.
         */
-       kirkwood_mpp_conf(topkick_mpp_config);
-
-
        kirkwood_ge00_init(&topkick_ge00_data);
-       kirkwood_sdio_init(&topkick_mvsdio_data);
 }