bcm4908: use upstream patches for Asus GT-AC5300 LEDs
authorRafał Miłecki <rafal@milecki.pl>
Fri, 2 Sep 2022 15:07:40 +0000 (17:07 +0200)
committerRafał Miłecki <rafal@milecki.pl>
Thu, 1 Dec 2022 12:52:45 +0000 (13:52 +0100)
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit d51e990ff81ad0335294749e8d2fc8e69ceb9179)

target/linux/bcm4908/patches-5.10/038-v6.1-0001-arm64-dts-broadcom-bcm4908-add-remaining-LED-pins.patch [new file with mode: 0644]
target/linux/bcm4908/patches-5.10/038-v6.1-0002-arm64-dts-broadcom-bcm4908-add-LEDs-controller-block.patch [new file with mode: 0644]
target/linux/bcm4908/patches-5.10/038-v6.1-0003-arm64-dts-broadcom-bcm4908-add-Asus-GT-AC5300-LEDs.patch [new file with mode: 0644]
target/linux/bcm4908/patches-5.10/130-0001-arm64-dts-broadcom-bcm4908-add-remaining-LED-pins.patch [deleted file]
target/linux/bcm4908/patches-5.10/130-0002-arm64-dts-broadcom-bcm4908-add-LEDs-controller-block.patch [deleted file]
target/linux/bcm4908/patches-5.10/130-0003-arm64-dts-broadcom-bcm4908-add-Asus-GT-AC5300-LEDs.patch [deleted file]

