On Fri, 16 Dec 2022 19:09:35 -0500 Sasha Levin sashal@kernel.org wrote:
From: Andre Przywara andre.przywara@arm.com
[ Upstream commit f40cf244c3feb4e1a442f8029b691add2c65b3ab ]
This is not really a backport candidate: - This is not a fix, but a new feature. - This relies on the H616 USB PHY support patch, which will be only in v6.2 (and won't be backported). - DT backports are generally not useful to begin with, and should actually not be necessary anyway.
Cheers, Andre
Add the nodes for the MUSB and the four USB host controllers to the SoC .dtsi, along with the PHY node needed to bind all of them together.
EHCI/OHCI and MUSB are compatible to previous SoCs, but the PHY requires some quirks (handled in the driver).
Signed-off-by: Andre Przywara andre.przywara@arm.com Reviewed-by: Jernej Skrabec jernej.skrabec@gmail.com Link: https://lore.kernel.org/r/20221031111358.3387297-6-andre.przywara@arm.com Signed-off-by: Jernej Skrabec jernej.skrabec@gmail.com Signed-off-by: Sasha Levin sashal@kernel.org
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 160 ++++++++++++++++++ 1 file changed, 160 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi index 622a1f7d1641..74aed0d232a9 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi @@ -504,6 +504,166 @@ mdio0: mdio { }; };
usbotg: usb@5100000 {compatible = "allwinner,sun50i-h616-musb","allwinner,sun8i-h3-musb";reg = <0x05100000 0x0400>;clocks = <&ccu CLK_BUS_OTG>;resets = <&ccu RST_BUS_OTG>;interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;interrupt-names = "mc";phys = <&usbphy 0>;phy-names = "usb";extcon = <&usbphy 0>;status = "disabled";};usbphy: phy@5100400 {compatible = "allwinner,sun50i-h616-usb-phy";reg = <0x05100400 0x24>,<0x05101800 0x14>,<0x05200800 0x14>,<0x05310800 0x14>,<0x05311800 0x14>;reg-names = "phy_ctrl","pmu0","pmu1","pmu2","pmu3";clocks = <&ccu CLK_USB_PHY0>,<&ccu CLK_USB_PHY1>,<&ccu CLK_USB_PHY2>,<&ccu CLK_USB_PHY3>,<&ccu CLK_BUS_EHCI2>;clock-names = "usb0_phy","usb1_phy","usb2_phy","usb3_phy","pmu2_clk";resets = <&ccu RST_USB_PHY0>,<&ccu RST_USB_PHY1>,<&ccu RST_USB_PHY2>,<&ccu RST_USB_PHY3>;reset-names = "usb0_reset","usb1_reset","usb2_reset","usb3_reset";status = "disabled";#phy-cells = <1>;};ehci0: usb@5101000 {compatible = "allwinner,sun50i-h616-ehci","generic-ehci";reg = <0x05101000 0x100>;interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;clocks = <&ccu CLK_BUS_OHCI0>,<&ccu CLK_BUS_EHCI0>,<&ccu CLK_USB_OHCI0>;resets = <&ccu RST_BUS_OHCI0>,<&ccu RST_BUS_EHCI0>;phys = <&usbphy 0>;phy-names = "usb";status = "disabled";};ohci0: usb@5101400 {compatible = "allwinner,sun50i-h616-ohci","generic-ohci";reg = <0x05101400 0x100>;interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;clocks = <&ccu CLK_BUS_OHCI0>,<&ccu CLK_USB_OHCI0>;resets = <&ccu RST_BUS_OHCI0>;phys = <&usbphy 0>;phy-names = "usb";status = "disabled";};ehci1: usb@5200000 {compatible = "allwinner,sun50i-h616-ehci","generic-ehci";reg = <0x05200000 0x100>;interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;clocks = <&ccu CLK_BUS_OHCI1>,<&ccu CLK_BUS_EHCI1>,<&ccu CLK_USB_OHCI1>;resets = <&ccu RST_BUS_OHCI1>,<&ccu RST_BUS_EHCI1>;phys = <&usbphy 1>;phy-names = "usb";status = "disabled";};ohci1: usb@5200400 {compatible = "allwinner,sun50i-h616-ohci","generic-ohci";reg = <0x05200400 0x100>;interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;clocks = <&ccu CLK_BUS_OHCI1>,<&ccu CLK_USB_OHCI1>;resets = <&ccu RST_BUS_OHCI1>;phys = <&usbphy 1>;phy-names = "usb";status = "disabled";};ehci2: usb@5310000 {compatible = "allwinner,sun50i-h616-ehci","generic-ehci";reg = <0x05310000 0x100>;interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;clocks = <&ccu CLK_BUS_OHCI2>,<&ccu CLK_BUS_EHCI2>,<&ccu CLK_USB_OHCI2>;resets = <&ccu RST_BUS_OHCI2>,<&ccu RST_BUS_EHCI2>;phys = <&usbphy 2>;phy-names = "usb";status = "disabled";};ohci2: usb@5310400 {compatible = "allwinner,sun50i-h616-ohci","generic-ohci";reg = <0x05310400 0x100>;interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;clocks = <&ccu CLK_BUS_OHCI2>,<&ccu CLK_USB_OHCI2>;resets = <&ccu RST_BUS_OHCI2>;phys = <&usbphy 2>;phy-names = "usb";status = "disabled";};ehci3: usb@5311000 {compatible = "allwinner,sun50i-h616-ehci","generic-ehci";reg = <0x05311000 0x100>;interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;clocks = <&ccu CLK_BUS_OHCI3>,<&ccu CLK_BUS_EHCI3>,<&ccu CLK_USB_OHCI3>;resets = <&ccu RST_BUS_OHCI3>,<&ccu RST_BUS_EHCI3>;phys = <&usbphy 3>;phy-names = "usb";status = "disabled";};ohci3: usb@5311400 {compatible = "allwinner,sun50i-h616-ohci","generic-ohci";reg = <0x05311400 0x100>;interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;clocks = <&ccu CLK_BUS_OHCI3>,<&ccu CLK_USB_OHCI3>;resets = <&ccu RST_BUS_OHCI3>;phys = <&usbphy 3>;phy-names = "usb";status = "disabled";};- rtc: rtc@7000000 { compatible = "allwinner,sun50i-h616-rtc"; reg = <0x07000000 0x400>;