From 4ef5c48dee3db85b98ed981a3a6e294a85e477db Mon Sep 17 00:00:00 2001
From: xiane <sangch.go@gmail.com>
Date: Tue, 9 Jul 2024 14:46:54 +0900
Subject: [PATCH] ODROID-M2: arm64/dtbo: Add i2c & uart overlays.

- add i2c2, uart2, uart3 and uart4.
- apply aliases.
    can2 -> can0.
    uart4 -> serial2
    uart8 -> serial3
    uart1 -> serial4
    uart2 -> serial7
    uart0 -> serial8
    uart3 -> serial9
    i2c1 -> i2c2
    i2c2 -> i2c6

- Update fiq-debugger serial-id value.

Signed-off-by: xiane <sangch.go@gmail.com>
Change-Id: I175a1298af610b7494468c445e06b8947ffaf5a1
---
 .../dts/rockchip/overlays/odroidm2/Makefile   |  5 +++
 .../dts/rockchip/overlays/odroidm2/i2c2.dts   | 12 ++++++
 .../dts/rockchip/overlays/odroidm2/uart2.dts  | 12 ++++++
 .../dts/rockchip/overlays/odroidm2/uart3.dts  | 12 ++++++
 .../dts/rockchip/overlays/odroidm2/uart4.dts  | 12 ++++++
 .../dts/rockchip/overlays/odroidm2/uart5.dts  | 12 ++++++
 .../boot/dts/rockchip/rk3588s-odroid-m2.dtsi  | 39 +++++++++++++++++--
 7 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100644 arch/arm64/boot/dts/rockchip/overlays/odroidm2/i2c2.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart2.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart3.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart4.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart5.dts

diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm2/Makefile b/arch/arm64/boot/dts/rockchip/overlays/odroidm2/Makefile
index e74f61a8d8e3..978ae5140322 100644
--- a/arch/arm64/boot/dts/rockchip/overlays/odroidm2/Makefile
+++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm2/Makefile
@@ -6,6 +6,7 @@ dtbo-y += \
 	gpio_shortcut.dtbo \
 	i2c0.dtbo \
 	i2c1.dtbo \
+	i2c2.dtbo \
 	pwm15.dtbo \
 	pwm3.dtbo \
 	pwm7.dtbo \
@@ -15,6 +16,10 @@ dtbo-y += \
 	uart0-with-ctsrts.dtbo \
 	uart0.dtbo \
 	uart1.dtbo \
+	uart2.dtbo \
+	uart3.dtbo \
+	uart4.dtbo \
+	uart5.dtbo \
 	weather_board_zero.dtbo
 
 targets += $(dtbo-y)
diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm2/i2c2.dts b/arch/arm64/boot/dts/rockchip/overlays/odroidm2/i2c2.dts
new file mode 100644
index 000000000000..344161c2d6db
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm2/i2c2.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&i2c1>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart2.dts b/arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart2.dts
new file mode 100644
index 000000000000..19e6d01143c2
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart2.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&uart4>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart3.dts b/arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart3.dts
new file mode 100644
index 000000000000..db4799bf714a
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart3.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&uart8>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart4.dts b/arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart4.dts
new file mode 100644
index 000000000000..13fc1798e886
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart4.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&uart1>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart5.dts b/arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart5.dts
new file mode 100644
index 000000000000..548e74ff8815
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/overlays/odroidm2/uart5.dts
@@ -0,0 +1,12 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	fragment@0 {
+		target = <&uart5>;
+
+		__overlay__ {
+			status = "okay";
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dtsi
index d889e834477a..189a08688d29 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dtsi
@@ -14,14 +14,20 @@
 
 / {
 	aliases {
+		can0 = &can2;
 		serial0 = &uart7;
 		serial1 = &uart9;
-		serial7 = &uart0;
-		serial9 = &uart1;
+		serial2 = &uart4;
+		serial3 = &uart8;
+		serial4 = &uart1;
+		serial7 = &uart2;
+		serial8 = &uart0;
+		serial9 = &uart3;
 		i2c0 = &i2c5;
 		i2c1 = &i2c6;
+		i2c2 = &i2c1;
 		i2c5 = &i2c0;
-		i2c6 = &i2c1;
+		i2c6 = &i2c2;
 	};
 
 	backlight: backlight {
@@ -978,6 +984,11 @@
 		"", "", "", "";
 };
 
+&i2c1 {
+	pinctrl-0 = <&i2c1m2_xfer>;
+	status = "disabled";
+};
+
 &i2c5 {
 	pinctrl-0 = <&i2c5m2_xfer>;
 	status = "disabled";
@@ -1010,12 +1021,34 @@
 	status = "disabled";
 };
 
+&uart1 {
+	dma-names = "tx", "rx";
+	status = "disabled";
+};
+
+&uart4 {
+	pinctrl-0 = <&uart4m2_xfer>;
+	dma-names = "tx", "rx";
+	status = "disabled";
+};
+
+&uart5 {
+	dma-names = "tx", "rx";
+	status = "disabled";
+};
+
 &uart7 {
 	pinctrl-0 = <&uart7m1_xfer>;
 	dma-names = "tx", "rx";
 	status = "disabled";
 };
 
+&uart8 {
+	pinctrl-0 = <&uart8m0_xfer>;
+	dma-names = "tx", "rx";
+	status = "disabled";
+};
+
 &uart9 {
 	pinctrl-0 = <&uart9m2_xfer>;
 	dma-names = "tx", "rx";