From 63b8b9fc522a812f87521d2a771e249adbc25b44 Mon Sep 17 00:00:00 2001
From: Yun Cai <yun.cai@amlogic.com>
Date: Fri, 5 May 2017 14:41:21 +0800
Subject: [PATCH] clk: add amlogic,axg-clkc.h for mesonaxg.dtsi

PD#142470: add amlogic,axg-clkc.h for mesonaxg.dtsi
and fix clkc reg value

Change-Id: Ib19288881241277b4146c89c49b6dce8639df411
Signed-off-by: Yun Cai <yun.cai@amlogic.com>
---
 arch/arm64/boot/dts/amlogic/axg_pxp.dts   | 15 ------------
 arch/arm64/boot/dts/amlogic/mesonaxg.dtsi | 28 ++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/axg_pxp.dts b/arch/arm64/boot/dts/amlogic/axg_pxp.dts
index 3e9899dfebe2..834a81962828 100644
--- a/arch/arm64/boot/dts/amlogic/axg_pxp.dts
+++ b/arch/arm64/boot/dts/amlogic/axg_pxp.dts
@@ -57,20 +57,5 @@
 
 	};
 
-
-	uart_AO: serial@ff803000 {
-		compatible = "amlogic, meson-uart";
-		reg = <0x0 0xff803000 0x0 0x18>;
-		interrupts = <0 193 1>;
-		status = "okay";
-		clocks = <&xtal>;
-		clock-names = "clk_uart";
-		xtal_tick_en = <1>;
-		fifosize = < 64 >;
-//		pinctrl-names = "default";
-//		pinctrl-0 = <&uart_ao_a_pins>;
-		support-sysrq = <0>;	/* 0 not support , 1 support */
-	};
-
 }; /* end of / */
 
diff --git a/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi b/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
index c57a6dec2325..bdf1e05780b7 100644
--- a/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi
@@ -16,6 +16,8 @@
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/clock/amlogic,axg-clkc.h>
+#include <dt-bindings/gpio/mesonaxg-gpio.h>
 
 / {
 	cpus:cpus {
@@ -297,7 +299,7 @@
 			clkc: clock-controller@0 {
 				compatible = "amlogic,axg-clkc";
 				#clock-cells = <1>;
-				reg = <0x0 0x3c000 0x0 0x320>;
+				reg = <0x0 0x0 0x0 0x320>;
 			};
 		};/* end of hiubus*/
 	}; /* end of soc*/
@@ -311,6 +313,14 @@
 			function = "ir_in";
 		};
 	};
+
+	ao_uart_pins:ao_uart {
+			mux {
+				pins = "GPIOAO_0",
+					"GPIOAO_1";
+				function = "uart_ao_a";
+			};
+		};
 }; /* end of pinctrl_aobus */
 
 &pinctrl_periphs {
@@ -329,3 +339,19 @@
 
 	};
 }; /* end of pinctrl_periphs */
+
+&aobus{
+	uart_AO: serial@3000 {
+		compatible = "amlogic, meson-uart";
+		reg = <0x0 0x3000 0x0 0x18>;
+		interrupts = <0 193 1>;
+		status = "okay";
+		clocks = <&xtal>;
+		clock-names = "clk_uart";
+		xtal_tick_en = <1>;
+		fifosize = < 64 >;
+		pinctrl-names = "default";
+		pinctrl-0 = <&ao_uart_pins>;
+		support-sysrq = <0>;	/* 0 not support , 1 support */
+	};
+};