| Message ID | 20181130175543.32628-5-daniel@zonque.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: fixes and additions for pxa platform | expand |
Daniel Mack <daniel@zonque.org> writes: > Both pxa3xx.dtsi and pxa2xx.dtsi define a node for the USB controller. Merge > them, and get rid of the one in pxa3xx.dtsi. > > Signed-off-by: Daniel Mack <daniel@zonque.org> Excellent, but can be even better :) Could you please address as well pxa27x.dtsi ? As a matter of fact, this was already discussed here : https://patchwork.kernel.org/patch/8375421/ So the proper solution might be a bit different, as if you look at the thread I put up there, pxa25x doesn't have an USB host controller. Cheers. -- Robert
On 1/12/2018 2:30 PM, Robert Jarzmik wrote: > Daniel Mack <daniel@zonque.org> writes: > >> Both pxa3xx.dtsi and pxa2xx.dtsi define a node for the USB controller. Merge >> them, and get rid of the one in pxa3xx.dtsi. >> >> Signed-off-by: Daniel Mack <daniel@zonque.org> > Excellent, but can be even better :) > Could you please address as well pxa27x.dtsi ? > > As a matter of fact, this was already discussed here : > https://patchwork.kernel.org/patch/8375421/ > > So the proper solution might be a bit different, as if you look at the thread I > put up there, pxa25x doesn't have an USB host controller. Ah, okay. Thanks for the pointer. Will send a new patch, just ignore this one please. Thanks, Daniel
diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi index 30e77ebbcc4d..c00b1115f2a7 100644 --- a/arch/arm/boot/dts/pxa2xx.dtsi +++ b/arch/arm/boot/dts/pxa2xx.dtsi @@ -138,6 +138,7 @@ compatible = "marvell,pxa-ohci"; reg = <0x4c000000 0x10000>; interrupts = <3>; + clocks = <&clks CLK_USBH>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi index eb3223e85f9a..eb9443208578 100644 --- a/arch/arm/boot/dts/pxa3xx.dtsi +++ b/arch/arm/boot/dts/pxa3xx.dtsi @@ -202,14 +202,6 @@ status = "disabled"; }; - pxa3xx_ohci: usb@4c000000 { - compatible = "marvell,pxa-ohci"; - reg = <0x4c000000 0x10000>; - interrupts = <3>; - clocks = <&clks CLK_USBH>; - status = "disabled"; - }; - pwm0: pwm@40b00000 { compatible = "marvell,pxa270-pwm"; reg = <0x40b00000 0x10>;
Both pxa3xx.dtsi and pxa2xx.dtsi define a node for the USB controller. Merge them, and get rid of the one in pxa3xx.dtsi. Signed-off-by: Daniel Mack <daniel@zonque.org> --- arch/arm/boot/dts/pxa2xx.dtsi | 1 + arch/arm/boot/dts/pxa3xx.dtsi | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-)