ARM: Kirkwood: Convert all DT boards to EHCI via DT.

Now that the EHCI driver has DT support, drop old style configuration
of it and add DT in its place. Since all the boards enable the EHCI,
enable it by default in kirkwood.dtsi. Any new boards which don't have
USB can specifically disable it.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 4e5b8154a5be5d95535cd5eb9d66f894670c0946..4fc7a8e4916808faaf4361f75c93292003c8bab3 100644 (file)
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -77,6 +77,13 @@
                        status = "okay";
                };
 
+               ehci@50000 {
+                       compatible = "marvell,orion-ehci";
+                       reg = <0x50000 0x1000>;
+                       interrupts = <19>;
+                       status = "okay";
+               };
+
                sata@80000 {
                        compatible = "marvell,orion-sata";
                        reg = <0x80000 0x5000>;

diff --git a/arch/arm/mach-kirkwood/board-dnskw.c b/arch/arm/mach-kirkwood/board-dnskw.c
index 43d16d6714b82bed34aeff6ffa9240032b5560a2..2ac6c60578f6c32b057fa779f5e0f1e13f1efca6 100644 (file)
--- a/arch/arm/mach-kirkwood/board-dnskw.c
+++ b/arch/arm/mach-kirkwood/board-dnskw.c
@@ -78,7 +78,6 @@ void __init dnskw_init(void)
 {
        kirkwood_mpp_conf(dnskw_mpp_config);
 
-       kirkwood_ehci_init();
        kirkwood_ge00_init(&dnskw_ge00_data);
 
        /* Register power-off GPIO. */

diff --git a/arch/arm/mach-kirkwood/board-dockstar.c b/arch/arm/mach-kirkwood/board-dockstar.c
index f2fbb023e679609ef9df49b285c03af5cd0009a5..e94782d6a26696324b11de159b28a60d30e7cd44 100644 (file)
--- a/arch/arm/mach-kirkwood/board-dockstar.c
+++ b/arch/arm/mach-kirkwood/board-dockstar.c
@@ -55,7 +55,6 @@ void __init dockstar_dt_init(void)
        if (gpio_request(29, "USB Power Enable") != 0 ||
            gpio_direction_output(29, 1) != 0)
                pr_err("can't setup GPIO 29 (USB Power Enable)\n");
-       kirkwood_ehci_init();
 
        kirkwood_ge00_init(&dockstar_ge00_data);
 }

diff --git a/arch/arm/mach-kirkwood/board-dreamplug.c b/arch/arm/mach-kirkwood/board-dreamplug.c
index 20af53a56c0eb1b48c8f6543b51ef69f8eca8eeb..acdc04a068436da21409cd0714eef9a028b5dbf3 100644 (file)
--- a/arch/arm/mach-kirkwood/board-dreamplug.c
+++ b/arch/arm/mach-kirkwood/board-dreamplug.c
@@ -64,7 +64,6 @@ void __init dreamplug_init(void)
         */
        kirkwood_mpp_conf(dreamplug_mpp_config);
 
-       kirkwood_ehci_init();
        kirkwood_ge00_init(&dreamplug_ge00_data);
        kirkwood_ge01_init(&dreamplug_ge01_data);
        kirkwood_sdio_init(&dreamplug_mvsdio_data);

diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
index 001ca8c96980b1a3a64cb6e1df28b50fdd65618a..d388bea7136026e39078531c3e33eda2acaf69fe 100644 (file)
--- a/arch/arm/mach-kirkwood/board-goflexnet.c
+++ b/arch/arm/mach-kirkwood/board-goflexnet.c
@@ -65,7 +65,6 @@ void __init goflexnet_init(void)
        if (gpio_request(29, "USB Power Enable") != 0 ||
            gpio_direction_output(29, 1) != 0)
                pr_err("can't setup GPIO 29 (USB Power Enable)\n");
-       kirkwood_ehci_init();
 
        kirkwood_ge00_init(&goflexnet_ge00_data);
 }

