linux-iot2050, mraa: Update kernel patches to latest upstream queue

This primarily updates our own DT patches after their reviews and checks. That change also needs small adjustments of the MRAA path for debugfs-based pinmuxing due to node renamings. While updating, also include more of the DT cleanups that are in latest upstream so that we are closer to the official DT. Signed-off-by: Jan Kiszka <[email protected]>
siemens · Nov 6, 2023 · 0b2264f · 0b2264f
1 parent 2dc0a71
commit 0b2264f
Show file tree

Hide file tree

Showing 76 changed files with 1,913 additions and 263 deletions.
diff --git a/recipes-app/mraa/files/0001-gpio-Fix-JS-binding-regarding-interrupt-injections.patch b/recipes-app/mraa/files/0001-gpio-Fix-JS-binding-regarding-interrupt-injections.patch
@@ -20,7 +20,7 @@ Signed-off-by: Jan Kiszka <[email protected]>
  1 file changed, 21 insertions(+), 16 deletions(-)
 
 diff --git a/api/mraa/gpio.hpp b/api/mraa/gpio.hpp
-index 8fc0881..c41d527 100644
+index 8fc08816217f..c41d52759376 100644
 --- a/api/mraa/gpio.hpp
 +++ b/api/mraa/gpio.hpp
 @@ -31,10 +31,10 @@

