Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: aspeed-g6: add usb functions

Add USB components and according pin groups in aspeed-g6 dtsi.

Signed-off-by: Tao Ren <rentao.bupt@gmail.com>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Felipe Balbi <balbi@kernel.org>

authored by

Tao Ren and committed by
Felipe Balbi
3f796460 b9a57990

+70
+25
arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi
··· 1112 1112 groups = "UART9"; 1113 1113 }; 1114 1114 1115 + pinctrl_usb2ah_default: usb2ah_default { 1116 + function = "USB2AH"; 1117 + groups = "USBA"; 1118 + }; 1119 + 1120 + pinctrl_usb2ad_default: usb2ad_default { 1121 + function = "USB2AD"; 1122 + groups = "USBA"; 1123 + }; 1124 + 1125 + pinctrl_usb2bh_default: usb2bh_default { 1126 + function = "USB2BH"; 1127 + groups = "USBB"; 1128 + }; 1129 + 1130 + pinctrl_usb2bd_default: usb2bd_default { 1131 + function = "USB2BD"; 1132 + groups = "USBB"; 1133 + }; 1134 + 1135 + pinctrl_usb11bhid_default: usb11bhid_default { 1136 + function = "USB11BHID"; 1137 + groups = "USBB"; 1138 + }; 1139 + 1115 1140 pinctrl_vb_default: vb_default { 1116 1141 function = "VB"; 1117 1142 groups = "VB";
+45
arch/arm/boot/dts/aspeed-g6.dtsi
··· 245 245 status = "disabled"; 246 246 }; 247 247 248 + ehci0: usb@1e6a1000 { 249 + compatible = "aspeed,ast2600-ehci", "generic-ehci"; 250 + reg = <0x1e6a1000 0x100>; 251 + interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; 252 + clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>; 253 + pinctrl-names = "default"; 254 + pinctrl-0 = <&pinctrl_usb2ah_default>; 255 + status = "disabled"; 256 + }; 257 + 258 + ehci1: usb@1e6a3000 { 259 + compatible = "aspeed,ast2600-ehci", "generic-ehci"; 260 + reg = <0x1e6a3000 0x100>; 261 + interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; 262 + clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>; 263 + pinctrl-names = "default"; 264 + pinctrl-0 = <&pinctrl_usb2bh_default>; 265 + status = "disabled"; 266 + }; 267 + 268 + uhci: usb@1e6b0000 { 269 + compatible = "aspeed,ast2600-uhci", "generic-uhci"; 270 + reg = <0x1e6b0000 0x100>; 271 + interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; 272 + #ports = <2>; 273 + clocks = <&syscon ASPEED_CLK_GATE_USBUHCICLK>; 274 + status = "disabled"; 275 + /* 276 + * No default pinmux, it will follow EHCI, use an 277 + * explicit pinmux override if EHCI is not enabled. 278 + */ 279 + }; 280 + 281 + vhub: usb-vhub@1e6a0000 { 282 + compatible = "aspeed,ast2600-usb-vhub"; 283 + reg = <0x1e6a0000 0x350>; 284 + interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; 285 + clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>; 286 + aspeed,vhub-downstream-ports = <7>; 287 + aspeed,vhub-generic-endpoints = <21>; 288 + pinctrl-names = "default"; 289 + pinctrl-0 = <&pinctrl_usb2ad_default>; 290 + status = "disabled"; 291 + }; 292 + 248 293 apb { 249 294 compatible = "simple-bus"; 250 295 #address-cells = <1>;