| Message ID | 20210709182234.47232-1-stephan@gerhold.net |
|---|---|
| State | Accepted |
| Commit | 68cc0c06967b7cced371729ec0718992cf4a6141 |
| Headers | show |
| Series | ARM: dts: ux500: ab8500: Link USB PHY to USB controller node | expand |
On Fri, Jul 9, 2021 at 8:23 PM Stephan Gerhold <stephan@gerhold.net> wrote: > At the moment the AB8500 USB PHY driver still uses the old USB PHY > subsystem instead of the generic PHY subsystem. This means that there > is no explicit link between the USB controller and the USB PHY. > > In U-Boot the PHY driver is integrated in the generic PHY subsystem, > so we need to use the typical PHY device tree bindings to specify > which PHY belongs to the USB controller. > > Add the link between USB controller and PHY to both ste-ab8500.dtsi > and ste-ab8505.dtsi. This is mainly for U-Boot for now and will just > be ignored in Linux. However, if the AB8500 USB PHY driver in Linux > is moved to the generic PHY subsystem at some point these device tree > changes can be used as well. > > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> Patch applied! Yours, Linus Walleij
diff --git a/arch/arm/boot/dts/ste-ab8500.dtsi b/arch/arm/boot/dts/ste-ab8500.dtsi index d0fe3f9aa183..bebcbb759794 100644 --- a/arch/arm/boot/dts/ste-ab8500.dtsi +++ b/arch/arm/boot/dts/ste-ab8500.dtsi @@ -217,7 +217,7 @@ ab8500_chargalg { battery = <&ab8500_battery>; }; - ab8500_usb { + ab8500_usb: ab8500_usb { compatible = "stericsson,ab8500-usb"; interrupts = <90 IRQ_TYPE_LEVEL_HIGH>, <96 IRQ_TYPE_LEVEL_HIGH>, @@ -238,6 +238,7 @@ ab8500_usb { musb_1v8-supply = <&db8500_vsmps2_reg>; clocks = <&prcmu_clk PRCMU_SYSCLK>; clock-names = "sysclk"; + #phy-cells = <0>; }; ab8500-ponkey { @@ -386,5 +387,10 @@ dsi@a0353000 { vana-supply = <&ab8500_ldo_ana_reg>; }; }; + + usb_per5@a03e0000 { + phys = <&ab8500_usb>; + phy-names = "usb"; + }; }; }; diff --git a/arch/arm/boot/dts/ste-ab8505.dtsi b/arch/arm/boot/dts/ste-ab8505.dtsi index 0defc15b9bbc..fb30e247ac9c 100644 --- a/arch/arm/boot/dts/ste-ab8505.dtsi +++ b/arch/arm/boot/dts/ste-ab8505.dtsi @@ -201,6 +201,7 @@ ab8500_usb: ab8500_usb { musb_1v8-supply = <&db8500_vsmps2_reg>; clocks = <&prcmu_clk PRCMU_SYSCLK>; clock-names = "sysclk"; + #phy-cells = <0>; }; ab8500-ponkey { @@ -322,5 +323,10 @@ dsi@a0353000 { vana-supply = <&ab8500_ldo_ana_reg>; }; }; + + usb_per5@a03e0000 { + phys = <&ab8500_usb>; + phy-names = "usb"; + }; }; };
At the moment the AB8500 USB PHY driver still uses the old USB PHY subsystem instead of the generic PHY subsystem. This means that there is no explicit link between the USB controller and the USB PHY. In U-Boot the PHY driver is integrated in the generic PHY subsystem, so we need to use the typical PHY device tree bindings to specify which PHY belongs to the USB controller. Add the link between USB controller and PHY to both ste-ab8500.dtsi and ste-ab8505.dtsi. This is mainly for U-Boot for now and will just be ignored in Linux. However, if the AB8500 USB PHY driver in Linux is moved to the generic PHY subsystem at some point these device tree changes can be used as well. Signed-off-by: Stephan Gerhold <stephan@gerhold.net> --- arch/arm/boot/dts/ste-ab8500.dtsi | 8 +++++++- arch/arm/boot/dts/ste-ab8505.dtsi | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-)