ARM: dts: aspeed: Add G5 USB host pinmux

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

Remove the properties from the AST2500 EVB board which are
now redundant

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

diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
index ede11c597673677461cd69e527f864685f87b829..2bff1b2538425df7c51fb6aa7366e350bb2b85af 100644 (file)
--- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
+++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
@@ -82,18 +82,12 @@
 
 &ehci0 {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usb2ah_default>;
 };
 
 &ehci1 {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usb2bh_default>;
 };
 
 &uhci {
        status = "okay";
-
-       /* No pinctrl, this follows the above EHCI settings */
 };

diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 17f2714d18a7ec09e4722d557831379e38157b89..dfdc239b86f68ebcd030a7d1189ff931dfcdaaee 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -148,6 +148,8 @@
                        reg = <0x1e6a1000 0x100>;
                        interrupts = <5>;
                        clocks = <&syscon ASPEED_CLK_GATE_USBPORT1CLK>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb2ah_default>;
                        status = "disabled";
                };
 
@@ -156,6 +158,8 @@
                        reg = <0x1e6a3000 0x100>;
                        interrupts = <13>;
                        clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_usb2bh_default>;
                        status = "disabled";
                };
 
@@ -166,6 +170,10 @@
                        #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
+                        */
                };
 
                apb {