mvebu: backport pending DTS changes for Turris Omnia
authorJosef Schlehofer <pepe.schlehofer@gmail.com>
Tue, 26 Jul 2022 12:31:26 +0000 (14:31 +0200)
committerRui Salvaterra <rsalvaterra@gmail.com>
Tue, 16 Aug 2022 21:38:46 +0000 (22:38 +0100)
Backport pending patches:
- https://lore.kernel.org/linux-arm-kernel/20220704113622.18887-1-kabel@kernel.org/
- https://lore.kernel.org/linux-arm-kernel/20220704113622.18887-2-kabel@kernel.org/

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
target/linux/mvebu/patches-5.15/100-ARM-dts-turris-omnia-configure-LED-0-pin-function-to.patch [new file with mode: 0644]
target/linux/mvebu/patches-5.15/101-ARM-dts-turris-omnia-enable-LED-controller-node.patch [new file with mode: 0644]

diff --git a/target/linux/mvebu/patches-5.15/100-ARM-dts-turris-omnia-configure-LED-0-pin-function-to.patch b/target/linux/mvebu/patches-5.15/100-ARM-dts-turris-omnia-configure-LED-0-pin-function-to.patch
new file mode 100644 (file)
index 0000000..2793737
--- /dev/null
@@ -0,0 +1,38 @@
+From 81c0004a6433ff90fa6129418802c3c367e453c2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
+Date: Mon, 4 Jul 2022 13:36:21 +0200
+Subject: [PATCH 1/5] ARM: dts: turris-omnia: configure LED[0] pin function to
+ link/activity
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The marvell PHY driver changes the LED[0] pin function to "On - 1000
+Mbps Link, Off - Else".
+
+Turris Omnia expects that the function is "On - Link, Blink - Activity,
+Off - No link".
+
+Use the `marvell,reg-init` DT property to change the function.
+
+In the future, once netdev trigger will support HW offloading, we will
+be able to have this configured via the combination of PHY driver and
+leds-turris-omnia driver.
+
+Signed-off-by: Marek BehĂșn <kabel@kernel.org>
+---
+ arch/arm/boot/dts/armada-385-turris-omnia.dts | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
++++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
+@@ -390,7 +390,8 @@
+       phy1: ethernet-phy@1 {
+               compatible = "ethernet-phy-ieee802.3-c22";
+               reg = <1>;
+-              marvell,reg-init = <3 18 0 0x4985>;
++              marvell,reg-init = <3 18 0 0x4985>,
++                                 <3 16 0xfff0 0x0001>;
+               /* irq is connected to &pcawan pin 7 */
+       };
diff --git a/target/linux/mvebu/patches-5.15/101-ARM-dts-turris-omnia-enable-LED-controller-node.patch b/target/linux/mvebu/patches-5.15/101-ARM-dts-turris-omnia-enable-LED-controller-node.patch
new file mode 100644 (file)
index 0000000..5b8ce56
--- /dev/null
@@ -0,0 +1,48 @@
+From fed7cef5e4f2df8c6a79bebf5da1fdd3783ff6f3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
+Date: Mon, 4 Jul 2022 13:36:22 +0200
+Subject: [PATCH] ARM: dts: turris-omnia: enable LED controller node
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The LED controller node is disabled because the leds-turris-omnia driver
+does not support setting the LED blinking to be controlled by the MCU.
+
+The patches for that have now been sent [1], so let's enable the node.
+
+[1] https://lore.kernel.org/linux-leds/20220704105955.15474-1-kabel@kernel.org/T/
+
+Signed-off-by: Marek BehĂșn <kabel@kernel.org>
+---
+ arch/arm/boot/dts/armada-385-turris-omnia.dts | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
++++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
+@@ -188,15 +188,13 @@
+                               reg = <0x2b>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
++                              status = "okay";
+                               /*
+                                * LEDs are controlled by MCU (STM32F0) at
+                                * address 0x2b.
+                                *
+-                               * The driver does not support HW control mode
+-                               * for the LEDs yet. Disable the LEDs for now.
+-                               *
+-                               * Also LED functions are not stable yet:
++                               * LED functions are not stable yet:
+                                * - there are 3 LEDs connected via MCU to PCIe
+                                *   ports. One of these ports supports mSATA.
+                                *   There is no mSATA nor PCIe function.
+@@ -207,7 +205,6 @@
+                                *   B. Again there is no such function defined.
+                                *   For now we use LED_FUNCTION_INDICATOR
+                                */
+-                              status = "disabled";
+                               multi-led@0 {
+                                       reg = <0x0>;