From 47cffce299f33a0b083516cd4ee3e97cafcd8ced Mon Sep 17 00:00:00 2001
From: Jan Volckaert <janvolck@gmail.com>
Date: Mon, 30 Dec 2024 21:16:08 +0100
Subject: [PATCH] copy odroid-c4 overlays to meson64-6.12

---
 .../archive/meson64-6.12/overlay/Makefile     |  4 +++-
 .../overlay/README.meson-overlays             | 11 +++++++++
 .../overlay/meson-sm1-odroid-c4-i2c0.dtso     | 24 +++++++++++++++++++
 .../overlay/meson-sm1-odroid-c4-i2c1.dtso     | 24 +++++++++++++++++++
 .../meson64-6.6/overlay/README.meson-overlays |  1 +
 5 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 patch/kernel/archive/meson64-6.12/overlay/meson-sm1-odroid-c4-i2c0.dtso
 create mode 100644 patch/kernel/archive/meson64-6.12/overlay/meson-sm1-odroid-c4-i2c1.dtso

diff --git a/patch/kernel/archive/meson64-6.12/overlay/Makefile b/patch/kernel/archive/meson64-6.12/overlay/Makefile
index cff92a0bff..1d8d9cbc0d 100644
--- a/patch/kernel/archive/meson64-6.12/overlay/Makefile
+++ b/patch/kernel/archive/meson64-6.12/overlay/Makefile
@@ -31,7 +31,9 @@ dtbo-$(CONFIG_ARCH_MESON) += \
 	meson-sm1-bananapi-uartA.dtbo \
 	meson-sm1-bananapi-uartA_cts_rts.dtbo \
 	meson-sm1-bananapi-uartAO_B.dtbo \
-	meson-sm1-jethome-jethub-j200-spi.dtbo
+	meson-sm1-jethome-jethub-j200-spi.dtbo \
+	meson-sm1-odroid-c4-i2c0.dtbo \
+	meson-sm1-odroid-c4-i2c1.dtbo
 
 scr-$(CONFIG_ARCH_MESON) += \
        meson-fixup.scr
diff --git a/patch/kernel/archive/meson64-6.12/overlay/README.meson-overlays b/patch/kernel/archive/meson64-6.12/overlay/README.meson-overlays
index 1b169a7a15..e5f810a620 100644
--- a/patch/kernel/archive/meson64-6.12/overlay/README.meson-overlays
+++ b/patch/kernel/archive/meson64-6.12/overlay/README.meson-overlays
@@ -9,6 +9,8 @@ meson (Amlogic)
 ### Provided overlays:
 
 - i2c8
+- meson-sm1-odroid-c4-i2c0
+- meson-sm1-odroid-c4-i2c1
 
 ### Overlay details:
 
@@ -18,3 +20,12 @@ Activates TWI/I2C bus 8
 
 I2C8 pins (SCL, SDA): GPIO1-C4, GPIO1-C5
 
+### meson-sm1-odroid-c4-i2c0
+
+Activates i2c2 bus over GPIOX-17(D3/SDA) and GPIOX-18(D5/SCL)
+Aliased to i2c0 for hardkernel odroid-c4 compatibility
+
+### meson-sm1-odroid-c4-i2c1
+
+Activates i2c3 bus over GPIOA-14(D27/SDA) and GPIOA-15(D28/SCL)
+Aliased to i2c1 for hardkernel odroid-c4 compatibility
diff --git a/patch/kernel/archive/meson64-6.12/overlay/meson-sm1-odroid-c4-i2c0.dtso b/patch/kernel/archive/meson64-6.12/overlay/meson-sm1-odroid-c4-i2c0.dtso
new file mode 100644
index 0000000000..84d0db355d
--- /dev/null
+++ b/patch/kernel/archive/meson64-6.12/overlay/meson-sm1-odroid-c4-i2c0.dtso
@@ -0,0 +1,24 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "hardkernel,odroid-c4", "amlogic,sm1";
+
+	fragment@0 {
+		target-path = "/aliases";
+		__overlay__ {
+			i2c0 = "/soc/bus@ffd00000/i2c@1d000";
+		};
+	};
+
+	fragment@1 {
+		target = <&i2c2>;
+		__overlay__ {
+			status = "okay";
+			clock-frequency = <100000>;
+			pinctrl-0 = <&i2c2_sck_x_pins &i2c2_sda_x_pins>;
+			pinctrl-names = "default";
+		};
+	};
+
+};
diff --git a/patch/kernel/archive/meson64-6.12/overlay/meson-sm1-odroid-c4-i2c1.dtso b/patch/kernel/archive/meson64-6.12/overlay/meson-sm1-odroid-c4-i2c1.dtso
new file mode 100644
index 0000000000..1074ebf2e3
--- /dev/null
+++ b/patch/kernel/archive/meson64-6.12/overlay/meson-sm1-odroid-c4-i2c1.dtso
@@ -0,0 +1,24 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "hardkernel,odroid-c4", "amlogic,sm1";
+
+	fragment@0 {
+		target-path = "/aliases";
+		__overlay__ {
+			i2c1 = "/soc/bus@ffd00000/i2c@1c000";
+		};
+	};
+
+	fragment@1 {
+		target = <&i2c3>;
+		__overlay__ {
+			status = "okay";
+			clock-frequency = <100000>;
+			pinctrl-0 = <&i2c3_sck_a_pins &i2c3_sda_a_pins>;
+			pinctrl-names = "default";
+		};
+	};
+
+};
diff --git a/patch/kernel/archive/meson64-6.6/overlay/README.meson-overlays b/patch/kernel/archive/meson64-6.6/overlay/README.meson-overlays
index 45c6a0eb57..e5f810a620 100644
--- a/patch/kernel/archive/meson64-6.6/overlay/README.meson-overlays
+++ b/patch/kernel/archive/meson64-6.6/overlay/README.meson-overlays
@@ -10,6 +10,7 @@ meson (Amlogic)
 
 - i2c8
 - meson-sm1-odroid-c4-i2c0
+- meson-sm1-odroid-c4-i2c1
 
 ### Overlay details: