From 0224784d01c2a5095e2df16f208fa45235e3f56e Mon Sep 17 00:00:00 2001
From: Jan Volckaert <janvolck@gmail.com>
Date: Mon, 30 Dec 2024 19:56:38 +0100
Subject: [PATCH] add support for odroid-c4 mapped to i2c-1 updates after
 review of initial PR #7622

---
 .../archive/meson64-6.6/overlay/Makefile      |  3 ++-
 .../meson64-6.6/overlay/README.meson-overlays | 13 ++++++----
 ...-odroid-c4-i2c-ee-m2-gpiox-17-gpiox-18.dts | 15 ------------
 .../overlay/meson-sm1-odroid-c4-i2c0.dts      | 24 +++++++++++++++++++
 .../overlay/meson-sm1-odroid-c4-i2c1.dts      | 24 +++++++++++++++++++
 5 files changed, 59 insertions(+), 20 deletions(-)
 delete mode 100644 patch/kernel/archive/meson64-6.6/overlay/meson-sm1-odroid-c4-i2c-ee-m2-gpiox-17-gpiox-18.dts
 create mode 100644 patch/kernel/archive/meson64-6.6/overlay/meson-sm1-odroid-c4-i2c0.dts
 create mode 100644 patch/kernel/archive/meson64-6.6/overlay/meson-sm1-odroid-c4-i2c1.dts

diff --git a/patch/kernel/archive/meson64-6.6/overlay/Makefile b/patch/kernel/archive/meson64-6.6/overlay/Makefile
index 7a6f054da4..e3f2f9d6c5 100644
--- a/patch/kernel/archive/meson64-6.6/overlay/Makefile
+++ b/patch/kernel/archive/meson64-6.6/overlay/Makefile
@@ -31,7 +31,8 @@ dtbo-$(CONFIG_ARCH_MESON) += \
 	meson-sm1-bananapi-uartA.dtbo \
 	meson-sm1-bananapi-uartA_cts_rts.dtbo \
 	meson-sm1-bananapi-uartAO_B.dtbo \
-	meson-sm1-odroid-c4-i2c-ee-m2-gpiox-17-gpiox-18.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.6/overlay/README.meson-overlays b/patch/kernel/archive/meson64-6.6/overlay/README.meson-overlays
index a5de29f2db..45c6a0eb57 100644
--- a/patch/kernel/archive/meson64-6.6/overlay/README.meson-overlays
+++ b/patch/kernel/archive/meson64-6.6/overlay/README.meson-overlays
@@ -9,7 +9,7 @@ meson (Amlogic)
 ### Provided overlays:
 
 - i2c8
-- meson-sm1-odroid-c4-i2c-ee-m2-gpiox-17-gpiox-18
+- meson-sm1-odroid-c4-i2c0
 
 ### Overlay details:
 
@@ -19,7 +19,12 @@ Activates TWI/I2C bus 8
 
 I2C8 pins (SCL, SDA): GPIO1-C4, GPIO1-C5
 
-### meson-sm1-odroid-c4-i2c-ee-m2-gpiox-17-gpiox-18
+### meson-sm1-odroid-c4-i2c0
 
-Activates i2c2 bus over GPIOX-17(SDA) and GPIOX-18(SCL)
-Aliased to i2c0 on odroid-c4
+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.6/overlay/meson-sm1-odroid-c4-i2c-ee-m2-gpiox-17-gpiox-18.dts b/patch/kernel/archive/meson64-6.6/overlay/meson-sm1-odroid-c4-i2c-ee-m2-gpiox-17-gpiox-18.dts
deleted file mode 100644
index 6d2aa67d95..0000000000
--- a/patch/kernel/archive/meson64-6.6/overlay/meson-sm1-odroid-c4-i2c-ee-m2-gpiox-17-gpiox-18.dts
+++ /dev/null
@@ -1,15 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-/ {
-	compatible = "radxa,zero", "amlogic,g12a";
-
-	fragment@0 {
-		target = <&i2c2>;
-		__overlay__ {
-			status = "okay";
-			pinctrl-0 = <&i2c2_sck_x_pins &i2c2_sda_x_pins>;
-			pinctrl-names = "default";
-		};
-	};
-};
diff --git a/patch/kernel/archive/meson64-6.6/overlay/meson-sm1-odroid-c4-i2c0.dts b/patch/kernel/archive/meson64-6.6/overlay/meson-sm1-odroid-c4-i2c0.dts
new file mode 100644
index 0000000000..84d0db355d
--- /dev/null
+++ b/patch/kernel/archive/meson64-6.6/overlay/meson-sm1-odroid-c4-i2c0.dts
@@ -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.6/overlay/meson-sm1-odroid-c4-i2c1.dts b/patch/kernel/archive/meson64-6.6/overlay/meson-sm1-odroid-c4-i2c1.dts
new file mode 100644
index 0000000000..1074ebf2e3
--- /dev/null
+++ b/patch/kernel/archive/meson64-6.6/overlay/meson-sm1-odroid-c4-i2c1.dts
@@ -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";
+		};
+	};
+
+};