diff --git a/recipes-app/mraa/files/0003-iot2050-add-debugfs-pinmux-support.patch b/recipes-app/mraa/files/0003-iot2050-add-debugfs-pinmux-support.patch
diff --git a/recipes-kernel/linux/files/patches-6.1/0004-arm64-dts-ti-k3-am65-Drop-bootargs.patch b/recipes-kernel/linux/files/patches-6.1/0004-arm64-dts-ti-k3-am65-Drop-bootargs.patch
@@ -0,0 +1,48 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nishanth Menon <[email protected]>
+Date: Wed, 19 Apr 2023 09:12:19 -0500
+Subject: [PATCH] arm64: dts: ti: k3-am65*: Drop bootargs
+
+Drop bootargs from the dts. earlycon is a debug property that should be
+enabled only when debug is desired and not as default - see referenced
+link on discussion on this topic.
+
+Cc: Jan Kiszka <[email protected]>
+Link: https://lore.kernel.org/linux-arm-kernel/[email protected]/
+Suggested-by: Krzysztof Kozlowski <[email protected]>
+Acked-by: Krzysztof Kozlowski <[email protected]>
+Reviewed-by: Roger Quadros <[email protected]>
+Signed-off-by: Nishanth Menon <[email protected]>
+Acked-by: Jan Kiszka <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Vignesh Raghavendra <[email protected]>
+[Commit da4159a77659 upstream]
+---
+ arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 1 -
+ arch/arm64/boot/dts/ti/k3-am654-base-board.dts     | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+index 180bfb2a9ddf..9c936b7532b5 100644
+--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
++++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+@@ -21,7 +21,6 @@ aliases {
+
+ 	chosen {
+ 		stdout-path = "serial3:115200n8";
+-		bootargs = "earlycon=ns16550a,mmio32,0x02810000";
+ 	};
+
+ 	reserved-memory {
+diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+index 5850582dd4ed..4444bf0fbca4 100644
+--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
++++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+@@ -15,7 +15,6 @@ / {
+
+ 	chosen {
+ 		stdout-path = "serial2:115200n8";
+-		bootargs = "earlycon=ns16550a,mmio32,0x02800000";
+ 	};
+
+ 	memory@80000000 {
diff --git a/...l/linux/files/patches-6.1/0005-arm64-dts-ti-k3-am65-iot-Fixup-reference-to-phandles.patch b/...l/linux/files/patches-6.1/0005-arm64-dts-ti-k3-am65-iot-Fixup-reference-to-phandles.patch
@@ -0,0 +1,95 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nishanth Menon <[email protected]>
+Date: Tue, 6 Jun 2023 13:22:18 -0500
+Subject: [PATCH] arm64: dts: ti: k3-am65-iot*: Fixup reference to phandles
+ array
+
+When referring to array of phandles, using <> to separate the array
+entries is better notation as it makes potential errors with phandle and
+cell arguments easier to catch. Fix the outliers to be consistent with
+the rest of the usage.
+
+Cc: Jan Kiszka <[email protected]>
+Reviewed-by: Jan Kiszka <[email protected]>
+Signed-off-by: Nishanth Menon <[email protected]>
+Link: https://lore.kernel.org/r/[email protected]
+Signed-off-by: Vignesh Raghavendra <[email protected]>
+[Commit f722090aeb70 upstream]
+---
+ .../boot/dts/ti/k3-am65-iot2050-common.dtsi    | 17 ++++++++---------
+ .../dts/ti/k3-am6548-iot2050-advanced-m2.dts   | 18 ++++++++----------
+ 2 files changed, 16 insertions(+), 19 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+index 9c936b7532b5..6b73937332cb 100644
+--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
++++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+@@ -386,13 +386,12 @@ &main_gpio0 {
+
+ &wkup_gpio0 {
+ 	pinctrl-names = "default";
+-	pinctrl-0 = <
+-		&arduino_io_d2_to_d3_pins_default
+-		&arduino_i2c_aio_switch_pins_default
+-		&arduino_io_oe_pins_default
+-		&push_button_pins_default
+-		&db9_com_mode_pins_default
+-	>;
++	pinctrl-0 =
++		<&arduino_io_d2_to_d3_pins_default>,
++		<&arduino_i2c_aio_switch_pins_default>,
++		<&arduino_io_oe_pins_default>,
++		<&push_button_pins_default>,
++		<&db9_com_mode_pins_default>;
+ 	gpio-line-names =
+ 		/* 0..9 */
+ 		"wkup_gpio0-base", "", "", "", "UART0-mode1", "UART0-mode0",
+@@ -762,13 +761,13 @@ &mailbox0_cluster11 {
+ &mcu_r5fss0_core0 {
+ 	memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
+ 			<&mcu_r5fss0_core0_memory_region>;
+-	mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core0>;
++	mboxes = <&mailbox0_cluster0>, <&mbox_mcu_r5fss0_core0>;
+ };
+
+ &mcu_r5fss0_core1 {
+ 	memory-region = <&mcu_r5fss0_core1_dma_memory_region>,
+ 			<&mcu_r5fss0_core1_memory_region>;
+-	mboxes = <&mailbox0_cluster1 &mbox_mcu_r5fss0_core1>;
++	mboxes = <&mailbox0_cluster1>, <&mbox_mcu_r5fss0_core1>;
+ };
+
+ &icssg0_mdio {
+diff --git a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts
+index 9400e35882a6..9209b5a7baa4 100644
+--- a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts
++++ b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts
+@@ -66,20 +66,18 @@ AM65X_IOPAD(0x001c, PIN_INPUT_PULLUP, 7)  /* (C23) GPIO1_89 */
+
+ &main_gpio0 {
+ 	pinctrl-names = "default";
+-	pinctrl-0 = <
+-		&main_m2_pcie_mux_control
+-		&arduino_io_d4_to_d9_pins_default
+-	>;
++	pinctrl-0 =
++		<&main_m2_pcie_mux_control>,
++		<&arduino_io_d4_to_d9_pins_default>;
+ };
+
+ &main_gpio1 {
+ 	pinctrl-names = "default";
+-	pinctrl-0 = <
+-		&main_m2_enable_pins_default
+-		&main_pmx0_m2_config_pins_default
+-		&main_pmx1_m2_config_pins_default
+-		&cp2102n_reset_pin_default
+-	>;
++	pinctrl-0 =
++		<&main_m2_enable_pins_default>,
++		<&main_pmx0_m2_config_pins_default>,
++		<&main_pmx1_m2_config_pins_default>,
++		<&cp2102n_reset_pin_default>;
+ };
+
+ /*