Commit b6cf8070 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper

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: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 77dae54a
...@@ -77,6 +77,13 @@ wdt@20300 { ...@@ -77,6 +77,13 @@ wdt@20300 {
status = "okay"; status = "okay";
}; };
ehci@50000 {
compatible = "marvell,orion-ehci";
reg = <0x50000 0x1000>;
interrupts = <19>;
status = "okay";
};
sata@80000 { sata@80000 {
compatible = "marvell,orion-sata"; compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>; reg = <0x80000 0x5000>;
......
...@@ -78,7 +78,6 @@ void __init dnskw_init(void) ...@@ -78,7 +78,6 @@ void __init dnskw_init(void)
{ {
kirkwood_mpp_conf(dnskw_mpp_config); kirkwood_mpp_conf(dnskw_mpp_config);
kirkwood_ehci_init();
kirkwood_ge00_init(&dnskw_ge00_data); kirkwood_ge00_init(&dnskw_ge00_data);
/* Register power-off GPIO. */ /* Register power-off GPIO. */
......
...@@ -55,7 +55,6 @@ void __init dockstar_dt_init(void) ...@@ -55,7 +55,6 @@ void __init dockstar_dt_init(void)
if (gpio_request(29, "USB Power Enable") != 0 || if (gpio_request(29, "USB Power Enable") != 0 ||
gpio_direction_output(29, 1) != 0) gpio_direction_output(29, 1) != 0)
pr_err("can't setup GPIO 29 (USB Power Enable)\n"); pr_err("can't setup GPIO 29 (USB Power Enable)\n");
kirkwood_ehci_init();
kirkwood_ge00_init(&dockstar_ge00_data); kirkwood_ge00_init(&dockstar_ge00_data);
} }
...@@ -64,7 +64,6 @@ void __init dreamplug_init(void) ...@@ -64,7 +64,6 @@ void __init dreamplug_init(void)
*/ */
kirkwood_mpp_conf(dreamplug_mpp_config); kirkwood_mpp_conf(dreamplug_mpp_config);
kirkwood_ehci_init();
kirkwood_ge00_init(&dreamplug_ge00_data); kirkwood_ge00_init(&dreamplug_ge00_data);
kirkwood_ge01_init(&dreamplug_ge01_data); kirkwood_ge01_init(&dreamplug_ge01_data);
kirkwood_sdio_init(&dreamplug_mvsdio_data); kirkwood_sdio_init(&dreamplug_mvsdio_data);
......
...@@ -65,7 +65,6 @@ void __init goflexnet_init(void) ...@@ -65,7 +65,6 @@ void __init goflexnet_init(void)
if (gpio_request(29, "USB Power Enable") != 0 || if (gpio_request(29, "USB Power Enable") != 0 ||
gpio_direction_output(29, 1) != 0) gpio_direction_output(29, 1) != 0)
pr_err("can't setup GPIO 29 (USB Power Enable)\n"); pr_err("can't setup GPIO 29 (USB Power Enable)\n");
kirkwood_ehci_init();
kirkwood_ge00_init(&goflexnet_ge00_data); kirkwood_ge00_init(&goflexnet_ge00_data);
} }
...@@ -61,7 +61,6 @@ void __init ib62x0_init(void) ...@@ -61,7 +61,6 @@ void __init ib62x0_init(void)
*/ */
kirkwood_mpp_conf(ib62x0_mpp_config); kirkwood_mpp_conf(ib62x0_mpp_config);
kirkwood_ehci_init();
kirkwood_ge00_init(&ib62x0_ge00_data); kirkwood_ge00_init(&ib62x0_ge00_data);
if (gpio_request(IB62X0_GPIO_POWER_OFF, "ib62x0:power:off") == 0 && if (gpio_request(IB62X0_GPIO_POWER_OFF, "ib62x0:power:off") == 0 &&
gpio_direction_output(IB62X0_GPIO_POWER_OFF, 0) == 0) gpio_direction_output(IB62X0_GPIO_POWER_OFF, 0) == 0)
......
...@@ -45,7 +45,6 @@ void __init iconnect_init(void) ...@@ -45,7 +45,6 @@ void __init iconnect_init(void)
{ {
kirkwood_mpp_conf(iconnect_mpp_config); kirkwood_mpp_conf(iconnect_mpp_config);
kirkwood_ehci_init();
kirkwood_ge00_init(&iconnect_ge00_data); kirkwood_ge00_init(&iconnect_ge00_data);
} }
......
...@@ -51,7 +51,5 @@ void __init iomega_ix2_200_init(void) ...@@ -51,7 +51,5 @@ void __init iomega_ix2_200_init(void)
*/ */
kirkwood_mpp_conf(iomega_ix2_200_mpp_config); kirkwood_mpp_conf(iomega_ix2_200_mpp_config);
kirkwood_ehci_init();
kirkwood_ge01_init(&iomega_ix2_200_ge00_data); kirkwood_ge01_init(&iomega_ix2_200_ge00_data);
} }
...@@ -52,6 +52,5 @@ void __init km_kirkwood_init(void) ...@@ -52,6 +52,5 @@ void __init km_kirkwood_init(void)
if (!IS_ERR(sata_clk)) if (!IS_ERR(sata_clk))
sata_clk->flags |= CLK_IGNORE_UNUSED; sata_clk->flags |= CLK_IGNORE_UNUSED;
kirkwood_ehci_init();
kirkwood_ge00_init(&km_kirkwood_ge00_data); kirkwood_ge00_init(&km_kirkwood_ge00_data);
} }
...@@ -75,7 +75,6 @@ void __init lsxl_init(void) ...@@ -75,7 +75,6 @@ void __init lsxl_init(void)
gpio_set_value(LSXL_GPIO_USB_POWER, 1); gpio_set_value(LSXL_GPIO_USB_POWER, 1);
gpio_set_value(LSXL_GPIO_HDD_POWER, 1); gpio_set_value(LSXL_GPIO_HDD_POWER, 1);
kirkwood_ehci_init();
kirkwood_ge00_init(&lsxl_ge00_data); kirkwood_ge00_init(&lsxl_ge00_data);
kirkwood_ge01_init(&lsxl_ge01_data); kirkwood_ge01_init(&lsxl_ge01_data);
......
...@@ -66,7 +66,6 @@ void __init qnap_dt_ts219_init(void) ...@@ -66,7 +66,6 @@ void __init qnap_dt_ts219_init(void)
qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0); qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
kirkwood_ge00_init(&qnap_ts219_ge00_data); kirkwood_ge00_init(&qnap_ts219_ge00_data);
kirkwood_ehci_init();
pm_power_off = qnap_tsx1x_power_off; pm_power_off = qnap_tsx1x_power_off;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment