From 84793b0b4be752c85614278ccd9a285d03ba17d8 Mon Sep 17 00:00:00 2001
From: Yue Wang <yue.wang@amlogic.com>
Date: Mon, 1 Apr 2019 11:37:50 +0800
Subject: [PATCH] usb: bringup TM2 usb [1/1]

PD#SWPL-5609

Problem:
bringup TM2 usb.

Solution:
bringup TM2 usb.

Verify:
TM2

Change-Id: I61f388a516442064af5b21f4688f6787e9e358e9
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
---
 arch/arm/boot/dts/amlogic/mesontm2.dtsi   | 17 ++++++++++++++---
 arch/arm64/boot/dts/amlogic/mesontm2.dtsi | 17 ++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/amlogic/mesontm2.dtsi b/arch/arm/boot/dts/amlogic/mesontm2.dtsi
index 8b879d091793..8ddd3b542f64 100644
--- a/arch/arm/boot/dts/amlogic/mesontm2.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesontm2.dtsi
@@ -435,18 +435,29 @@
 		pll-setting-6 = <0x78000>;
 		pll-setting-7 = <0xe0004>;
 		pll-setting-8 = <0xe000c>;
-		version = <1>;
+		version = <2>;
+		pwr-ctl = <1>;
+		u2-ctrl-sleep-shift = <17>;
+		u2-hhi-mem-pd-shift = <30>;
+		u2-hhi-mem-pd-mask = <0x3>;
+		u2-ctrl-iso-shift = <17>;
 	};
 
 	usb3_phy_v2: usb3phy@ffe09080 {
 		compatible = "amlogic, amlogic-new-usb3-v2";
-		status = "disabled";
-		reg = <0xffe09080 0x20>;
+		status = "disable";
+		reg = <0xffe09080 0x20
+			0xffd01008 0x100>;
 		phy-reg = <0xff646000>;
 		phy-reg-size = <0x2000>;
 		usb2-phy-reg = <0xffe09000>;
 		usb2-phy-reg-size = <0x80>;
 		interrupts = <0 16 4>;
+		pwr-ctl = <1>;
+		u3-ctrl-sleep-shift = <18>;
+		u3-hhi-mem-pd-shift = <26>;
+		u3-hhi-mem-pd-mask = <0xf>;
+		u3-ctrl-iso-shift = <18>;
 	};
 
 	dwc2_a: dwc2_a@ff400000 {
diff --git a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
index 5aeabac2367f..bda1626c7403 100644
--- a/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesontm2.dtsi
@@ -416,18 +416,29 @@
 		pll-setting-6 = <0x78000>;
 		pll-setting-7 = <0xe0004>;
 		pll-setting-8 = <0xe000c>;
-		version = <1>;
+		version = <2>;
+		pwr-ctl = <1>;
+		u2-ctrl-sleep-shift = <17>;
+		u2-hhi-mem-pd-shift = <30>;
+		u2-hhi-mem-pd-mask = <0x3>;
+		u2-ctrl-iso-shift = <17>;
 	};
 
 	usb3_phy_v2: usb3phy@ffe09080 {
 		compatible = "amlogic, amlogic-new-usb3-v2";
-		status = "disabled";
-		reg = <0x0 0xffe09080 0x0 0x20>;
+		status = "disable";
+		reg = <0x0 0xffe09080 0x0 0x20
+			0x0 0xffd01008 0x0 0x100>;
 		phy-reg = <0xff646000>;
 		phy-reg-size = <0x2000>;
 		usb2-phy-reg = <0xffe09000>;
 		usb2-phy-reg-size = <0x80>;
 		interrupts = <0 16 4>;
+		pwr-ctl = <1>;
+		u3-ctrl-sleep-shift = <18>;
+		u3-hhi-mem-pd-shift = <26>;
+		u3-hhi-mem-pd-mask = <0xf>;
+		u3-ctrl-iso-shift = <18>;
 	};
 
 	dwc2_a: dwc2_a@ff400000 {