From 909fe24fabfdb55aac4e1ab04ef3a6814b4c3aa2 Mon Sep 17 00:00:00 2001
From: Sugar Zhang <sugar.zhang@rock-chips.com>
Date: Wed, 4 Mar 2020 17:55:58 +0800
Subject: [PATCH] ARM: dts: rockchip: Add RV1126 EVB Boards

Change-Id: Ic94a80db732861664eed0e9f876eee16777edb1c
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
---
 arch/arm/boot/dts/Makefile                     |  2 ++
 arch/arm/boot/dts/rv1109-evb-ddr3-v10.dts      |  4 ++--
 arch/arm/boot/dts/rv1109-evb-lp3-v10.dts       |  3 ++-
 arch/arm/boot/dts/rv1126-evb-ddr3-v10.dts      | 17 +++++++++++++++++
 arch/arm/boot/dts/rv1126-evb-lp3-v10.dts       | 18 ++++++++++++++++++
 ...rv1109-evb-v10.dtsi => rv11xx-evb-v10.dtsi} |  9 ---------
 6 files changed, 41 insertions(+), 12 deletions(-)
 create mode 100644 arch/arm/boot/dts/rv1126-evb-ddr3-v10.dts
 create mode 100644 arch/arm/boot/dts/rv1126-evb-lp3-v10.dts
 rename arch/arm/boot/dts/{rv1109-evb-v10.dtsi => rv11xx-evb-v10.dtsi} (89%)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 04940a9e2e34..23e0ec3b728f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -845,6 +845,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rv1109-evb-ddr3-v10.dtb \
 	rv1109-evb-lp3-v10.dtb \
 	rv1109-fpga.dtb \
+	rv1126-evb-ddr3-v10.dtb \
+	rv1126-evb-lp3-v10.dtb \
 	rk3036-evb.dtb \
 	rk3036-kylin.dtb \
 	rk3066a-bqcurie2.dtb \
diff --git a/arch/arm/boot/dts/rv1109-evb-ddr3-v10.dts b/arch/arm/boot/dts/rv1109-evb-ddr3-v10.dts
index cc71c36556c2..8914660dea17 100644
--- a/arch/arm/boot/dts/rv1109-evb-ddr3-v10.dts
+++ b/arch/arm/boot/dts/rv1109-evb-ddr3-v10.dts
@@ -4,8 +4,8 @@
  */
 
 /dts-v1/;
-
-#include "rv1109-evb-v10.dtsi"
+#include "rv1109.dtsi"
+#include "rv11xx-evb-v10.dtsi"
 
 / {
 	model = "Rockchip RV1109 EVB DDR3 Board";
diff --git a/arch/arm/boot/dts/rv1109-evb-lp3-v10.dts b/arch/arm/boot/dts/rv1109-evb-lp3-v10.dts
index dfe417e4dc50..15c9dce056df 100644
--- a/arch/arm/boot/dts/rv1109-evb-lp3-v10.dts
+++ b/arch/arm/boot/dts/rv1109-evb-lp3-v10.dts
@@ -5,7 +5,8 @@
 
 /dts-v1/;
 
-#include "rv1109-evb-v10.dtsi"
+#include "rv1109.dtsi"
+#include "rv11xx-evb-v10.dtsi"
 
 / {
 	model = "Rockchip RV1109 EVB LPDDR3 Board";
diff --git a/arch/arm/boot/dts/rv1126-evb-ddr3-v10.dts b/arch/arm/boot/dts/rv1126-evb-ddr3-v10.dts
new file mode 100644
index 000000000000..9b417af11b34
--- /dev/null
+++ b/arch/arm/boot/dts/rv1126-evb-ddr3-v10.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd.
+ */
+
+/dts-v1/;
+#include "rv1126.dtsi"
+#include "rv11xx-evb-v10.dtsi"
+
+/ {
+	model = "Rockchip RV1126 EVB DDR3 Board";
+	compatible = "rockchip,rv1126-evb-ddr3-v10", "rockchip,rv1126";
+
+	chosen {
+		bootargs = "clk_ignore_unused earlycon=uart8250,mmio32,0xff570000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait";
+	};
+};
diff --git a/arch/arm/boot/dts/rv1126-evb-lp3-v10.dts b/arch/arm/boot/dts/rv1126-evb-lp3-v10.dts
new file mode 100644
index 000000000000..52816e624c43
--- /dev/null
+++ b/arch/arm/boot/dts/rv1126-evb-lp3-v10.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd.
+ */
+
+/dts-v1/;
+
+#include "rv1126.dtsi"
+#include "rv11xx-evb-v10.dtsi"
+
+/ {
+	model = "Rockchip RV1126 EVB LPDDR3 Board";
+	compatible = "rockchip,rv1126-evb-lp3-v10", "rockchip,rv1126";
+
+	chosen {
+		bootargs = "clk_ignore_unused earlycon=uart8250,mmio32,0xff570000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait";
+	};
+};
diff --git a/arch/arm/boot/dts/rv1109-evb-v10.dtsi b/arch/arm/boot/dts/rv11xx-evb-v10.dtsi
similarity index 89%
rename from arch/arm/boot/dts/rv1109-evb-v10.dtsi
rename to arch/arm/boot/dts/rv11xx-evb-v10.dtsi
index 6ffb60883fde..0265e77ce578 100644
--- a/arch/arm/boot/dts/rv1109-evb-v10.dtsi
+++ b/arch/arm/boot/dts/rv11xx-evb-v10.dtsi
@@ -3,15 +3,6 @@
  * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd.
  */
 
-/dts-v1/;
-
-#include "rv1109.dtsi"
-
-/ {
-	model = "Rockchip RV1109 EVB Board";
-	compatible = "rockchip,rv1109-evb-v10", "rockchip,rv1109";
-};
-
 &emmc {
 	bus-width = <8>;
 	cap-mmc-highspeed;