Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 112c5a64 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Joel Stanley
Browse files

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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: default avatarAndrew Jeffery <andrew@aj.id.au>
Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
parent c282ea74

arch/arm/boot/dts/aspeed-ast2500-evb.dts

+0 −6
Original line number Diff line number Diff line
@@ -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 */

};

arch/arm/boot/dts/aspeed-g5.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -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 {