From: Luan Yuan <luan.yuan@amlogic.com>
Date: Fri, 5 Jul 2019 07:43:43 +0000 (+0800)
Subject: dts: set s912 adb. [1/1]
X-Git-Tag: hardkernel-4.9.236-104~980
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39758a8e7e806ed9bed7048bdd9b2847ad0cc238;p=platform%2Fkernel%2Flinux-amlogic.git

dts: set s912 adb. [1/1]

PD#SWPL-10860

Problem:
s912 need to support adb.

Solution:
update dts

Verify:
verify by hertz

Change-Id: I085a0442d229d13d02b963c948d390920aea3dd0
Signed-off-by: Luan Yuan <luan.yuan@amlogic.com>
---

diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts
index 91a5e72..a358dfb 100644
--- a/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts
+++ b/arch/arm/boot/dts/amlogic/gxm_q201_1g.dts
@@ -639,10 +639,6 @@
 		compatible = "amlogic, amlogic-new-usb3";
 		portnum = <0>;
 		reg = <0xd0078080 0x20>;
-		interrupts = <0 16 4>;
-		otg = <1>;
-		gpio-vbus-power = "GPIOAO_5";
-		gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
 	};
 
 	dwc2_a {
@@ -661,7 +657,7 @@
 		port-id-mode = <0>; /** 0: hardware, 1: sw_host, 2: sw_slave*/
 		usb-fifo = <728>;
 		cpu-type = "gxl";
-		controller-type = <3>; /** 0: normal,1:host,2:device,3:otg*/
+		controller-type = <1>; /** 0: normal,1:host,2:device,3:otg*/
 		phy-reg = <0xd0078000>;
 		phy-reg-size = <0xa0>;
 		clocks = <&clkc CLKID_USB_GENERAL
diff --git a/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts
index d7b46da..37cb004 100644
--- a/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts
+++ b/arch/arm/boot/dts/amlogic/gxm_q201_2g.dts
@@ -641,10 +641,6 @@
 		compatible = "amlogic, amlogic-new-usb3";
 		portnum = <0>;
 		reg = <0xd0078080 0x20>;
-		interrupts = <0 16 4>;
-		otg = <1>;
-		gpio-vbus-power = "GPIOAO_5";
-		gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
 	};
 
 	dwc2_a {
@@ -663,7 +659,7 @@
 		port-id-mode = <0>; /** 0: hardware, 1: sw_host, 2: sw_slave*/
 		usb-fifo = <728>;
 		cpu-type = "gxl";
-		controller-type = <3>; /** 0: normal,1:host,2:device,3:otg*/
+		controller-type = <1>; /** 0: normal,1:host,2:device,3:otg*/
 		phy-reg = <0xd0078000>;
 		phy-reg-size = <0xa0>;
 		clocks = <&clkc CLKID_USB_GENERAL
diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
index 3674acc..3558b99 100644
--- a/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_q201_1g.dts
@@ -639,10 +639,6 @@
 		compatible = "amlogic, amlogic-new-usb3";
 		portnum = <0>;
 		reg = <0x0 0xd0078080 0x0 0x20>;
-		interrupts = <0 16 4>;
-		otg = <1>;
-		gpio-vbus-power = "GPIOAO_5";
-		gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
 	};
 
 	dwc2_a {
@@ -661,7 +657,7 @@
 		port-id-mode = <0>; /** 0: hardware, 1: sw_host, 2: sw_slave*/
 		usb-fifo = <728>;
 		cpu-type = "gxl";
-		controller-type = <3>; /** 0: normal,1:host,2:device,3:otg*/
+		controller-type = <1>; /** 0: normal,1:host,2:device,3:otg*/
 		phy-reg = <0xd0078000>;
 		phy-reg-size = <0xa0>;
 		clocks = <&clkc CLKID_USB_GENERAL
diff --git a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
index 0e464cb..348e521 100644
--- a/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
+++ b/arch/arm64/boot/dts/amlogic/gxm_q201_2g.dts
@@ -641,10 +641,6 @@
 		compatible = "amlogic, amlogic-new-usb3";
 		portnum = <0>;
 		reg = <0x0 0xd0078080 0x0 0x20>;
-		interrupts = <0 16 4>;
-		otg = <1>;
-		gpio-vbus-power = "GPIOAO_5";
-		gpios = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;
 	};
 
 	dwc2_a {
@@ -663,7 +659,7 @@
 		port-id-mode = <0>; /** 0: hardware, 1: sw_host, 2: sw_slave*/
 		usb-fifo = <728>;
 		cpu-type = "gxl";
-		controller-type = <3>; /** 0: normal,1:host,2:device,3:otg*/
+		controller-type = <1>; /** 0: normal,1:host,2:device,3:otg*/
 		phy-reg = <0xd0078000>;
 		phy-reg-size = <0xa0>;
 		clocks = <&clkc CLKID_USB_GENERAL