This modifies the FreeBSD Amlogic DTS files to use the GNU files

as the base.

Submitted by:	John Wehle
Reviewed by:	imp

2 files changed, 171 insertions, 365 deletions

diff --git a/sys/boot/fdt/dts/arm/odroidc1.dts b/sys/boot/fdt/dts/arm/odroidc1.dts
index 6a90ed4..c65344b 100644
--- a/sys/boot/fdt/dts/arm/odroidc1.dts
+++ b/sys/boot/fdt/dts/arm/odroidc1.dts
@@ -39,6 +39,8 @@
 
 /memreserve/ 0x7900000 0x00600000;			/* 6MB frame buffer */
 
+#include "meson8b.dtsi"
+
 / {
 	model = "hardkernel,odroid-c1";
 	compatible = "hardkernel,odroid-c1", "amlogic,s805";
@@ -46,41 +48,10 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	interrupt-parent = <&gic>;
-
 	aliases {
 		soc = &soc;
 		screen = &screen;
-		uart0 = &uart0;
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			device_type = "cpu";
-			compatible = "arm,cortex-a5";
-			reg = <0x0>;
-		};
-
-		cpu@1 {
-			device_type = "cpu";
-			compatible = "arm,cortex-a5";
-			reg = <0x1>;
-		};
-
-		cpu@2 {
-			device_type = "cpu";
-			compatible = "arm,cortex-a5";
-			reg = <0x2>;
-		};
-
-		cpu@3 {
-			device_type = "cpu";
-			compatible = "arm,cortex-a5";
-			reg = <0x3>;
-		};
+		uart0 = &uart_AO;
 	};
 
 	memory {
@@ -88,60 +59,37 @@
 		reg = <0x0 0x40000000>;		/* 1GB RAM */
 	};
 
