From 005bb7ccbec9b668ca57b6d9e5434939b0d0f476 Mon Sep 17 00:00:00 2001
From: Dongjin Kim <tobetter@gmail.com>
Date: Mon, 9 Sep 2019 15:05:36 +0900
Subject: [PATCH] ODROID-C4: dts/amlogic: fix USB host on new board rev 0.3

- GPIOH_5 is dedicated to GPIO pin header
- USB host port is fixed

Change-Id: I899028cc1513806de1132e0aa06ca5e9facd7fef
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
---
 .../boot/dts/amlogic/meson64_odroidc4.dts      |  8 ++++----
 .../dts/amlogic/mesong12a_odroid_common.dtsi   | 18 ++++++++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
index 2a6e5a8895a7..43c1d318d30b 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4.dts
@@ -745,6 +745,10 @@
 		reg = <0x0 0xff808040 0x0 0x44>;
 		status = "ok";
 	};
+
+	gpio-reset {
+		/delete-node/ usb_hub_en;
+	};
 }; /* end of / */
 
 &audiobus {
@@ -848,7 +852,3 @@
 &meson_cooldev {
 	status = "okay";
 };
-
-&usb3_phy_v2 {
-	portnum = <0>;
-};
diff --git a/arch/arm64/boot/dts/amlogic/mesong12a_odroid_common.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a_odroid_common.dtsi
index 6ebad038e470..8a8146d32e4f 100644
--- a/arch/arm64/boot/dts/amlogic/mesong12a_odroid_common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12a_odroid_common.dtsi
@@ -69,6 +69,20 @@
 		};
 	};
 
+	gpio-reset {
+		compatible = "linux,gpio-reset";
+		usb_hub_en {
+			gpios = <&gpio GPIOH_5 GPIO_ACTIVE_HIGH>;
+			asserted-state = <0>;
+			duration-ms = <100>;
+		};
+		usb_hub {
+			gpios = <&gpio GPIOH_4 GPIO_ACTIVE_HIGH>;
+			asserted-state = <0>;
+			duration-ms = <100>;
+		};
+	};
+
 	efuse: efuse{
 		compatible = "amlogic, efuse";
 		read_cmd = <0x82000030>;
@@ -207,8 +221,8 @@
 };
 
 &pcie_A {
-	reset-gpio = <&gpio GPIOH_4 GPIO_ACTIVE_HIGH>;
-	status = "okay";
+	reset-gpio = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
+	status = "disabled";
 };
 
 &sd_emmc_c {