Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1abcd7c authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Arnd Bergmann
Browse files

ARM: Dove: convert usb host controller to DT 



With DT support for orion-ehci also convert Dove to it and
remove the legacy calls and clock aliases.

This patch is based on "ARM: Dove: split legacy and DT setup"
applied to mvebu/boards recently.

Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 200506b1

arch/arm/boot/dts/dove.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -156,6 +156,22 @@ 
			status = "disabled";

		};



		ehci0: usb-host@50000 {

			compatible = "marvell,orion-ehci";

			reg = <0x50000 0x1000>;

			interrupts = <24>;

			clocks = <&gate_clk 0>;

			status = "okay";

		};



		ehci1: usb-host@51000 {

			compatible = "marvell,orion-ehci";

			reg = <0x51000 0x1000>;

			interrupts = <25>;

			clocks = <&gate_clk 1>;

			status = "okay";

		};



		sdio0: sdio@92000 {

			compatible = "marvell,dove-sdhci";

			reg = <0x92000 0x100>;

arch/arm/mach-dove/board-dt.c

+0 −10
Original line number Diff line number Diff line
@@ -34,14 +34,6 @@ static void __init dove_legacy_clk_init(void) 
	clkspec.np = np;

	clkspec.args_count = 1;



	clkspec.args[0] = CLOCK_GATING_BIT_USB0;

	orion_clkdev_add(NULL, "orion-ehci.0",

			 of_clk_get_from_provider(&clkspec));



	clkspec.args[0] = CLOCK_GATING_BIT_USB1;

	orion_clkdev_add(NULL, "orion-ehci.1",

			 of_clk_get_from_provider(&clkspec));



	clkspec.args[0] = CLOCK_GATING_BIT_GBE;

	orion_clkdev_add(NULL, "mv643xx_eth_port.0",

			 of_clk_get_from_provider(&clkspec));
@@ -79,8 +71,6 @@ static void __init dove_dt_init(void) 


	/* Internal devices not ported to DT yet */

	dove_ge00_init(&dove_dt_ge00_data);

	dove_ehci0_init();

	dove_ehci1_init();

	dove_pcie_init(1, 1);



	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);