Message ID | 1433248152-13753-3-git-send-email-wens@csie.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi, On 06/02/2015 02:29 PM, Chen-Yu Tsai wrote: > A23/A33 has one pair of EHCI/OHCI USB controllers. There are 2 USB PHYs, > one for the USB OTG controller, one for the EHCI/OHCI pair. The latter > may also support HSIC, though none of the available boards utilize this, > so this is not supported yet. > > Signed-off-by: Chen-Yu Tsai <wens@csie.org> Thanks, I've applied this one (minus the phy node which belongs in sun8i-a23.dtsi as it is a23 specific) to my sunxi-wip branch, and if it is ok with you I will take care of upstreaming this further. Regards, Hans > --- > arch/arm/boot/dts/sun8i-a23-a33.dtsi | 34 ++++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi > index 7abd0ae3143d..4f1ca44a81f1 100644 > --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi > +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi > @@ -332,6 +332,40 @@ > #size-cells = <0>; > }; > > + usbphy: phy@01c19400 { > + compatible = "allwinner,sun8i-a23-usb-phy"; > + reg = <0x01c19400 0x10>, <0x01c1a800 0x4>; > + reg-names = "phy_ctrl", "pmu1"; > + clocks = <&usb_clk 8>, <&usb_clk 9>; > + clock-names = "usb0_phy", "usb1_phy"; > + resets = <&usb_clk 0>, <&usb_clk 1>; > + reset-names = "usb0_reset", "usb1_reset"; > + status = "disabled"; > + #phy-cells = <1>; > + }; > + > + ehci0: usb@01c1a000 { > + compatible = "allwinner,sun8i-a23-ehci", "generic-ehci"; > + reg = <0x01c1a000 0x100>; > + interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&ahb1_gates 26>; > + resets = <&ahb1_rst 26>; > + phys = <&usbphy 1>; > + phy-names = "usb"; > + status = "disabled"; > + }; > + > + ohci0: usb@01c1a400 { > + compatible = "allwinner,sun8i-a23-ohci", "generic-ohci"; > + reg = <0x01c1a400 0x100>; > + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&ahb1_gates 29>, <&usb_clk 16>; > + resets = <&ahb1_rst 29>; > + phys = <&usbphy 1>; > + phy-names = "usb"; > + status = "disabled"; > + }; > + > pio: pinctrl@01c20800 { > /* compatible gets set in SoC specific dtsi file */ > reg = <0x01c20800 0x400>; >
On Wed, Jun 3, 2015 at 3:18 AM, Hans de Goede <hdegoede@redhat.com> wrote: > Hi, > > On 06/02/2015 02:29 PM, Chen-Yu Tsai wrote: >> >> A23/A33 has one pair of EHCI/OHCI USB controllers. There are 2 USB PHYs, >> one for the USB OTG controller, one for the EHCI/OHCI pair. The latter >> may also support HSIC, though none of the available boards utilize this, >> so this is not supported yet. >> >> Signed-off-by: Chen-Yu Tsai <wens@csie.org> > > > Thanks, I've applied this one (minus the phy node which belongs in > sun8i-a23.dtsi as it is a23 specific) to my sunxi-wip branch, and if it > is ok with you I will take care of upstreaming this further. OK with me. Thanks! ChenYu >> --- >> arch/arm/boot/dts/sun8i-a23-a33.dtsi | 34 >> ++++++++++++++++++++++++++++++++++ >> 1 file changed, 34 insertions(+) >> >> diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi >> b/arch/arm/boot/dts/sun8i-a23-a33.dtsi >> index 7abd0ae3143d..4f1ca44a81f1 100644 >> --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi >> +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi >> @@ -332,6 +332,40 @@ >> #size-cells = <0>; >> }; >> >> + usbphy: phy@01c19400 { >> + compatible = "allwinner,sun8i-a23-usb-phy"; >> + reg = <0x01c19400 0x10>, <0x01c1a800 0x4>; >> + reg-names = "phy_ctrl", "pmu1"; >> + clocks = <&usb_clk 8>, <&usb_clk 9>; >> + clock-names = "usb0_phy", "usb1_phy"; >> + resets = <&usb_clk 0>, <&usb_clk 1>; >> + reset-names = "usb0_reset", "usb1_reset"; >> + status = "disabled"; >> + #phy-cells = <1>; >> + }; >> + >> + ehci0: usb@01c1a000 { >> + compatible = "allwinner,sun8i-a23-ehci", >> "generic-ehci"; >> + reg = <0x01c1a000 0x100>; >> + interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&ahb1_gates 26>; >> + resets = <&ahb1_rst 26>; >> + phys = <&usbphy 1>; >> + phy-names = "usb"; >> + status = "disabled"; >> + }; >> + >> + ohci0: usb@01c1a400 { >> + compatible = "allwinner,sun8i-a23-ohci", >> "generic-ohci"; >> + reg = <0x01c1a400 0x100>; >> + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; >> + clocks = <&ahb1_gates 29>, <&usb_clk 16>; >> + resets = <&ahb1_rst 29>; >> + phys = <&usbphy 1>; >> + phy-names = "usb"; >> + status = "disabled"; >> + }; >> + >> pio: pinctrl@01c20800 { >> /* compatible gets set in SoC specific dtsi file >> */ >> reg = <0x01c20800 0x400>; >> >
diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi index 7abd0ae3143d..4f1ca44a81f1 100644 --- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi @@ -332,6 +332,40 @@ #size-cells = <0>; }; + usbphy: phy@01c19400 { + compatible = "allwinner,sun8i-a23-usb-phy"; + reg = <0x01c19400 0x10>, <0x01c1a800 0x4>; + reg-names = "phy_ctrl", "pmu1"; + clocks = <&usb_clk 8>, <&usb_clk 9>; + clock-names = "usb0_phy", "usb1_phy"; + resets = <&usb_clk 0>, <&usb_clk 1>; + reset-names = "usb0_reset", "usb1_reset"; + status = "disabled"; + #phy-cells = <1>; + }; + + ehci0: usb@01c1a000 { + compatible = "allwinner,sun8i-a23-ehci", "generic-ehci"; + reg = <0x01c1a000 0x100>; + interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ahb1_gates 26>; + resets = <&ahb1_rst 26>; + phys = <&usbphy 1>; + phy-names = "usb"; + status = "disabled"; + }; + + ohci0: usb@01c1a400 { + compatible = "allwinner,sun8i-a23-ohci", "generic-ohci"; + reg = <0x01c1a400 0x100>; + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ahb1_gates 29>, <&usb_clk 16>; + resets = <&ahb1_rst 29>; + phys = <&usbphy 1>; + phy-names = "usb"; + status = "disabled"; + }; + pio: pinctrl@01c20800 { /* compatible gets set in SoC specific dtsi file */ reg = <0x01c20800 0x400>;
A23/A33 has one pair of EHCI/OHCI USB controllers. There are 2 USB PHYs, one for the USB OTG controller, one for the EHCI/OHCI pair. The latter may also support HSIC, though none of the available boards utilize this, so this is not supported yet. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- arch/arm/boot/dts/sun8i-a23-a33.dtsi | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)