ARM: dts: aspeed: Add G4 USB pinmux

Set the default pinmux for EHCI so boards don't have to do
it, and document why it is not set for UHCI.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 75df1573380e923ac7f9bacdd5b8edb381a897c8..1d7ffa9fdb11d1d51be6751f8c6ab086156f9fee 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -113,6 +113,8 @@
                        reg = <0x1e6a1000 0x100>;
                        interrupts = <5>;
                        clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb2h_default>;
                        status = "disabled";
                };
 
@@ -123,6 +125,10 @@
                        #ports = <3>;
                        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
+                        */
                };
 
                apb {