Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

authored by

Sebastian Hesselbarth and committed by
Arnd Bergmann
a1abcd7c 200506b1

+16 -10
+16
arch/arm/boot/dts/dove.dtsi
··· 156 156 status = "disabled"; 157 157 }; 158 158 159 + ehci0: usb-host@50000 { 160 + compatible = "marvell,orion-ehci"; 161 + reg = <0x50000 0x1000>; 162 + interrupts = <24>; 163 + clocks = <&gate_clk 0>; 164 + status = "okay"; 165 + }; 166 + 167 + ehci1: usb-host@51000 { 168 + compatible = "marvell,orion-ehci"; 169 + reg = <0x51000 0x1000>; 170 + interrupts = <25>; 171 + clocks = <&gate_clk 1>; 172 + status = "okay"; 173 + }; 174 + 159 175 sdio0: sdio@92000 { 160 176 compatible = "marvell,dove-sdhci"; 161 177 reg = <0x92000 0x100>;
-10
arch/arm/mach-dove/board-dt.c
··· 34 34 clkspec.np = np; 35 35 clkspec.args_count = 1; 36 36 37 - clkspec.args[0] = CLOCK_GATING_BIT_USB0; 38 - orion_clkdev_add(NULL, "orion-ehci.0", 39 - of_clk_get_from_provider(&clkspec)); 40 - 41 - clkspec.args[0] = CLOCK_GATING_BIT_USB1; 42 - orion_clkdev_add(NULL, "orion-ehci.1", 43 - of_clk_get_from_provider(&clkspec)); 44 - 45 37 clkspec.args[0] = CLOCK_GATING_BIT_GBE; 46 38 orion_clkdev_add(NULL, "mv643xx_eth_port.0", 47 39 of_clk_get_from_provider(&clkspec)); ··· 71 79 72 80 /* Internal devices not ported to DT yet */ 73 81 dove_ge00_init(&dove_dt_ge00_data); 74 - dove_ehci0_init(); 75 - dove_ehci1_init(); 76 82 dove_pcie_init(1, 1); 77 83 78 84 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);