diff --git a/target/linux/bcm4908/patches-5.10/038-v6.1-0001-arm64-dts-broadcom-bcm4908-add-remaining-LED-pins.patch b/target/linux/bcm4908/patches-5.10/038-v6.1-0001-arm64-dts-broadcom-bcm4908-add-remaining-LED-pins.patch
new file mode 100644 (file)
index 0000000..437249f
--- /dev/null
@@ -0,0 +1,115 @@
+From 456b6dd1baadd2da10e28ffd1717b06d1fa17a97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Mon, 18 Jul 2022 15:20:58 +0200
+Subject: [PATCH] arm64: dts: broadcom: bcm4908: add remaining LED pins
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Include all 32 pins.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Link: https://lore.kernel.org/r/20220718132100.13277-1-zajec5@gmail.com
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ .../boot/dts/broadcom/bcm4908/bcm4908.dtsi    | 75 +++++++++++++++++++
+ 1 file changed, 75 insertions(+)
+
+--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
++++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
+@@ -352,6 +352,61 @@
+                               groups = "led_9_grp_a";
+                       };
++                      pins_led_10_a: led_10-a-pins {
++                              function = "led_10";
++                              groups = "led_10_grp_a";
++                      };
++
++                      pins_led_11_a: led_11-a-pins {
++                              function = "led_11";
++                              groups = "led_11_grp_a";
++                      };
++
++                      pins_led_12_a: led_12-a-pins {
++                              function = "led_12";
++                              groups = "led_12_grp_a";
++                      };
++
++                      pins_led_13_a: led_13-a-pins {
++                              function = "led_13";
++                              groups = "led_13_grp_a";
++                      };
++
++                      pins_led_14_a: led_14-a-pins {
++                              function = "led_14";
++                              groups = "led_14_grp_a";
++                      };
++
++                      pins_led_15_a: led_15-a-pins {
++                              function = "led_15";
++                              groups = "led_15_grp_a";
++                      };
++
++                      pins_led_16_a: led_16-a-pins {
++                              function = "led_16";
++                              groups = "led_16_grp_a";
++                      };
++
++                      pins_led_17_a: led_17-a-pins {
++                              function = "led_17";
++                              groups = "led_17_grp_a";
++                      };
++
++                      pins_led_18_a: led_18-a-pins {
++                              function = "led_18";
++                              groups = "led_18_grp_a";
++                      };
++
++                      pins_led_19_a: led_19-a-pins {
++                              function = "led_19";
++                              groups = "led_19_grp_a";
++                      };
++
++                      pins_led_20_a: led_20-a-pins {
++                              function = "led_20";
++                              groups = "led_20_grp_a";
++                      };
++
+                       pins_led_21_a: led_21-a-pins {
+                               function = "led_21";
+                               groups = "led_21_grp_a";
+@@ -362,6 +417,21 @@
+                               groups = "led_22_grp_a";
+                       };
++                      pins_led_23_a: led_23-a-pins {
++                              function = "led_23";
++                              groups = "led_23_grp_a";
++                      };
++
++                      pins_led_24_a: led_24-a-pins {
++                              function = "led_24";
++                              groups = "led_24_grp_a";
++                      };
++
++                      pins_led_25_a: led_25-a-pins {
++                              function = "led_25";
++                              groups = "led_25_grp_a";
++                      };
++
+                       pins_led_26_a: led_26-a-pins {
+                               function = "led_26";
+                               groups = "led_26_grp_a";
+@@ -387,6 +457,11 @@
+                               groups = "led_30_grp_a";
+                       };
++                      pins_led_31_a: led_31-a-pins {
++                              function = "led_31";
++                              groups = "led_31_grp_a";
++                      };
++
+                       pins_hs_uart: hs_uart-pins {
+                               function = "hs_uart";
+                               groups = "hs_uart_grp";
diff --git a/target/linux/bcm4908/patches-5.10/038-v6.1-0002-arm64-dts-broadcom-bcm4908-add-LEDs-controller-block.patch b/target/linux/bcm4908/patches-5.10/038-v6.1-0002-arm64-dts-broadcom-bcm4908-add-LEDs-controller-block.patch
new file mode 100644 (file)
index 0000000..c890340
--- /dev/null
@@ -0,0 +1,35 @@
+From 7de56b1dc1149c702d4cc1e89ccc251bfb2bc246 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Mon, 18 Jul 2022 15:20:59 +0200
+Subject: [PATCH] arm64: dts: broadcom: bcm4908: add LEDs controller block
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+BCM4908 includes LEDs controller that supports multiple brightness
+levels & hardware blinking.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Link: https://lore.kernel.org/r/20220718132100.13277-2-zajec5@gmail.com
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
++++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
+@@ -517,6 +517,14 @@
+                       status = "okay";
+               };
++              leds: leds@800 {
++                      compatible = "brcm,bcm4908-leds", "brcm,bcm63138-leds";
++                      reg = <0x800 0xdc>;
++
++                      #address-cells = <1>;
++                      #size-cells = <0>;
++              };
++
+               nand-controller@1800 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
diff --git a/target/linux/bcm4908/patches-5.10/038-v6.1-0003-arm64-dts-broadcom-bcm4908-add-Asus-GT-AC5300-LEDs.patch b/target/linux/bcm4908/patches-5.10/038-v6.1-0003-arm64-dts-broadcom-bcm4908-add-Asus-GT-AC5300-LEDs.patch
new file mode 100644 (file)
index 0000000..3888efb
--- /dev/null
@@ -0,0 +1,81 @@
+From 3bcae3396e986b4ab97a69e8de517e32f9691a4b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Mon, 18 Jul 2022 15:21:00 +0200
+Subject: [PATCH] arm64: dts: broadcom: bcm4908: add Asus GT-AC5300 LEDs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are 5 software-controllable LEDs on PCB.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Link: https://lore.kernel.org/r/20220718132100.13277-3-zajec5@gmail.com
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ .../bcm4908/bcm4908-asus-gt-ac5300.dts        | 48 +++++++++++++++++++
+ 1 file changed, 48 insertions(+)
+
+--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
++++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
+@@ -2,6 +2,7 @@
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/input/input.h>
++#include <dt-bindings/leds/common.h>
+ #include "bcm4908.dtsi"
+@@ -118,6 +119,53 @@
+       };
+ };
++&leds {
++      led-power@11 {
++              reg = <0x11>;
++              function = LED_FUNCTION_POWER;
++              color = <LED_COLOR_ID_WHITE>;
++              default-state = "on";
++              active-low;
++              pinctrl-names = "default";
++              pinctrl-0 = <&pins_led_17_a>;
++      };
++
++      led-wan-red@12 {
++              reg = <0x12>;
++              function = LED_FUNCTION_WAN;
++              color = <LED_COLOR_ID_RED>;
++              active-low;
++              pinctrl-names = "default";
++              pinctrl-0 = <&pins_led_18_a>;
++      };
++
++      led-wps@14 {
++              reg = <0x14>;
++              function = LED_FUNCTION_WPS;
++              color = <LED_COLOR_ID_WHITE>;
++              active-low;
++              pinctrl-names = "default";
++              pinctrl-0 = <&pins_led_20_a>;
++      };
++
++      led-wan-white@15 {
++              reg = <0x15>;
++              function = LED_FUNCTION_WAN;
++              color = <LED_COLOR_ID_WHITE>;
++              active-low;
++              pinctrl-names = "default";
++              pinctrl-0 = <&pins_led_21_a>;
++      };
++
++      led-lan@19 {
++              reg = <0x19>;
++              function = LED_FUNCTION_LAN;
++              color = <LED_COLOR_ID_WHITE>;
++              pinctrl-names = "default";
++              pinctrl-0 = <&pins_led_25_a>;
++      };
++};
++
+ &nandcs {
+       nand-ecc-strength = <4>;
+       nand-ecc-step-size = <512>;
diff --git a/target/linux/bcm4908/patches-5.10/130-0001-arm64-dts-broadcom-bcm4908-add-remaining-LED-pins.patch b/target/linux/bcm4908/patches-5.10/130-0001-arm64-dts-broadcom-bcm4908-add-remaining-LED-pins.patch
deleted file mode 100644 (file)
index be1efcd..0000000
+++ /dev/null
@@ -1,112 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Mon, 18 Jul 2022 13:16:05 +0200
-Subject: [PATCH] arm64: dts: broadcom: bcm4908: add remaining LED pins
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Include all 32 pins.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
----
- .../boot/dts/broadcom/bcm4908/bcm4908.dtsi    | 75 +++++++++++++++++++
- 1 file changed, 75 insertions(+)
-
---- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
-+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
-@@ -352,6 +352,61 @@
-                               groups = "led_9_grp_a";
-                       };
-+                      pins_led_10_a: led_10-a-pins {
-+                              function = "led_10";
-+                              groups = "led_10_grp_a";
-+                      };
-+
-+                      pins_led_11_a: led_11-a-pins {
-+                              function = "led_11";
-+                              groups = "led_11_grp_a";
-+                      };
-+
-+                      pins_led_12_a: led_12-a-pins {
-+                              function = "led_12";
-+                              groups = "led_12_grp_a";
-+                      };
-+
-+                      pins_led_13_a: led_13-a-pins {
-+                              function = "led_13";
-+                              groups = "led_13_grp_a";
-+                      };
-+
-+                      pins_led_14_a: led_14-a-pins {
-+                              function = "led_14";
-+                              groups = "led_14_grp_a";
-+                      };
-+
-+                      pins_led_15_a: led_15-a-pins {
-+                              function = "led_15";
-+                              groups = "led_15_grp_a";
-+                      };
-+
-+                      pins_led_16_a: led_16-a-pins {
-+                              function = "led_16";
-+                              groups = "led_16_grp_a";
-+                      };
-+
-+                      pins_led_17_a: led_17-a-pins {
-+                              function = "led_17";
-+                              groups = "led_17_grp_a";
-+                      };
-+
-+                      pins_led_18_a: led_18-a-pins {
-+                              function = "led_18";
-+                              groups = "led_18_grp_a";
-+                      };
-+
-+                      pins_led_19_a: led_19-a-pins {
-+                              function = "led_19";
-+                              groups = "led_19_grp_a";
-+                      };
-+
-+                      pins_led_20_a: led_20-a-pins {
-+                              function = "led_20";
-+                              groups = "led_20_grp_a";
-+                      };
-+
-                       pins_led_21_a: led_21-a-pins {
-                               function = "led_21";
-                               groups = "led_21_grp_a";
-@@ -362,6 +417,21 @@
-                               groups = "led_22_grp_a";
-                       };
-+                      pins_led_23_a: led_23-a-pins {
-+                              function = "led_23";
-+                              groups = "led_23_grp_a";
-+                      };
-+
-+                      pins_led_24_a: led_24-a-pins {
-+                              function = "led_24";
-+                              groups = "led_24_grp_a";
-+                      };
-+
-+                      pins_led_25_a: led_25-a-pins {
-+                              function = "led_25";
-+                              groups = "led_25_grp_a";
-+                      };
-+
-                       pins_led_26_a: led_26-a-pins {
-                               function = "led_26";
-                               groups = "led_26_grp_a";
-@@ -387,6 +457,11 @@
-                               groups = "led_30_grp_a";
-                       };
-+                      pins_led_31_a: led_31-a-pins {
-+                              function = "led_31";
-+                              groups = "led_31_grp_a";
-+                      };
-+
-                       pins_hs_uart: hs_uart-pins {
-                               function = "hs_uart";
-                               groups = "hs_uart_grp";
diff --git a/target/linux/bcm4908/patches-5.10/130-0002-arm64-dts-broadcom-bcm4908-add-LEDs-controller-block.patch b/target/linux/bcm4908/patches-5.10/130-0002-arm64-dts-broadcom-bcm4908-add-LEDs-controller-block.patch
deleted file mode 100644 (file)
index 0ba3745..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Mon, 18 Jul 2022 13:17:57 +0200
-Subject: [PATCH] arm64: dts: broadcom: bcm4908: add LEDs controller block
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-BCM4908 includes LEDs controller that supports multiple brightness
-levels & hardware blinking.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
----
- arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
-+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
-@@ -517,6 +517,14 @@
-                       status = "okay";
-               };
-+              leds: leds@800 {
-+                      compatible = "brcm,bcm4908-leds", "brcm,bcm63138-leds";
-+                      reg = <0x800 0xdc>;
-+
-+                      #address-cells = <1>;
-+                      #size-cells = <0>;
-+              };
-+
-               nand-controller@1800 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
diff --git a/target/linux/bcm4908/patches-5.10/130-0003-arm64-dts-broadcom-bcm4908-add-Asus-GT-AC5300-LEDs.patch b/target/linux/bcm4908/patches-5.10/130-0003-arm64-dts-broadcom-bcm4908-add-Asus-GT-AC5300-LEDs.patch
deleted file mode 100644 (file)
index 796395a..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Mon, 18 Jul 2022 13:21:54 +0200
-Subject: [PATCH] arm64: dts: broadcom: bcm4908: add Asus GT-AC5300 LEDs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are 5 software-controllable LEDs on PCB.
-
-Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
----
- .../bcm4908/bcm4908-asus-gt-ac5300.dts        | 48 +++++++++++++++++++
- 1 file changed, 48 insertions(+)
-
---- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
-+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
-@@ -2,6 +2,7 @@
- #include <dt-bindings/gpio/gpio.h>
- #include <dt-bindings/input/input.h>
-+#include <dt-bindings/leds/common.h>
- #include "bcm4908.dtsi"
-@@ -118,6 +119,53 @@
-       };
- };
-+&leds {
-+      led-power@11 {
-+              reg = <0x11>;
-+              function = LED_FUNCTION_POWER;
-+              color = <LED_COLOR_ID_WHITE>;
-+              default-state = "on";
-+              active-low;
-+              pinctrl-names = "default";
-+              pinctrl-0 = <&pins_led_17_a>;
-+      };
-+
-+      led-wan-red@12 {
-+              reg = <0x12>;
-+              function = LED_FUNCTION_WAN;
-+              color = <LED_COLOR_ID_RED>;
-+              active-low;
-+              pinctrl-names = "default";
-+              pinctrl-0 = <&pins_led_18_a>;
-+      };
-+
-+      led-wps@14 {
-+              reg = <0x14>;
-+              function = LED_FUNCTION_WPS;
-+              color = <LED_COLOR_ID_WHITE>;
-+              active-low;
-+              pinctrl-names = "default";
-+              pinctrl-0 = <&pins_led_20_a>;
-+      };
-+
-+      led-wan-white@15 {
-+              reg = <0x15>;
-+              function = LED_FUNCTION_WAN;
-+              color = <LED_COLOR_ID_WHITE>;
-+              active-low;
-+              pinctrl-names = "default";
-+              pinctrl-0 = <&pins_led_21_a>;
-+      };
-+
-+      led-lan@19 {
-+              reg = <0x19>;
-+              function = LED_FUNCTION_LAN;
-+              color = <LED_COLOR_ID_WHITE>;
-+              pinctrl-names = "default";
-+              pinctrl-0 = <&pins_led_25_a>;
-+      };
-+};
-+
- &nandcs {
-       nand-ecc-strength = <4>;
-       nand-ecc-step-size = <512>;