-	soc: soc@c0000000 {
+	soc: soc {
 		device_type = "soc";
-		compatible = "simple-bus";
 		bus-frequency = <0>;
 
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		ranges = <0x0 0xc0000000 0x1a100000>;
-
-		gic: gic@4301000 {
-			device_type = "interrupt-controller";
-			compatible = "arm,gic";
-			reg = <0x4301000 0x1000>, // distributer registers
-			      <0x4300100 0x0100>; // CPU if registers
-
-			interrupt-controller;
-			#interrupt-cells = <1>;
-		};
-
-		scu: scu@4300000 {
+		scu: scu@c4300000 {
 			compatible = "arm,cortex-a5-scu";
-			reg = <0x4300000 0x1000>;
+			reg = <0xc4300000 0x1000>;
 		};
 
-		cpuconfig: cpuconfig@1901ff80 {
+		cpuconfig: cpuconfig@d901ff80 {
 			compatible = "amlogic,aml8726-cpuconfig";
-			reg = <0x1901ff80 16>;
+			reg = <0xd901ff80 16>;
 		};
 
-		pl310@4200000 {
-			compatible = "arm,pl310";
-			reg = <0x4200000 0x1000>;
-			interrupts = <61>;
-			interrupt-parent = <&gic>;
-		};
-
-		ccm@1104140 {
+		ccm@c1104140 {
 			compatible = "amlogic,aml8726-ccm";
-			reg = <0x1104140 20>;	/* cbus 0x1050 */
+			reg = <0xc1104140 20>;	/* cbus 0x1050 */
 
 			functions = "ethernet", "i2c", "rng", "sdio", "sdxc",
 				    "uart-a", "uart-b", "uart-c",
 				    "usb-a", "usb-b";
 		};
 
-		pinctrl@11080b0 {
+		pinctrl@c11080b0 {
 			compatible = "amlogic,aml8726-pinctrl";
-			reg = <0x11080b0 40>,	/* mux */
-			      <0x11080e8 24>,	/* pu/pd */
-			      <0x1108120 24>,	/* pull enable */
-			      <0x8100014 4>,	/* ao mux */
-			      <0x810002c 4>,	/* ao pu/pd */
-			      <0x810002c 4>;	/* ao pull enable */
+			reg = <0xc11080b0 40>,	/* mux */
+			      <0xc11080e8 24>,	/* pu/pd */
+			      <0xc1108120 24>,	/* pull enable */
+			      <0xc8100014 4>,	/* ao mux */
+			      <0xc810002c 4>,	/* ao pu/pd */
+			      <0xc810002c 4>;	/* ao pull enable */
 
 			/*
 			 * Currently only pin muxing that deviates
@@ -242,24 +190,10 @@
 			};
 		};
 
-		watchdog@1109900 {
-			compatible = "amlogic,aml8726-wdt";
-			reg = <0x1109900 8>;	/* cbus 0x2640 */
-			interrupts = <0>;
-			interrupt-parent = <&gic>;
-		};
-
-		timer@1109940 {
-			compatible = "amlogic,aml8726-timer";
-			reg = <0x1109940 24>;	/* cbus 0x2650 */
-			interrupts = <10 11 6 29>;
-			interrupt-parent = <&gic>;
-		};
-
-		rtc@8100740 {
+		rtc@c8100740 {
 			compatible = "amlogic,aml8726-rtc";
-			reg = <0x8100740 20>;	/* aobus 0x1d0 */
-			interrupts = <72>;
+			reg = <0xc8100740 20>;	/* aobus 0x1d0 */
+			interrupts = <0 72 1>;
 			interrupt-parent = <&gic>;
 
 			init-always = "false";
@@ -267,62 +201,55 @@
 			gpo-init = <0x500000>;
 		};
 
-		clkmsr: clkmsr@1108758 {
+		clkmsr: clkmsr@c1108758 {
 			compatible = "amlogic,aml8726-clkmsr";
-			reg = <0x1108758 16>;	/* cbus 0x21d6 */
-		};
+			reg = <0xc1108758 16>;	/* cbus 0x21d6 */
 
-		uart0: uart@81004c0 {
-			/* uart-ao */
-			device_type = "serial";
-			compatible = "amlogic,aml8726-uart";
-			clock-frequency = <0>;
-			current-speed = <115200>;
-			reg = <0x81004c0 20>;	/* aobus 0x130 */
-			interrupts = <90>;
-			interrupt-parent = <&gic>;
+			clocks = <&clk81>;
 		};
 
-		gpioao: gpio@8100024 {
+		gpioao: gpio@c8100024 {
 			/* gpio unit 7 */
 			compatible = "amlogic,aml8726-gpio";
-			reg = <0x8100024 4>,	/* oen aobus 0x9 */
-			      <0x8100024 4>,	/* out */
-			      <0x8100028 4>;	/* in */
+			reg = <0xc8100024 4>,	/* oen aobus 0x9 */
+			      <0xc8100024 4>,	/* out */
+			      <0xc8100028 4>;	/* in */
 
 			gpio-controller;
 			#gpio-cells = <1>;
 			pin-count = <14>;
 		};
 
-		gpio3: gpio@1108054 {
+		gpio3: gpio@c1108054 {
 			compatible = "amlogic,aml8726-gpio";
-			reg = <0x1108054 4>,	/* oen cbus 0x2015 */
-			      <0x1108058 4>,	/* out */
-			      <0x110805c 4>;	/* in */
+			reg = <0xc1108054 4>,	/* oen cbus 0x2015 */
+			      <0xc1108058 4>,	/* out */
+			      <0xc110805c 4>;	/* in */
 
 			gpio-controller;
 			#gpio-cells = <1>;
 			pin-count = <32>;
 		};
 
-		gpio5: gpio@110806c {
+		gpio5: gpio@c110806c {
 			compatible = "amlogic,aml8726-gpio";
-			reg = <0x110806c 4>,	/* oen cbus 0x201b */
-			      <0x1108070 4>,	/* out */
-			      <0x1108074 4>;	/* in */
+			reg = <0xc110806c 4>,	/* oen cbus 0x201b */
+			      <0xc1108070 4>,	/* out */
+			      <0xc1108074 4>;	/* in */
 
 			gpio-controller;
 			#gpio-cells = <1>;
 			pin-count = <32>;
 		};
 
-		mmc@1108c20 {
+		mmc@c1108c20 {
 			compatible = "amlogic,aml8726-mmc";
-			reg = <0x1108c20 32>;	/* cbus 0x2308 */
-			interrupts = <28>;
+			reg = <0xc1108c20 32>;	/* cbus 0x2308 */
+			interrupts = <0 28 1>;
 			interrupt-parent = <&gic>;
 
+			clocks = <&clk81>;
+
 			pinctrl-names = "default";
 			pinctrl-0 = <&pins_sdio_b>;
 
@@ -342,11 +269,11 @@
 			ins-detect = <&gpio5 29 0>;	/* card_6 */
 		};
 
-		sdxc@1108e00 {
+		sdxc@c1108e00 {
 			compatible = "amlogic,aml8726-sdxc-m8";
 			clock-frequency = <1275000000>;
-			reg = <0x1108e00 60>;	/* cbus 0x2380 */
-			interrupts = <78>;
+			reg = <0xc1108e00 60>;	/* cbus 0x2380 */
+			interrupts = <0 78 1>;
 			interrupt-parent = <&gic>;
 
 			pinctrl-names = "default";
@@ -357,82 +284,33 @@
 			mmc-rst = <&gpio3 9 0>;	/* boot_9 emmc-rst */
 		};
 
-		rng@1108100 {
+		rng@c1108100 {
 			compatible = "amlogic,aml8726-rng";
-			reg = <0x1108100 8>;	/* cbus 0x2040 */
+			reg = <0xc1108100 8>;	/* cbus 0x2040 */
 		};
 
-		i2c@1108500 {
-			/* i2c-a */
-			compatible = "amlogic,aml8726-i2c";
-			reg = <0x1108500 32>;	/* cbus 0x2140 */
-			interrupts = <21>;
-			interrupt-parent = <&gic>;
-		};
-
-		i2c@11087c0 {
-			/* i2c-b */
-			compatible = "amlogic,aml8726-i2c";
-			reg = <0x11087c0 32>;	/* cbus 0x21f0 */
-			interrupts = <128>;
-			interrupt-parent = <&gic>;
-		};
-
-		uart@11084c0 {
-			/* uart-a */
-			device_type = "serial";
-			compatible = "amlogic,aml8726-uart";
-			clock-frequency = <0>;
-			current-speed = <115200>;
-			reg = <0x11084c0 20>;	/* cbus 0x2130 */
-			interrupts = <26>;
-			interrupt-parent = <&gic>;
-		};
-
-		uart@11084dc {
-			/* uart-b */
-			device_type = "serial";
-			compatible = "amlogic,aml8726-uart";
-			clock-frequency = <0>;
-			current-speed = <115200>;
-			reg = <0x11084dc 20>;	/* cbus 0x2137 */
-			interrupts = <75>;
-			interrupt-parent = <&gic>;
-		};
-
-		uart@1108700 {
-			/* uart-c */
-			device_type = "serial";
-			compatible = "amlogic,aml8726-uart";
-			clock-frequency = <0>;
-			current-speed = <115200>;
-			reg = <0x1108700 20>;	/* cbus 0x21c0 */
-			interrupts = <93>;
-			interrupt-parent = <&gic>;
-		};
-
-		usb-phy@1108800 {
+		usb-phy@c1108800 {
 			/* usb-a phy */
 			compatible = "amlogic,aml8726-m8-usb-phy";
-			reg = <0x1108800 32>;	/* cbus 0x2200 */
+			reg = <0xc1108800 32>;	/* cbus 0x2200 */
 
 			usb-pwr-en = <&gpioao 5 1>;	/* gpioao_5 vbus */
 		};
 
-		usb-phy@1108820 {
+		usb-phy@c1108820 {
 			/* usb-b phy */
 			compatible = "amlogic,aml8726-m8-usb-phy";
-			reg = <0x1108820 32>;	/* cbus 0x2208 */
+			reg = <0xc1108820 32>;	/* cbus 0x2208 */
 
 			force-aca = "true";
 			usb-hub-rst = <&gpioao 4 0>;	/* gpioao_4 hub-rst */
 		};
 
-		usb@9040000 {
+		usb@c9040000 {
 			/* usb-a */
 			compatible = "synopsys,designware-hs-otg2";
-			reg = <0x9040000 0x40000>;	/* ahbbus 0x40000*/
-			interrupts = <30>;
+			reg = <0xc9040000 0x40000>;	/* ahbbus 0x40000*/
+			interrupts = <0 30 4>;
 			interrupt-parent = <&gic>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -440,11 +318,11 @@
 			dr_mode = "host";
 		};
 
-		usb@90c0000 {
+		usb@c90c0000 {
 			/* usb-b */
 			compatible = "synopsys,designware-hs-otg2";
-			reg = <0x90c0000 0x40000>;	/* ahbbus 0xc0000 */
-			interrupts = <31>;
+			reg = <0xc90c0000 0x40000>;	/* ahbbus 0xc0000 */
+			interrupts = <0 31 4>;
 			interrupt-parent = <&gic>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -452,11 +330,11 @@
 			dr_mode = "host";
 		};
 
-		eth@9410000 {
+		eth@c9410000 {
 			/* ethernet */
 			compatible = "snps,dwmac";
-			reg = <0x9410000 0x2000>;	/* ahbbus 0x410000 */
-			interrupts = <8>;
+			reg = <0xc9410000 0x2000>;	/* ahbbus 0x410000 */
+			interrupts = <0 8 1>;
 			interrupt-parent = <&gic>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -464,13 +342,16 @@
 			eth-phy-rst = <&gpio3 23 0>;	/* gpioh_4 phy-rst */
 		};
 
-		screen: fb@8006020 {
+		screen: fb@c8006020 {
 			device_type = "display";
 			compatible = "amlogic,aml8726-fb";
-			reg = <0x8006048 12>,	/* CANVAS */
-			      <0x1106800 1024>,	/* VIU */
-			      <0x1107400 1024>;	/* VPP */
-			interrupts = <2 3 12 13>;
+			reg = <0xc8006048 12>,	/* CANVAS */
+			      <0xc1106800 1024>,	/* VIU */
+			      <0xc1107400 1024>;	/* VPP */
+			interrupts = <0 2 1>,
+				     <0 3 1>,
+				     <0 12 1>,
+				     <0 13 1>;
 			interrupt-parent = <&gic>;
 
 			address = <0x7900000>;	/* match memreserve */
@@ -495,3 +376,32 @@
 		stdout = "uart0";
 	};
 };
+
+&clk81 {
+	clock-frequency = <0>;
+};
+
+&uart_AO {
+	status = "okay";
+	current-speed = <115200>;
+};
+
+&uart_A {
+	status = "okay";
+};
+
+&uart_B {
+	status = "okay";
+};
+
+&uart_C {
+	status = "okay";
+};
+
+&i2c_A {
+	status = "okay";
+};
+
+&i2c_B {
+	status = "okay";
+};
diff --git a/sys/boot/fdt/dts/arm/vsatv102-m6.dts b/sys/boot/fdt/dts/arm/vsatv102-m6.dts
index 639e010..ad3b5a1 100644
--- a/sys/boot/fdt/dts/arm/vsatv102-m6.dts
+++ b/sys/boot/fdt/dts/arm/vsatv102-m6.dts
@@ -39,6 +39,8 @@
 
 /memreserve/ 0x84900000 0x00600000;			/* 6MB frame buffer */
 
+#include "meson6.dtsi"
+
 / {
 	/*
 	 * My development unit visually appears to be a Visson ATV-102
@@ -50,34 +52,15 @@
 	 */
 
 	model = "visson,atv-102";
-	compatible = "visson,atv-102", "amlogic,aml8726-m6";
+	compatible = "visson,atv-102", "amlogic,meson6";
 
 	#address-cells = <1>;
 	#size-cells = <1>;
 
-	interrupt-parent = <&gic>;
-
 	aliases {
 		soc = &soc;
 		screen = &screen;
-		uart0 = &uart0;
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			device_type = "cpu";
-			compatible = "arm,cortex-a9";
-			reg = <0x0>;
-		};
-
-		cpu@1 {
-			device_type = "cpu";
-			compatible = "arm,cortex-a9";
-			reg = <0x1>;
-		};
+		uart0 = &uart_AO;
 	};
 
 	memory {
@@ -85,69 +68,46 @@
 		reg = <0x80000000 0x40000000>;		/* 1GB RAM */
 	};
 
-	soc: soc@c0000000 {
+	soc: soc {
 		device_type = "soc";
-		compatible = "simple-bus";
 		bus-frequency = <0>;
 
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		ranges = <0x0 0xc0000000 0x1a100000>;
-
-		pic: pic@1109a40 {
+		pic: pic@c1109a40 {
 			device_type = "interrupt-controller";
 			compatible = "amlogic,aml8726-pic";
-			reg = <0x1109a40 128>;	/* cbus 0x2690 */
+			reg = <0xc1109a40 128>;	/* cbus 0x2690 */
 
 			interrupt-controller;
-			#interrupt-cells = <1>;
+			#interrupt-cells = <3>;
 		};
 
-		gic: gic@4301000 {
-			device_type = "interrupt-controller";
-			compatible = "arm,gic";
-			reg = <0x4301000 0x1000>, /* distributer registers */
-			      <0x4300100 0x0100>; /* CPU if registers */
-
-			interrupt-controller;
-			#interrupt-cells = <1>;
-		};
-
-		scu: scu@4300000 {
+		scu: scu@c4300000 {
 			compatible = "arm,cortex-a9-scu";
-			reg = <0x4300000 0x1000>;
+			reg = <0xc4300000 0x1000>;
 		};
 
-		cpuconfig: cpuconfig@1901ff80 {
+		cpuconfig: cpuconfig@d901ff80 {
 			compatible = "amlogic,aml8726-cpuconfig";
-			reg = <0x1901ff80 8>;
-		};
-
-		pl310@4200000 {
-			compatible = "arm,pl310";
-			reg = <0x4200000 0x1000>;
-			interrupts = <61>;	/* AM_IRQ1(29) */
-			interrupt-parent = <&gic>;
+			reg = <0xd901ff80 8>;
 		};
 
-		ccm@1104140 {
+		ccm@c1104140 {
 			compatible = "amlogic,aml8726-ccm";
-			reg = <0x1104140 20>;	/* cbus 0x1050 */
+			reg = <0xc1104140 20>;	/* cbus 0x1050 */
 
 			functions = "ethernet", "i2c", "rng", "sdio",
 				    "uart-a", "uart-b", "uart-c",
 				    "usb-a", "usb-b";
 		};
 
-		pinctrl: pinctrl@11080b0 {
+		pinctrl: pinctrl@c11080b0 {
 			compatible = "amlogic,aml8726-pinctrl";
-			reg = <0x11080b0 40>,	/* mux */
-			      <0x11080e8 24>,	/* pu/pd */
-			      <0x11080e8 24>,	/* pull enable */
-			      <0x8100014 4>,	/* ao mux */
-			      <0x810002c 4>,	/* ao pu/pd */
-			      <0x810002c 4>;	/* ao pull enable */
+			reg = <0xc11080b0 40>,	/* mux */
+			      <0xc11080e8 24>,	/* pu/pd */
+			      <0xc11080e8 24>,	/* pull enable */
+			      <0xc8100014 4>,	/* ao mux */
+			      <0xc810002c 4>,	/* ao pu/pd */
+			      <0xc810002c 4>;	/* ao pull enable */
 
 			/*
 			 * Currently only pin muxing that deviates
@@ -189,27 +149,10 @@
 			};
 		};
 
-		watchdog@1109900 {
-			compatible = "amlogic,aml8726-wdt";
-			reg = <0x1109900 8>;	/* cbus 0x2640 */
-			interrupts = <0>;	/* AM_IRQ0(0) */
-			interrupt-parent = <&gic>;
-		};
-
-		timer@1109940 {
-			compatible = "amlogic,aml8726-timer";
-			reg = <0x1109940 24>;	/* cbus 0x2650 */
-			interrupts = <10	/* AM_IRQ0(10) */
-				      11	/* AM_IRQ0(11) */
-				      6		/* AM_IRQ0(6)  */
-				      29>;	/* AM_IRQ0(29) */
-			interrupt-parent = <&gic>;
-		};
-
-		rtc@1a004340 {
+		rtc@da004340 {
 			compatible = "amlogic,aml8726-rtc";
-			reg = <0x1a004340 20>;	/* secbus2 0xd0 */
-			interrupts = <72>;	/* AM_IRQ2(8) */
+			reg = <0xda004340 20>;	/* secbus2 0xd0 */
+			interrupts = <0 72 1>;	/* AM_IRQ2(8) */
 			interrupt-parent = <&gic>;
 
 			init-always = "false";
@@ -217,62 +160,55 @@
 			gpo-init = <0x500000>;
 		};
 
-		clkmsr: clkmsr@1108758 {
+		clkmsr: clkmsr@c1108758 {
 			compatible = "amlogic,aml8726-clkmsr";
-			reg = <0x1108758 16>;	/* cbus 0x21d6 */
-		};
+			reg = <0xc1108758 16>;	/* cbus 0x21d6 */
 
-		uart0: uart@81004c0 {
-			/* uart-ao */
-			device_type = "serial";
-			compatible = "amlogic,aml8726-uart";
-			clock-frequency = <0>;
-			current-speed = <115200>;
-			reg = <0x81004c0 20>;	/* aobus 0x130 */
-			interrupts = <90>;	/* AM_IRQ2(26) */
-			interrupt-parent = <&gic>;
+			clocks = <&clk81>;
 		};
 
-		gpioao: gpio@8100024 {
+		gpioao: gpio@c8100024 {
 			/* gpio unit 7 */
 			compatible = "amlogic,aml8726-gpio";
-			reg = <0x8100024 4>,	/* oen aobus 0x9 */
-			      <0x8100024 4>,	/* out */
-			      <0x8100028 4>;	/* in */
+			reg = <0xc8100024 4>,	/* oen aobus 0x9 */
+			      <0xc8100024 4>,	/* out */
+			      <0xc8100028 4>;	/* in */
 
 			gpio-controller;
 			#gpio-cells = <1>;
 			pin-count = <12>;
 		};
 
-		gpio5: gpio@110806c {
+		gpio5: gpio@c110806c {
 			compatible = "amlogic,aml8726-gpio";
-			reg = <0x110806c 4>,	/* oen cbus 0x201b */
-			      <0x1108070 4>,	/* out */
-			      <0x1108074 4>;	/* in */
+			reg = <0xc110806c 4>,	/* oen cbus 0x201b */
+			      <0xc1108070 4>,	/* out */
+			      <0xc1108074 4>;	/* in */
 
 			gpio-controller;
 			#gpio-cells = <1>;
 			pin-count = <32>;
 		};
 
-		gpio6: gpio@1108020 {
+		gpio6: gpio@c1108020 {
 			compatible = "amlogic,aml8726-gpio";
-			reg = <0x1108020 4>,	/* oen cbus 0x2008 */
-			      <0x1108024 4>,	/* out */
-			      <0x1108028 4>;	/* in */
+			reg = <0xc1108020 4>,	/* oen cbus 0x2008 */
+			      <0xc1108024 4>,	/* out */
+			      <0xc1108028 4>;	/* in */
 
 			gpio-controller;
 			#gpio-cells = <1>;
 			pin-count = <29>;
 		};
 
-		mmc@1108c20 {
+		mmc@c1108c20 {
 			compatible = "amlogic,aml8726-mmc";
-			reg = <0x1108c20 32>;	/* cbus 0x2308 */
-			interrupts = <28>;	/* AM_IRQ0(28) */
+			reg = <0xc1108c20 32>;	/* cbus 0x2308 */
+			interrupts = <0 28 1>;	/* AM_IRQ0(28) */
 			interrupt-parent = <&gic>;
 
+			clocks = <&clk81>;
+
 			pinctrl-names = "default";
 			pinctrl-0 = <&pins_sdio_b>;
 
@@ -282,90 +218,41 @@
 			ins-detect = <&gpio5 29 0>;	/* card_6 */
 		};
 
-		rng@1108100 {
+		rng@c1108100 {
 			compatible = "amlogic,aml8726-rng";
-			reg = <0x1108100 8>;	/* cbus 0x2040 */
-		};
-
-		i2c@1108500 {
-			/* i2c-a */
-			compatible = "amlogic,aml8726-i2c";
-			reg = <0x1108500 32>;	/* cbus 0x2140 */
-			interrupts = <21>;
-			interrupt-parent = <&gic>;
-		};
-
-		i2c@11087c0 {
-			/* i2c-b */
-			compatible = "amlogic,aml8726-i2c";
-			reg = <0x11087c0 32>;	/* cbus 0x21f0 */
-			interrupts = <128>;
-			interrupt-parent = <&gic>;
+			reg = <0xc1108100 8>;	/* cbus 0x2040 */
 		};
 
-		uart@11084c0 {
-			/* uart-a */
-			device_type = "serial";
-			compatible = "amlogic,aml8726-uart";
-			clock-frequency = <0>;
-			current-speed = <115200>;
-			reg = <0x11084c0 20>;	/* cbus 0x2130 */
-			interrupts = <26>;
-			interrupt-parent = <&gic>;
-		};
-
-		uart@11084dc {
-			/* uart-b */
-			device_type = "serial";
-			compatible = "amlogic,aml8726-uart";
-			clock-frequency = <0>;
-			current-speed = <115200>;
-			reg = <0x11084dc 20>;	/* cbus 0x2137 */
-			interrupts = <75>;
-			interrupt-parent = <&gic>;
-		};
-
-		uart@1108700 {
-			/* uart-c */
-			device_type = "serial";
-			compatible = "amlogic,aml8726-uart";
-			clock-frequency = <0>;
-			current-speed = <115200>;
-			reg = <0x1108700 20>;	/* cbus 0x21c0 */
-			interrupts = <93>;
-			interrupt-parent = <&gic>;
-		};
-
-		usb-phy@1108400 {
+		usb-phy@c1108400 {
 			/* usb-a phy */
 			compatible = "amlogic,aml8726-m6-usb-phy";
-			reg = <0x1108400 32>;	/* cbus 0x2100 */
+			reg = <0xc1108400 32>;	/* cbus 0x2100 */
 		};
 
-		usb-phy@1108420 {
+		usb-phy@c1108420 {
 			/* usb-b phy */
 			compatible = "amlogic,aml8726-m6-usb-phy";
-			reg = <0x1108420 32>;	/* cbus 0x2108 */
+			reg = <0xc1108420 32>;	/* cbus 0x2108 */
 
 			usb-pwr-en = <&gpioao 3 1>,	/* gpioao_3 vbus */
 				     <&gpio6 11 0>;	/* gpioe_11 wifi */
 		};
 
-		usb@9040000 {
+		usb@c9040000 {
 			/* usb-a */
 			compatible = "synopsys,designware-hs-otg2";
-			reg = <0x9040000 0x40000>;	/* ahbbus 0x40000*/
-			interrupts = <30>;		/* AM_IRQ0(30) */
+			reg = <0xc9040000 0x40000>;	/* ahbbus 0x40000*/
+			interrupts = <0 30 4>;		/* AM_IRQ0(30) */
 			interrupt-parent = <&gic>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 		};
 
-		usb@90c0000 {
+		usb@c90c0000 {
 			/* usb-b */
 			compatible = "synopsys,designware-hs-otg2";
-			reg = <0x90c0000 0x40000>;	/* ahbbus 0xc0000 */
-			interrupts = <31>;		/* AM_IRQ0(31) */
+			reg = <0xc90c0000 0x40000>;	/* ahbbus 0xc0000 */
+			interrupts = <0 31 4>;		/* AM_IRQ0(31) */
 			interrupt-parent = <&gic>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -373,11 +260,11 @@
 			dr_mode = "host";
 		};
 
-		eth@9410000 {
+		eth@c9410000 {
 			/* ethernet */
 			compatible = "snps,dwmac";
-			reg = <0x9410000 0x2000>;	/* ahbbus 0x410000 */
-			interrupts = <8>;		/* AM_IRQ0(8) */
+			reg = <0xc9410000 0x2000>;	/* ahbbus 0x410000 */
+			interrupts = <0 8 1>;		/* AM_IRQ0(8) */
 			interrupt-parent = <&gic>;
 			#address-cells = <1>;
 			#size-cells = <0>;
@@ -385,16 +272,16 @@
 			eth-phy-rst = <&gpio5 15 0>;	/* gpioy_15 phy-rst */
 		};
 
-		screen: fb@8006324 {
+		screen: fb@c8006324 {
 			device_type = "display";
 			compatible = "amlogic,aml8726-fb";
-			reg = <0x8006324 12>,	/* CANVAS */
-			      <0x1106800 1024>,	/* VIU */
-			      <0x1107400 1024>;	/* VPP */
-			interrupts = <2		/* AM_IRQ0(2) */
-				      3		/* AM_IRQ0(3) */
-				      12	/* AM_IRQ0(12) */
-				      13>;	/* AM_IRQ0(13) */
+			reg = <0xc8006324 12>,		/* CANVAS */
+			      <0xc1106800 1024>,	/* VIU */
+			      <0xc1107400 1024>;	/* VPP */
+			interrupts = <0 2 1>,		/* AM_IRQ0(2) */
+				     <0 3 1>,		/* AM_IRQ0(3) */
+				     <0 12 1>,		/* AM_IRQ0(12) */
+				     <0 13 1>;		/* AM_IRQ0(13) */
 			interrupt-parent = <&gic>;
 
 			address = <0x84900000>;	/* match memreserve */
@@ -410,3 +297,12 @@
 		stdout = "uart0";
 	};
 };
+
+&clk81 {
+	clock-frequency = <0>;
+};
+
+&uart_AO {
+	status = "okay";
+	current-speed = <115200>;
+};