| Message ID | 20210616023326.18135-3-qianfanguijin@163.com |
|---|---|
| State | Deferred |
| Delegated to: | Andre Przywara |
| Headers | show |
| Series | [1/4] phy-sun4i-usb: Fix sun8i_r40_cfg | expand |
On Wed, 16 Jun 2021 10:33:25 +0800 qianfanguijin@163.com (qianfanguijin@163.com) wrote: Hi, in general this patch looks mostly alright (see below), but this needs to go through Linux first, since we only sync DTs this way. Some comments below, for when you send this to Linux: > From: qianfan Zhao <qianfanguijin@163.com> > > bpi-m2u has a hardware usb_otg, let's enable it in dts. > > Signed-off-by: qianfan Zhao <qianfanguijin@163.com> > --- > arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts | 4 ++++ > arch/arm/dts/sun8i-r40.dtsi | 13 +++++++++++++ > 2 files changed, 17 insertions(+) > > diff --git a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts > index a6a1087a0c..828ddc63ae 100644 > --- a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts > +++ b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts > @@ -117,6 +117,10 @@ > status = "okay"; > }; > > +&usb_otg { Please keep this sorted alphabetically, so it belongs just above the usbphy node below. And please put the dr_mode property here (even though U-Boot ignores this, AFAIK). Also we would need the USB-ID and power supply in the PHY node below, compare other DTs with a micro-USB socket and proper VBUS support. > + status = "okay"; > +}; > + > &ehci1 { > status = "okay"; > }; > diff --git a/arch/arm/dts/sun8i-r40.dtsi b/arch/arm/dts/sun8i-r40.dtsi > index d5ad3b9efd..7c7a9cd9f8 100644 > --- a/arch/arm/dts/sun8i-r40.dtsi > +++ b/arch/arm/dts/sun8i-r40.dtsi > @@ -363,6 +363,19 @@ > #size-cells = <0>; > }; > > + usb_otg: usb@1c13000 { > + compatible = "allwinner,sun8i-r40-musb"; Since this is fully compatible with the H3, please use: compatible = "allwinner,sun8i-r40-musb", "allwinner,sun8i-h3-musb"; This way we won't need code changes to the MUSB driver. The rest (address, interrupt) look alright. Cheers, Andre > + reg = <0x01c13000 0x0400>; > + clocks = <&ccu CLK_BUS_OTG>; > + resets = <&ccu RST_BUS_OTG>; > + interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "mc"; > + phys = <&usbphy 0>; > + phy-names = "usb"; > + extcon = <&usbphy 0>; > + status = "disabled"; > + }; > + > usbphy: phy@1c13400 { > compatible = "allwinner,sun8i-r40-usb-phy"; > reg = <0x01c13400 0x14>,
diff --git a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts index a6a1087a0c..828ddc63ae 100644 --- a/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts +++ b/arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts @@ -117,6 +117,10 @@ status = "okay"; }; +&usb_otg { + status = "okay"; +}; + &ehci1 { status = "okay"; }; diff --git a/arch/arm/dts/sun8i-r40.dtsi b/arch/arm/dts/sun8i-r40.dtsi index d5ad3b9efd..7c7a9cd9f8 100644 --- a/arch/arm/dts/sun8i-r40.dtsi +++ b/arch/arm/dts/sun8i-r40.dtsi @@ -363,6 +363,19 @@ #size-cells = <0>; }; + usb_otg: usb@1c13000 { + compatible = "allwinner,sun8i-r40-musb"; + reg = <0x01c13000 0x0400>; + clocks = <&ccu CLK_BUS_OTG>; + resets = <&ccu RST_BUS_OTG>; + interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "mc"; + phys = <&usbphy 0>; + phy-names = "usb"; + extcon = <&usbphy 0>; + status = "disabled"; + }; + usbphy: phy@1c13400 { compatible = "allwinner,sun8i-r40-usb-phy"; reg = <0x01c13400 0x14>,