diff --git a/arch/arm/mach-kirkwood/board-ib62x0.c b/arch/arm/mach-kirkwood/board-ib62x0.c
index cfc47f80e73436e20b19e2b7c7a43cba472b7dce..db08e379a40a99caf4934148b656928f3828e88c 100644 (file)
--- a/arch/arm/mach-kirkwood/board-ib62x0.c
+++ b/arch/arm/mach-kirkwood/board-ib62x0.c
@@ -61,7 +61,6 @@ void __init ib62x0_init(void)
         */
        kirkwood_mpp_conf(ib62x0_mpp_config);
 
-       kirkwood_ehci_init();
        kirkwood_ge00_init(&ib62x0_ge00_data);
        if (gpio_request(IB62X0_GPIO_POWER_OFF, "ib62x0:power:off") == 0 &&
            gpio_direction_output(IB62X0_GPIO_POWER_OFF, 0) == 0)

diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
index d084b1e2943ac0bb74704eb69ed9016186b4baeb..8275fb0c3170047f3bc5662a7ae6dc747b78092c 100644 (file)
--- a/arch/arm/mach-kirkwood/board-iconnect.c
+++ b/arch/arm/mach-kirkwood/board-iconnect.c
@@ -45,7 +45,6 @@ void __init iconnect_init(void)
 {
        kirkwood_mpp_conf(iconnect_mpp_config);
 
-       kirkwood_ehci_init();
        kirkwood_ge00_init(&iconnect_ge00_data);
 }
 

diff --git a/arch/arm/mach-kirkwood/board-iomega_ix2_200.c b/arch/arm/mach-kirkwood/board-iomega_ix2_200.c
index 158fb97d03979e1697b163e91b506cd716e0d259..a6f3d29e8c8bc442d510be726e390b5a9f5f8248 100644 (file)
--- a/arch/arm/mach-kirkwood/board-iomega_ix2_200.c
+++ b/arch/arm/mach-kirkwood/board-iomega_ix2_200.c
@@ -51,7 +51,5 @@ void __init iomega_ix2_200_init(void)
         */
        kirkwood_mpp_conf(iomega_ix2_200_mpp_config);
 
-       kirkwood_ehci_init();
-
        kirkwood_ge01_init(&iomega_ix2_200_ge00_data);
 }

diff --git a/arch/arm/mach-kirkwood/board-km_kirkwood.c b/arch/arm/mach-kirkwood/board-km_kirkwood.c
index f7d32834b757fda283de6db627d4fd4a4bf68491..1e9ac4bbfe611452a4da426777f3b547975d383c 100644 (file)
--- a/arch/arm/mach-kirkwood/board-km_kirkwood.c
+++ b/arch/arm/mach-kirkwood/board-km_kirkwood.c
@@ -52,6 +52,5 @@ void __init km_kirkwood_init(void)
        if (!IS_ERR(sata_clk))
                sata_clk->flags |= CLK_IGNORE_UNUSED;
 
-       kirkwood_ehci_init();
        kirkwood_ge00_init(&km_kirkwood_ge00_data);
 }

diff --git a/arch/arm/mach-kirkwood/board-lsxl.c b/arch/arm/mach-kirkwood/board-lsxl.c
index a29b8bff103d44f8f7462457dcf988437d8137fe..b6fbdaac3843f9cbdbedf271d615ae2056df6052 100644 (file)
--- a/arch/arm/mach-kirkwood/board-lsxl.c
+++ b/arch/arm/mach-kirkwood/board-lsxl.c
@@ -75,7 +75,6 @@ void __init lsxl_init(void)
        gpio_set_value(LSXL_GPIO_USB_POWER, 1);
        gpio_set_value(LSXL_GPIO_HDD_POWER, 1);
 
-       kirkwood_ehci_init();
        kirkwood_ge00_init(&lsxl_ge00_data);
        kirkwood_ge01_init(&lsxl_ge01_data);
 

diff --git a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c
index 1750e68506c1f1a06db0d37e371c608cfa4e0593..5a031b931370f3da72369e6998dc07654d755823 100644 (file)
--- a/arch/arm/mach-kirkwood/board-ts219.c
+++ b/arch/arm/mach-kirkwood/board-ts219.c
@@ -66,7 +66,6 @@ void __init qnap_dt_ts219_init(void)
                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;
 }