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

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

arch/arm/boot/dts/kirkwood.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -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>;

arch/arm/mach-kirkwood/board-dnskw.c

+0 −1
Original line number Diff line number Diff line
@@ -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. */

arch/arm/mach-kirkwood/board-dockstar.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-kirkwood/board-dreamplug.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/arm/mach-kirkwood/board-goflexnet.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

}