From 02d17cfc981c46096d0e57c420d635c470d81ae9 Mon Sep 17 00:00:00 2001
From: Yue Wang <yue.wang@amlogic.com>
Date: Fri, 25 May 2018 14:22:33 +0800
Subject: [PATCH] dts: add usb/pcie/ethernet/uart dts config on g12b skt

PD#165090: add usb/pcie/ethernet/uart dts config on g12b skt

Change-Id: Idba2f66ccac904564f49427269474ec27499a58e
Signed-off-by: yue wang <yue.wang@amlogic.com>
---
 arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts | 44 ++++++++++++++++++++++++++
 arch/arm64/boot/dts/amlogic/mesong12b.dtsi     |  9 ++++--
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
index 1c58613..50e6fbc 100644
--- a/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/g12b_a311d_skt.dts
@@ -28,6 +28,10 @@
 
 	aliases {
 		serial0 = &uart_AO;
+		serial1 = &uart_A;
+		serial2 = &uart_B;
+		serial3 = &uart_C;
+		serial4 = &uart_AO_B;
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
 		i2c2 = &i2c2;
@@ -729,3 +733,43 @@
 	};
 };
 
+&dwc3 {
+	status = "okay";
+};
+
+&usb2_phy_v2 {
+	status = "okay";
+	portnum = <2>;
+};
+
+&usb3_phy_v2 {
+	status = "okay";
+	portnum = <0>;
+	otg = <1>;
+	gpio-vbus-power = "GPIOH_6";
+	gpios = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>;
+};
+
+&dwc2_a {
+	status = "okay";
+	/** 0: normal, 1: otg+dwc3 host only, 2: otg+dwc3 device only*/
+	controller-type = <3>;
+};
+&ethmac {
+	status = "okay";
+	pinctrl-names = "internal_eth_pins";
+	pinctrl-0 = <&internal_eth_pins>;
+	mc_val = <0x4be04>;
+
+	internal_phy=<1>;
+};
+
+&uart_A {
+	status = "okay";
+};
+
+&pcie_A {
+	reset-gpio = <&gpio GPIOX_7 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+};
+
diff --git a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
index 3a6c8b2..c1796cc 100644
--- a/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesong12b.dtsi
@@ -424,6 +424,11 @@
 		pll-setting-1 = <0x09400414>;
 		pll-setting-2 = <0x927E0000>;
 		pll-setting-3 = <0xac5f49e5>;
+		pll-setting-4 = <0xfe18>;
+		pll-setting-5 = <0xfff>;
+		pll-setting-6 = <0xc8000>;
+		pll-setting-7 = <0xe0004>;
+		pll-setting-8 = <0xe000c>;
 	};
 
 	usb3_phy_v2: usb3phy@ffe09080 {
@@ -431,7 +436,7 @@
 		status = "disabled";
 		reg = <0x0 0xffe09080 0x0 0x20>;
 		phy-reg = <0xff646000>;
-		phy-reg-size = <0x4>;
+		phy-reg-size = <0x2000>;
 		usb2-phy-reg = <0xffe09000>;
 		usb2-phy-reg-size = <0x80>;
 		interrupts = <0 16 4>;
@@ -762,7 +767,7 @@
 				xtal_tick_en = <1>;
 				fifosize = < 64 >;
 				pinctrl-names = "default";
-				pinctrl-0 = <&ao_uart_pins>;
+				/*pinctrl-0 = <&ao_uart_pins>;*/
 				support-sysrq = <0>;  /* 0 not support*/
 			};
 
-- 
2.7.4