ramips: mt76x8: fixs for Keenetic Air (KN-1613) and Extra (KN-1713)

A new syntax for LEDs was used, and migration of the LEDs configuration was
added. Used lower case hex characters for the addresses. Fixed a USB port
power issue.

Signed-off-by: Anton Yu. Ivanusev <ivanusevanton@yandex.ru>
Link: https://github.com/openwrt/openwrt/pull/17521
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/ramips/dts/mt7628an_keenetic_kn-1613.dts b/target/linux/ramips/dts/mt7628an_keenetic_kn-1613.dts
index 4b124c92954245dbc25e6098dd573164ff66e910..af6292980b86abe8226d43f28a8ab8ab6c360bfb 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_keenetic_kn-1613.dts
+++ b/target/linux/ramips/dts/mt7628an_keenetic_kn-1613.dts
@@ -30,18 +30,21 @@
                };
 
                internet {
-                       label = "green:internet";
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                };
 
                wifi2 {
-                       label = "green:wifi2";
+                       function = LED_FUNCTION_WLAN_2GHZ;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy0tpt";
                };
 
                wifi5 {
-                       label = "green:wifi5";
+                       function = LED_FUNCTION_WLAN_5GHZ;
+                       color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1tpt";
                };

diff --git a/target/linux/ramips/dts/mt7628an_keenetic_kn-1713.dts b/target/linux/ramips/dts/mt7628an_keenetic_kn-1713.dts
index 972c88eadd0ed1d2f12f7c0e1195ddcb76b35e10..84127a88e042185d963d9dc658dc99d479df4394 100644 (file)
--- a/target/linux/ramips/dts/mt7628an_keenetic_kn-1713.dts
+++ b/target/linux/ramips/dts/mt7628an_keenetic_kn-1713.dts
@@ -27,6 +27,7 @@
                regulator-max-microvolt = <5000000>;
                gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
                enable-active-high;
+               regulator-always-on;
        };
 
        leds {
@@ -44,17 +45,18 @@
                        gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
                };
 
-               fn {
-                       function = LED_FUNCTION_USB;
+               wifi2 {
+                       function = LED_FUNCTION_WLAN_2GHZ;
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "phy0tpt";
                };
 
-               wifi {
-                       function = LED_FUNCTION_WLAN;
+               wifi5 {
+                       function = LED_FUNCTION_WLAN_5GHZ;
                        color = <LED_COLOR_ID_GREEN>;
                        gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt","phy1tpt";
+                       linux,default-trigger = "phy1tpt";
                };
        };
 
@@ -93,7 +95,7 @@
                        partition@0 {
                                compatible = "denx,uimage";
                                label = "firmware";
-                               reg = <0x0 0x1CC0000>;
+                               reg = <0x0 0x1cc0000>;
                        };
                };
        };
@@ -160,21 +162,21 @@
                                reg = <0x50000 0xe60000>;
                        };
 
-                       partition@EB0000 {
+                       partition@eb0000 {
                                label = "config_1";
-                               reg = <0xEB0000 0x40000>;
+                               reg = <0xeb0000 0x40000>;
                                read-only;
                        };
 
-                       partition@EF0000 {
+                       partition@ef0000 {
                                label = "storage";
-                               reg = <0xEF0000 0x100000>;
+                               reg = <0xef0000 0x100000>;
                                read-only;
                        };
 
-                       partition@FF0000 {
+                       partition@ff0000 {
                                label = "dump";
-                               reg = <0xFF0000 0x10000>;
+                               reg = <0xff0000 0x10000>;
                                read-only;
                        };
 
@@ -198,12 +200,12 @@
 
                        firmware2: partition@1050000 {
                                label = "firmware_2";
-                               reg = <0x1050000 0xE60000>;
+                               reg = <0x1050000 0xe60000>;
                        };
                        
-                       partition@1EB0000 {
+                       partition@1eb0000 {
                                label = "Config_2";
-                               reg = <0x1EB0000 0x40000>;
+                               reg = <0x1eb0000 0x40000>;
                                read-only;
                        };
                };

diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/04_led_migration b/target/linux/ramips/mt76x8/base-files/etc/board.d/04_led_migration
new file mode 100644 (file)
index 0000000..c845fad
--- /dev/null
+++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/04_led_migration
@@ -0,0 +1,16 @@
+. /lib/functions.sh
+. /lib/functions/migrations.sh
+
+board=$(board_name)
+
+case "$board" in
+keenetic,kn-1613)
+       migrate_leds 'green:internet=green:wan'
+       ;;
+esac
+
+remove_devicename_leds
+
+migrations_apply system
+
+exit 0