From 4cfa4a177377022e962ec0fdbc0d2a840c151393 Mon Sep 17 00:00:00 2001
From: Sugar Zhang <sugar.zhang@rock-chips.com>
Date: Tue, 1 Mar 2022 14:35:06 +0800
Subject: [PATCH] ARM: dts: rockchip: Add basic support rv1106/3 evb board

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I3f53c934dcd0cfb814bcd217c788a0c60319faaf
---
 arch/arm/boot/dts/rv1103-evb-v10.dtsi  | 23 +++++++++++++--
 arch/arm/boot/dts/rv1103g-evb-v10.dts  |  4 ---
 arch/arm/boot/dts/rv1106-evb-v10.dtsi  | 41 +++++++++++++++++++++++---
 arch/arm/boot/dts/rv1106-evb.dtsi      | 29 ++++++++++++++++++
 arch/arm/boot/dts/rv1106g-evb1-v10.dts |  4 ---
 arch/arm/boot/dts/rv1106g-evb2-v10.dts |  4 ---
 6 files changed, 86 insertions(+), 19 deletions(-)
 create mode 100644 arch/arm/boot/dts/rv1106-evb.dtsi

diff --git a/arch/arm/boot/dts/rv1103-evb-v10.dtsi b/arch/arm/boot/dts/rv1103-evb-v10.dtsi
index 16145e018faa..e52a849ee781 100644
--- a/arch/arm/boot/dts/rv1103-evb-v10.dtsi
+++ b/arch/arm/boot/dts/rv1103-evb-v10.dtsi
@@ -3,11 +3,28 @@
  * Copyright (c) 2022 Rockchip Electronics Co., Ltd.
  */
 
-/ {
+#include "rv1106-evb.dtsi"
 
+/ {
+	chosen {
+		bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 root=/dev/mmcblk0p6 rootfstype=ext4 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16";
+	};
 };
 
-&fiq_debugger {
-	rockchip,irq-mode-enable = <1>;
+&emmc {
+	bus-width = <4>;
+	cap-mmc-highspeed;
+	non-removable;
+	mmc-hs200-1_8v;
+	rockchip,default-sample-phase = <90>;
+	no-sdio;
+	no-sd;
 	status = "okay";
 };
+
+&i2c4 {
+	status = "okay";
+	clock-frequency = <400000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c4m2_xfer>;
+};
diff --git a/arch/arm/boot/dts/rv1103g-evb-v10.dts b/arch/arm/boot/dts/rv1103g-evb-v10.dts
index bab58bea5365..85c44c7884f7 100644
--- a/arch/arm/boot/dts/rv1103g-evb-v10.dts
+++ b/arch/arm/boot/dts/rv1103g-evb-v10.dts
@@ -11,8 +11,4 @@
 / {
 	model = "Rockchip RV1103G EVB V10 Board";
 	compatible = "rockchip,rv1103g-evb-v10", "rockchip,rv1103";
-
-	chosen {
-		bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16";
-	};
 };
diff --git a/arch/arm/boot/dts/rv1106-evb-v10.dtsi b/arch/arm/boot/dts/rv1106-evb-v10.dtsi
index 9a4999c42d24..3e3bdf31575a 100644
--- a/arch/arm/boot/dts/rv1106-evb-v10.dtsi
+++ b/arch/arm/boot/dts/rv1106-evb-v10.dtsi
@@ -3,15 +3,48 @@
  * Copyright (c) 2022 Rockchip Electronics Co., Ltd.
  */
 
+#include "rv1106-evb.dtsi"
+
 / {
+	chosen {
+		bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 root=/dev/mmcblk0p6 rootfstype=ext4 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16";
+	};
 
+	dsm_sound: dsm-sound {
+		status = "disabled";
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,mclk-fs = <256>;
+		simple-audio-card,name = "rockchip,dsm-sound";
+		simple-audio-card,bitclock-master = <&sndcodec>;
+		simple-audio-card,frame-master = <&sndcodec>;
+		sndcpu: simple-audio-card,cpu {
+			sound-dai = <&i2s0_8ch>;
+		};
+		sndcodec: simple-audio-card,codec {
+			sound-dai = <&dsm>;
+		};
+	};
 };
 
-&fiq_debugger {
-	rockchip,irq-mode-enable = <1>;
+&emmc {
+	bus-width = <8>;
+	cap-mmc-highspeed;
+	non-removable;
+	mmc-hs200-1_8v;
+	rockchip,default-sample-phase = <90>;
+	no-sdio;
+	no-sd;
 	status = "okay";
 };
 
-&rve {
-	status = "okay";
+&dsm {
+	status = "disabled";
+};
+
+&i2c4 {
+	status = "okay";
+	clock-frequency = <400000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c4m2_xfer>;
 };
diff --git a/arch/arm/boot/dts/rv1106-evb.dtsi b/arch/arm/boot/dts/rv1106-evb.dtsi
new file mode 100644
index 000000000000..660927ebd240
--- /dev/null
+++ b/arch/arm/boot/dts/rv1106-evb.dtsi
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2022 Rockchip Electronics Co., Ltd.
+ */
+
+/ {
+
+};
+
+&fiq_debugger {
+	rockchip,irq-mode-enable = <1>;
+	status = "okay";
+};
+
+&gmac {
+	status = "okay";
+};
+
+&i2s0_8ch {
+	status = "okay";
+};
+
+&rng {
+	status = "okay";
+};
+
+&rve {
+	status = "okay";
+};
diff --git a/arch/arm/boot/dts/rv1106g-evb1-v10.dts b/arch/arm/boot/dts/rv1106g-evb1-v10.dts
index 6dfd7e5f108c..a37b9c4462ff 100644
--- a/arch/arm/boot/dts/rv1106g-evb1-v10.dts
+++ b/arch/arm/boot/dts/rv1106g-evb1-v10.dts
@@ -11,8 +11,4 @@
 / {
 	model = "Rockchip RV1106G EVB1 V10 Board";
 	compatible = "rockchip,rv1106g-evb1-v10", "rockchip,rv1106";
-
-	chosen {
-		bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16";
-	};
 };
diff --git a/arch/arm/boot/dts/rv1106g-evb2-v10.dts b/arch/arm/boot/dts/rv1106g-evb2-v10.dts
index 702326d359db..c8599df11bd8 100644
--- a/arch/arm/boot/dts/rv1106g-evb2-v10.dts
+++ b/arch/arm/boot/dts/rv1106g-evb2-v10.dts
@@ -11,8 +11,4 @@
 / {
 	model = "Rockchip RV1106G EVB2 V10 Board";
 	compatible = "rockchip,rv1106g-evb2-v10", "rockchip,rv1106";
-
-	chosen {
-		bootargs = "earlycon=uart8250,mmio32,0xff4c0000 console=ttyFIQ0 root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait snd_soc_core.prealloc_buffer_size_kbytes=16";
-	};
 };