[PATCH linux dev-5.4 2/2] ARM: dts: aspeed-g6: add usb functions

[Tao Ren]

On Fri, Jan 17, 2020 at 10:26:15AM +1030, Andrew Jeffery wrote:
> 
> 
> On Fri, 17 Jan 2020, at 09:55, rentao.bupt at gmail.com wrote:
> > From: Tao Ren <rentao.bupt at gmail.com>
> > 
> > Add USB function pins and devices in aspeed-g6 dtsi.
> > 
> > Signed-off-by: Tao Ren <rentao.bupt at gmail.com>
> > ---
> >  arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi | 25 ++++++++++++++
> >  arch/arm/boot/dts/aspeed-g6.dtsi         | 43 ++++++++++++++++++++++++
> >  2 files changed, 68 insertions(+)
> > 
> > diff --git a/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi 
> > b/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi
> > index 045ce66ca876..7028e21bdd98 100644
> > --- a/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi
> > +++ b/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi
> > @@ -1112,6 +1112,31 @@
> >  		groups = "UART9";
> >  	};
> >  
> > +	pinctrl_usb2ah_default: usb2ah_default {
> > +		function = "USB2AH";
> > +		groups = "USBA";
> > +	};
> > +
> > +	pinctrl_usb2ad_default: usb2ad_default {
> > +		function = "USB2AD";
> > +		groups = "USBA";
> > +	};
> > +
> > +	pinctrl_usb2bh_default: usb2bh_default {
> > +		function = "USB2BH";
> > +		groups = "USBB";
> > +	};
> > +
> > +	pinctrl_usb2bd_default: usb2bd_default {
> > +		function = "USB2BD";
> > +		groups = "USBB";
> > +	};
> > +
> > +	pinctrl_usb11bhid_default: usb11bhid_default {
> > +		function = "USB11BHID";
> > +		groups = "USBB";
> > +	};
> > +
> >  	pinctrl_vb_default: vb_default {
> >  		function = "VB";
> >  		groups = "VB";
> > diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
> > index 99cc7d7ced4d..d344bb278bdb 100644
> > --- a/arch/arm/boot/dts/aspeed-g6.dtsi
> > +++ b/arch/arm/boot/dts/aspeed-g6.dtsi
> > @@ -245,6 +245,49 @@
> >  			status = "disabled";
> >  		};
> >  
> > +		ehci0: usb at 1e6a1000 {
> > +			compatible = "aspeed,ast2600-ehci", "generic-ehci";
> > +			reg = <0x1e6a1000 0x100>;
> > +			interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
> > +			clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
> > +			pinctrl-names = "default";
> > +			pinctrl-0 = <&pinctrl_usb2ah_default>;
> > +			status = "disabled";
> > +		};
> > +
> > +		ehci1: usb at 1e6a3000 {
> > +			compatible = "aspeed,ast2600-ehci", "generic-ehci";
> > +			reg = <0x1e6a3000 0x100>;
> > +			interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
> > +			clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>;
> > +			pinctrl-names = "default";
> > +			pinctrl-0 = <&pinctrl_usb2bh_default>;
> > +			status = "disabled";
> > +		};
> > +
> > +		uhci: usb at 1e6b0000 {
> > +			compatible = "aspeed,ast2600-uhci", "generic-uhci";
> > +			reg = <0x1e6b0000 0x100>;
> > +			interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
> > +			#ports = <2>;
> > +			clocks = <&syscon ASPEED_CLK_GATE_USBUHCICLK>;
> > +			status = "disabled";
> > +			/*
> > +			 * No default pinmux, it will follow EHCI, use an explicit pinmux
> > +			 * override if you don't enable EHCI
> > +			 */
> > +		};
> > +
> > +		vhub: usb-vhub at 1e6a0000 {
> > +			compatible = "aspeed,ast2600-usb-vhub";
> > +			reg = <0x1e6a0000 0x300>;
> 
> Shouldn't this be at least 0x350 long for all 20 programmable endpoints?

Good catch. Will fix it in patch v2. Thank you for the quick review.


Cheers,

Tao