* Linux: Update kernel 5.10.61 for ODROID-N2 (#1512) Update the kernel to 5.10.61 for ODROID-N2 and fix the update script to update kernel for ODROID-N2 next time too. * Move ODROID kernel patches to non-kernel version specific directory
52 lines
2.5 KiB
Diff
52 lines
2.5 KiB
Diff
<<<<<<< HEAD:buildroot-external/board/hardkernel/patches/linux/5.9.16/0011-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch
|
|
From 400fce2e1eaab6d04f542eaa0fe3b53fb9d79d82 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <400fce2e1eaab6d04f542eaa0fe3b53fb9d79d82.1622055679.git.stefan@agner.ch>
|
|
In-Reply-To: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
|
References: <0955f7e64f302c5c331b90fd07fc48dfb677eab5.1622055679.git.stefan@agner.ch>
|
|
From: Stefan Agner <stefan@agner.ch>
|
|
Date: Thu, 29 Apr 2021 21:32:43 +0200
|
|
Subject: [PATCH 11/11] arm64: dts: meson: add i2c2 node to ODROID N2/N2+
|
|
=======
|
|
From d5d2d8b9eb93eab85af12f1844975903a7c5a879 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <d5d2d8b9eb93eab85af12f1844975903a7c5a879.1627311993.git.stefan@agner.ch>
|
|
In-Reply-To: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
|
|
References: <c7825747afd8bb975dc918f28e4afe8058a518f3.1627311993.git.stefan@agner.ch>
|
|
From: Stefan Agner <stefan@agner.ch>
|
|
Date: Thu, 29 Apr 2021 21:32:43 +0200
|
|
Subject: [PATCH 8/9] arm64: dts: meson: add i2c2 node to ODROID N2/N2+
|
|
>>>>>>> be3afe8b (Update to Linux 5.10.53 (#1475)):buildroot-external/board/hardkernel/patches/linux/5.10.53/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch
|
|
|
|
The J2 connectors pinout documents "I2C.SDA0/SCL0" on pin 3 and 5, which
|
|
are connected to GPIOX_17/18. This GPIO allow to mux I2C to the second
|
|
I2C instance. Enable i2c2 and use the appropriate pinmux.
|
|
|
|
Signed-off-by: Stefan Agner <stefan@agner.ch>
|
|
---
|
|
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
<<<<<<< HEAD:buildroot-external/board/hardkernel/patches/linux/5.9.16/0011-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch
|
|
index 38a996ed3e19..45a8998c4a3a 100644
|
|
=======
|
|
index cec346178e3d..f1c3356c78a0 100644
|
|
>>>>>>> be3afe8b (Update to Linux 5.10.53 (#1475)):buildroot-external/board/hardkernel/patches/linux/5.10.53/0008-arm64-dts-meson-add-i2c2-node-to-ODROID-N2-N2.patch
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi
|
|
@@ -586,6 +586,12 @@ &ir {
|
|
linux,rc-map-name = "rc-odroid";
|
|
};
|
|
|
|
+&i2c2 {
|
|
+ status = "okay";
|
|
+ pinctrl-0 = <&i2c2_sda_x_pins>, <&i2c2_sck_x_pins>;
|
|
+ pinctrl-names = "default";
|
|
+};
|
|
+
|
|
&i2c3 {
|
|
status = "okay";
|
|
pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;
|
|
--
|
|
2.31.1
|
|
|