diff options
author | Jason Cooper <jason@lakedaemon.net> | 2012-11-23 22:58:12 -0500 |
---|---|---|
committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-23 22:58:12 -0500 |
commit | 2a18588c0ce336933be3c99c91e74e21db56a0fe (patch) | |
tree | cae25c475f6fdcde414cb46d7e68b9bfe87d6574 | |
parent | 155acbe7f7bf7563239ff4d188634930512d0c02 (diff) |
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>
-rw-r--r-- | arch/arm/mach-kirkwood/board-mplcec4.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/board-ns2.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/board-nsa310.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/board-usi_topkick.c | 1 |
4 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-kirkwood/board-mplcec4.c b/arch/arm/mach-kirkwood/board-mplcec4.c index 47e71815bafb..56bfe5a1605a 100644 --- 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) | |||
34 | /* | 34 | /* |
35 | * Basic setup. Needs to be called early. | 35 | * Basic setup. Needs to be called early. |
36 | */ | 36 | */ |
37 | kirkwood_ehci_init(); | ||
38 | kirkwood_ge00_init(&mplcec4_ge00_data); | 37 | kirkwood_ge00_init(&mplcec4_ge00_data); |
39 | kirkwood_ge01_init(&mplcec4_ge01_data); | 38 | kirkwood_ge01_init(&mplcec4_ge01_data); |
40 | kirkwood_sdio_init(&mplcec4_mvsdio_data); | 39 | 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 78596c4f76d2..8821720ab5a4 100644 --- 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) | |||
73 | */ | 73 | */ |
74 | kirkwood_mpp_conf(ns2_mpp_config); | 74 | kirkwood_mpp_conf(ns2_mpp_config); |
75 | 75 | ||
76 | kirkwood_ehci_init(); | ||
77 | if (of_machine_is_compatible("lacie,netspace_lite_v2") || | 76 | if (of_machine_is_compatible("lacie,netspace_lite_v2") || |
78 | of_machine_is_compatible("lacie,netspace_mini_v2")) | 77 | of_machine_is_compatible("lacie,netspace_mini_v2")) |
79 | ns2_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0); | 78 | 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 027ce83f3fe5..f58d2e1a4042 100644 --- 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) | |||
85 | 85 | ||
86 | nsa310_gpio_init(); | 86 | nsa310_gpio_init(); |
87 | 87 | ||
88 | /* this can be removed once the mainline kirkwood.dtsi gets | ||
89 | * the ehci configuration by default */ | ||
90 | kirkwood_ehci_init(); | ||
91 | |||
92 | kirkwood_pcie_id(&dev, &rev); | 88 | kirkwood_pcie_id(&dev, &rev); |
93 | 89 | ||
94 | i2c_register_board_info(0, ARRAY_AND_SIZE(nsa310_i2c_info)); | 90 | 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 e2ec9d891fe3..15e69fcde9f4 100644 --- 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) | |||
76 | /* SATA0 power enable */ | 76 | /* SATA0 power enable */ |
77 | gpio_set_value(TOPKICK_SATA0_PWR_ENABLE, 1); | 77 | gpio_set_value(TOPKICK_SATA0_PWR_ENABLE, 1); |
78 | 78 | ||
79 | kirkwood_ehci_init(); | ||
80 | kirkwood_ge00_init(&topkick_ge00_data); | 79 | kirkwood_ge00_init(&topkick_ge00_data); |
81 | kirkwood_sdio_init(&topkick_mvsdio_data); | 80 | kirkwood_sdio_init(&topkick_mvsdio_data); |
82 | } | 81 | } |