ath79: tiny: tplink: add nvmem and fix

Despite having the same tplink.dtsi file, there are differences in wifi

Move wifi nodes out of dtsi to make it clear what the chipset is and
what calibration size should be used.

While at it, change to use led-sources to simplify LED setup.

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

diff --git a/target/linux/ath79/dts/ar7241_tplink.dtsi b/target/linux/ath79/dts/ar7241_tplink.dtsi
index 01eee39f1958bccc344b2334d51a2b991db5377d..8a42358d9b66c4db8f0bf8de795f81605374db46 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink.dtsi
+++ b/target/linux/ath79/dts/ar7241_tplink.dtsi
@@ -84,7 +84,7 @@
                                label = "firmware";
                        };
 
-                       partition@3f0000 {
+                       art_part: partition@3f0000 {
                                reg = <0x3f0000 0x10000>;
                                label = "art";
                                read-only;
@@ -95,15 +95,6 @@
 
 &pcie {
        status = "okay";
-
-       ath9k: wifi@0,0 {
-               reg = <0x0000 0 0 0 0>;
-               #gpio-cells = <2>;
-               gpio-controller;
-               qca,no-eeprom;
-               nvmem-cells = <&macaddr_uboot_1fc00 0>;
-               nvmem-cell-names = "mac-address";
-       };
 };
 
 &eth0 {                /* WAN interface, initialized last as eth1 */

diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts
index c9f696234bf8e58182b47443c950c123284a2aad..b7ca045e8689ba47c42fa5ba6451762be872e62a 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3220-v1.dts
@@ -7,15 +7,30 @@
 / {
        compatible = "tplink,tl-mr3220-v1", "qca,ar7241";
        model = "TP-Link TL-MR3220 v1";
+};
+
+&art_part {
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               cal_art_1000: calibration@1000 {
+                       reg = <0x1000 0x200>;
+               };
+       };
+};
 
-       ath9k-leds {
-               compatible = "gpio-leds";
+&pcie {
+       ath9k: wifi@0,0 {
+               compatible = "pci168c,002b";
+               reg = <0x0000 0 0 0 0>;
+               nvmem-cells = <&cal_art_1000>, <&macaddr_uboot_1fc00 0>;
+               nvmem-cell-names = "calibration", "mac-address";
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&ath9k 1 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
+               led {
+                       led-sources = <1>;
+                       led-active-low;
                };
        };
 };

diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts b/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts
index 539a5952b30efe5c347e86517632ccb3ce3faf85..d35703304160a56569ec4cfb046664945774250b 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-mr3420-v1.dts
@@ -7,15 +7,30 @@
 / {
        compatible = "tplink,tl-mr3420-v1", "qca,ar7241";
        model = "TP-Link TL-MR3420 v1";
+};
+
+&art_part {
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               cal_art_1000: calibration@1000 {
+                       reg = <0x1000 0x3d8>;
+               };
+       };
+};
 
-       ath9k-leds {
-               compatible = "gpio-leds";
+&pcie {
+       ath9k: wifi@0,0 {
+               compatible = "pci168c,002e";
+               reg = <0x0000 0 0 0 0>;
+               nvmem-cells = <&cal_art_1000>, <&macaddr_uboot_1fc00 0>;
+               nvmem-cell-names = "calibration", "mac-address";
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
+               led {
+                       led-sources = <0>;
+                       led-active-low;
                };
        };
 };

diff --git a/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts b/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
index c9543afed397e345647bf31a66bd1a8f57fad63c..bb52d3cd2ebfeaff9150a4566e2a3dedf418628d 100644 (file)
--- a/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
+++ b/target/linux/ath79/dts/ar7241_tplink_tl-wr841-v7.dts
@@ -7,15 +7,30 @@
 / {
        compatible = "tplink,tl-wr841-v7", "qca,ar7241";
        model = "TP-Link TL-WR841N/ND v7";
+};
+
+&art_part {
+       nvmem-layout {
+               compatible = "fixed-layout";
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               cal_art_1000: calibration@1000 {
+                       reg = <0x1000 0x3d8>;
+               };
+       };
+};
 
-       ath9k-leds {
-               compatible = "gpio-leds";
+&pcie {
+       ath9k: wifi@0,0 {
+               compatible = "pci168c,002e";
+               reg = <0x0000 0 0 0 0>;
+               nvmem-cells = <&cal_art_1000>, <&macaddr_uboot_1fc00 0>;
+               nvmem-cell-names = "calibration", "mac-address";
 
-               wlan {
-                       function = LED_FUNCTION_WLAN;
-                       color = <LED_COLOR_ID_GREEN>;
-                       gpios = <&ath9k 0 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
+               led {
+                       led-sources = <0>;
+                       led-active-low;
                };
        };
 };

diff --git a/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index 0f96f0490253cc4bdc4549e05ae79f8cad42f235..e7b9ed2563c2dc4f723e18c738a03f85c0dd0e07 100644 (file)
--- a/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ath79/tiny/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -20,9 +20,6 @@ case "$FIRMWARE" in
                ath9k_patch_mac_crc $(mtd_get_mac_ascii "nvram" "lan_mac") 0x10c
                ;;
        netgear,wnr2000-v3|\
-       tplink,tl-mr3220-v1|\
-       tplink,tl-mr3420-v1|\
-       tplink,tl-wr841-v7|\
        ubnt,airrouter|\
        ubnt,bullet-m-ar7240|\
        ubnt,bullet-m-ar7241|\