mac80211: ath9k: replace qca,led-sources

Upstream seems to be using led-sources instead of custom properties.

Code mostly taken from mt76.

Changed all(few) users of qca,led_pin to use the new format.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/18805
Signed-off-by: Robert Marko <[email protected]>

diff --git a/package/kernel/mac80211/patches/ath9k/550-ath9k-of.patch b/package/kernel/mac80211/patches/ath9k/550-ath9k-of.patch
index 5cb70b40a70fb38aaf0934b1416e353219f74d79..3e80304b805aafc99278ff46932ced7bdad4d734 100644 (file)
--- a/package/kernel/mac80211/patches/ath9k/550-ath9k-of.patch
+++ b/package/kernel/mac80211/patches/ath9k/550-ath9k-of.patch
@@ -94,22 +94,18 @@
  /**************************/
  /*     Initialization     */
  /**************************/
  /**************************/
  /*     Initialization     */
  /**************************/

-@@ -670,6 +750,8 @@ static int ath9k_of_init(struct ath_soft
+@@ -670,6 +750,7 @@ static int ath9k_of_init(struct ath_soft

        struct ath_common *common = ath9k_hw_common(ah);
        enum ath_bus_type bus_type = common->bus_ops->ath_bus_type;
        char eeprom_name[100];
        struct ath_common *common = ath9k_hw_common(ah);
        enum ath_bus_type bus_type = common->bus_ops->ath_bus_type;
        char eeprom_name[100];

-+      u8 led_pin;

 +      u32 mask;
        int ret;
  
        if (!of_device_is_available(np))
 +      u32 mask;
        int ret;
  
        if (!of_device_is_available(np))

-@@ -677,6 +759,49 @@ static int ath9k_of_init(struct ath_soft
+@@ -677,6 +758,46 @@ static int ath9k_of_init(struct ath_soft

  
        ath_dbg(common, CONFIG, "parsing configuration from OF node\n");
  
  
        ath_dbg(common, CONFIG, "parsing configuration from OF node\n");
  

-+      if (!of_property_read_u8(np, "qca,led-pin", &led_pin))
-+              ah->led_pin = led_pin;
-+

 +      if (!of_property_read_u32(np, "qca,gpio-mask", &mask))
 +              ah->caps.gpio_mask = mask;
 +
 +      if (!of_property_read_u32(np, "qca,gpio-mask", &mask))
 +              ah->caps.gpio_mask = mask;
 +


@@ -153,3 +149,21 @@
        if (of_property_read_bool(np, "qca,no-eeprom")) {
                /* ath9k-eeprom-<bus>-<id>.bin */
                scnprintf(eeprom_name, sizeof(eeprom_name),
        if (of_property_read_bool(np, "qca,no-eeprom")) {
                /* ath9k-eeprom-<bus>-<id>.bin */
                scnprintf(eeprom_name, sizeof(eeprom_name),

+@@ -693,6 +814,17 @@ static int ath9k_of_init(struct ath_soft
+ 
+       of_get_mac_address(np, common->macaddr);
+ 
++      np = of_get_child_by_name(np, "led");
++      if (np && of_device_is_available(np)) {
++              u32 led_pin;
++
++              if (!of_property_read_u32(np, "led-sources", &led_pin))
++                      ah->led_pin = led_pin;
++
++              ah->config.led_active_high = !of_property_read_bool(np, "led-active-low");
++              of_node_put(np);
++      }
++
+       return 0;
+ }
+ 

diff --git a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-951ui-2hnd.dts b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-951ui-2hnd.dts
index 65003cb9a1fa026df6711fe27ea565750b3d45da..f57695eab09e2fa5d6c3889a7fb37d7610361e48 100644 (file)
--- a/target/linux/ath79/dts/ar9344_mikrotik_routerboard-951ui-2hnd.dts
+++ b/target/linux/ath79/dts/ar9344_mikrotik_routerboard-951ui-2hnd.dts
@@ -70,5 +70,8 @@
 };
 
 &wmac {
 };
 
 &wmac {

-       qca,led-pin = /bits/ 8 <11>;
+       led {
+               led-sources = <11>;
+               led-active-low;
+       };

 };
 };

diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
index 8d24a9e4287aa51967c5b6f4241856adc58c2eed..6569d7ff727cbcd83245ab50be75ec311a9e4ec0 100644 (file)
--- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
@@ -349,7 +349,6 @@
                                reg = <0x0000 0 0 0 0>;
                                #gpio-cells = <2>;
                                gpio-controller;
                                reg = <0x0000 0 0 0 0>;
                                #gpio-cells = <2>;
                                gpio-controller;

-                               qca,led-pin = /bits/ 8 <0>;

                                nvmem-cells = <&cal_caldata_1000>, <&macaddr_uboot_4fc00 0>;
                                nvmem-cell-names = "calibration", "mac-address";
                        };
                                nvmem-cells = <&cal_caldata_1000>, <&macaddr_uboot_4fc00 0>;
                                nvmem-cell-names = "calibration", "mac-address";
                        };


@@ -380,9 +379,13 @@
                                */
                                device-id = <0x0030>;
                                class-code = <0x028000>;
                                */
                                device-id = <0x0030>;
                                class-code = <0x028000>;

-                               qca,led-pin = /bits/ 8 <0>;

                                nvmem-cells = <&cal_caldata_5000>, <&macaddr_uboot_4fc00 (-1)>;
                                nvmem-cell-names = "calibration", "mac-address";
                                nvmem-cells = <&cal_caldata_5000>, <&macaddr_uboot_4fc00 (-1)>;
                                nvmem-cell-names = "calibration", "mac-address";

+
+                               led {
+                                       led-sources = <0>;
+                                       led-active-low;
+                               };

                        };
                };
        };
                        };
                };
        };