1 files changed, 0 insertions, 26 deletions
diff --git a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c
index 1750e68506c1..329ff682e4e6 100644
--- a/arch/arm/mach-kirkwood/board-ts219.c
+++ b/arch/arm/mach-kirkwood/board-ts219.c
@@ -26,47 +26,21 @@
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
 #include "common.h"
-#include "mpp.h"
 #include "tsx1x-common.h"
 static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = {
        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
 };
-static unsigned int qnap_ts219_mpp_config[] __initdata = {
-        MPP0_SPI_SCn,
-        MPP1_SPI_MOSI,
-        MPP2_SPI_SCK,
-        MPP3_SPI_MISO,
-        MPP4_SATA1_ACTn,
-        MPP5_SATA0_ACTn,
-        MPP8_TW0_SDA,
-        MPP9_TW0_SCK,
-        MPP10_UART0_TXD,
-        MPP11_UART0_RXD,
-        MPP13_UART1_TXD,        /* PIC controller */
-        MPP14_UART1_RXD,        /* PIC controller */
-        MPP15_GPIO,             /* USB Copy button (on devices with 88F6281) */
-        MPP16_GPIO,             /* Reset button (on devices with 88F6281) */
-        MPP36_GPIO,             /* RAM: 0: 256 MB, 1: 512 MB */
-        MPP37_GPIO,             /* Reset button (on devices with 88F6282) */
-        MPP43_GPIO,             /* USB Copy button (on devices with 88F6282) */
-        MPP44_GPIO,             /* Board ID: 0: TS-11x, 1: TS-21x */
-        0
-};
 void __init qnap_dt_ts219_init(void)
 {
        u32 dev, rev;
-        kirkwood_mpp_conf(qnap_ts219_mpp_config);
        kirkwood_pcie_id(&dev, &rev);
        if (dev == MV88F6282_DEV_ID)
                qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
        kirkwood_ge00_init(&qnap_ts219_ge00_data);
-        kirkwood_ehci_init();
        pm_power_off = qnap_tsx1x_power_off;
 }

diff --git a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c index 1750e68506c1..329ff682e4e6 100644 --- a/arch/arm/mach-kirkwood/board-ts219.c +++ b/arch/arm/mach-kirkwood/board-ts219.c
@@ -26,47 +26,21 @@
26	#include <asm/mach/arch.h>	26	#include <asm/mach/arch.h>
27	#include <mach/kirkwood.h>	27	#include <mach/kirkwood.h>
28	#include "common.h"	28	#include "common.h"
29	#include "mpp.h"
30	#include "tsx1x-common.h"	29	#include "tsx1x-common.h"
31		30
32	static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = {	31	static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = {
33	.phy_addr = MV643XX_ETH_PHY_ADDR(8),	32	.phy_addr = MV643XX_ETH_PHY_ADDR(8),
34	};	33	};
35		34
36	static unsigned int qnap_ts219_mpp_config[] __initdata = {
37	MPP0_SPI_SCn,
38	MPP1_SPI_MOSI,
39	MPP2_SPI_SCK,
40	MPP3_SPI_MISO,
41	MPP4_SATA1_ACTn,
42	MPP5_SATA0_ACTn,
43	MPP8_TW0_SDA,
44	MPP9_TW0_SCK,
45	MPP10_UART0_TXD,
46	MPP11_UART0_RXD,
47	MPP13_UART1_TXD, /* PIC controller */
48	MPP14_UART1_RXD, /* PIC controller */
49	MPP15_GPIO, /* USB Copy button (on devices with 88F6281) */
50	MPP16_GPIO, /* Reset button (on devices with 88F6281) */
51	MPP36_GPIO, /* RAM: 0: 256 MB, 1: 512 MB */
52	MPP37_GPIO, /* Reset button (on devices with 88F6282) */
53	MPP43_GPIO, /* USB Copy button (on devices with 88F6282) */
54	MPP44_GPIO, /* Board ID: 0: TS-11x, 1: TS-21x */
55	0
56	};
57
58	void __init qnap_dt_ts219_init(void)	35	void __init qnap_dt_ts219_init(void)
59	{	36	{
60	u32 dev, rev;	37	u32 dev, rev;
61		38
62	kirkwood_mpp_conf(qnap_ts219_mpp_config);
63
64	kirkwood_pcie_id(&dev, &rev);	39	kirkwood_pcie_id(&dev, &rev);
65	if (dev == MV88F6282_DEV_ID)	40	if (dev == MV88F6282_DEV_ID)
66	qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);	41	qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
67		42
68	kirkwood_ge00_init(&qnap_ts219_ge00_data);	43	kirkwood_ge00_init(&qnap_ts219_ge00_data);
69	kirkwood_ehci_init();
70		44
71	pm_power_off = qnap_tsx1x_power_off;	45	pm_power_off = qnap_tsx1x_power_off;
72	}	46	}