From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 14 Jun 2022 09:27:16 +0000 (+0200)
Subject: Revert "ARM: dts: aspeed: Add USB2.0 device controller node"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=235a6d80f021d9c3bb5652fb6b19d092a7339248;p=linux.git

Revert "ARM: dts: aspeed: Add USB2.0 device controller node"

This reverts commit 2cee50bf459051d1b41d0deee25e930a788cb94e.

It was already applied, and with this duplicate there is now build
problems.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: Bagas Sanjaya <bagasdotme@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
index 1ccd7bb6fe3cb..6660564855ff8 100644
--- a/arch/arm/boot/dts/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed-g6.dtsi
@@ -317,16 +317,6 @@
 			status = "disabled";
 		};
 
-		udc: usb@1e6a2000 {
-			compatible = "aspeed,ast2600-udc";
-			reg = <0x1e6a2000 0x300>;
-			interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&syscon ASPEED_CLK_GATE_USBPORT2CLK>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_usb2bd_default>;
-			status = "disabled";
-		};
-
 		apb {
 			compatible = "simple-bus";
 			#address-cells = <1>;