ipq40xx: fix support of EnGenius EAP2200

This fixes a typo in the device string for MAC address setup in
02_network and corrects the indent in the device's DTS files.

While at it, move the aliases section before the keys section to
have it closer to the top of the file.

Fixes: a736d912e2ba ("ipq40xx: add support for EnGenius EAP2200")

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index 190286541a3ca2fb386b60882816bf9f8e0efc34..fb41572e3723da8faf46de56b0b63478eca608e3 100755 (executable)
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -110,7 +110,7 @@ ipq40xx_setup_macs()
                lan_mac=$(mtd_get_mac_ascii bdcfg lanmac)
                label_mac=$lan_mac
                ;;
-       engenius,eap220|\
+       engenius,eap2200|\
        engenius,emd1)
                lan_mac=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
                label_mac=$lan_mac

diff --git a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts
index 6862ca87e367c554d3d21457b37847e8606ab489..ec3ce447cc7ba99c499b617bb9cbd4082736c601 100644 (file)
--- a/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts
+++ b/target/linux/ipq40xx/files-4.19/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts
@@ -8,16 +8,6 @@
        model = "EnGenius EAP2200";
        compatible = "engenius,eap2200";
 
-       keys {
-                       compatible = "gpio-keys";
-
-                       wps {
-                               label = "wps";
-                               gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-                               linux,code = <KEY_WPS_BUTTON>;
-                       };
-       };
-
        aliases {
                led-boot = &led_power;
                led-failsafe = &led_power;
@@ -25,6 +15,16 @@
                led-upgrade = &led_power;
        };
 
+       keys {
+               compatible = "gpio-keys";
+
+               wps {
+                       label = "wps";
+                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
+               };
+       };
+
        leds {
                compatible = "gpio-leds";
 

diff --git a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts
index 6862ca87e367c554d3d21457b37847e8606ab489..ec3ce447cc7ba99c499b617bb9cbd4082736c601 100644 (file)
--- a/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts
+++ b/target/linux/ipq40xx/files-5.4/arch/arm/boot/dts/qcom-ipq4019-eap2200.dts
@@ -8,16 +8,6 @@
        model = "EnGenius EAP2200";
        compatible = "engenius,eap2200";
 
-       keys {
-                       compatible = "gpio-keys";
-
-                       wps {
-                               label = "wps";
-                               gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
-                               linux,code = <KEY_WPS_BUTTON>;
-                       };
-       };
-
        aliases {
                led-boot = &led_power;
                led-failsafe = &led_power;
@@ -25,6 +15,16 @@
                led-upgrade = &led_power;
        };
 
+       keys {
+               compatible = "gpio-keys";
+
+               wps {
+                       label = "wps";
+                       gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_WPS_BUTTON>;
+               };
+       };
+
        leds {
                compatible = "gpio-leds";