ARM: Kirkwood: remove kirkwood_ehci_init() from new boards

ehci-orion initialization moved to DT.  New boards don't need to call
kirkwood_ehci_init().

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

diff --git a/arch/arm/mach-kirkwood/board-mplcec4.c b/arch/arm/mach-kirkwood/board-mplcec4.c
index 47e7181..56bfe5a 100644 (file)
--- a/arch/arm/mach-kirkwood/board-mplcec4.c
+++ b/arch/arm/mach-kirkwood/board-mplcec4.c
@@ -34,7 +34,6 @@ void __init mplcec4_init(void)
        /*
         * Basic setup. Needs to be called early.
         */
-       kirkwood_ehci_init();
        kirkwood_ge00_init(&mplcec4_ge00_data);
        kirkwood_ge01_init(&mplcec4_ge01_data);
        kirkwood_sdio_init(&mplcec4_mvsdio_data);

diff --git a/arch/arm/mach-kirkwood/board-ns2.c b/arch/arm/mach-kirkwood/board-ns2.c
index 78596c4..8821720 100644 (file)
--- a/arch/arm/mach-kirkwood/board-ns2.c
+++ b/arch/arm/mach-kirkwood/board-ns2.c
@@ -73,7 +73,6 @@ void __init ns2_init(void)
         */
        kirkwood_mpp_conf(ns2_mpp_config);
 
-       kirkwood_ehci_init();
        if (of_machine_is_compatible("lacie,netspace_lite_v2") ||
            of_machine_is_compatible("lacie,netspace_mini_v2"))
                ns2_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);

diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c
index 027ce83..f58d2e1 100644 (file)
--- a/arch/arm/mach-kirkwood/board-nsa310.c
+++ b/arch/arm/mach-kirkwood/board-nsa310.c
@@ -85,10 +85,6 @@ void __init nsa310_init(void)
 
        nsa310_gpio_init();
 
-       /* this can be removed once the mainline kirkwood.dtsi gets
-        * the ehci configuration by default */
-       kirkwood_ehci_init();
-
        kirkwood_pcie_id(&dev, &rev);
 
        i2c_register_board_info(0, ARRAY_AND_SIZE(nsa310_i2c_info));

diff --git a/arch/arm/mach-kirkwood/board-usi_topkick.c b/arch/arm/mach-kirkwood/board-usi_topkick.c
index e2ec9d8..15e69fc 100644 (file)
--- a/arch/arm/mach-kirkwood/board-usi_topkick.c
+++ b/arch/arm/mach-kirkwood/board-usi_topkick.c
@@ -76,7 +76,6 @@ void __init usi_topkick_init(void)
        /* SATA0 power enable */
        gpio_set_value(TOPKICK_SATA0_PWR_ENABLE, 1);
 
-       kirkwood_ehci_init();
        kirkwood_ge00_init(&topkick_ge00_data);
        kirkwood_sdio_init(&topkick_mvsdio_data);
 }