From 74cbc4408645845d217797b67abd17c1a684d3df Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 5 Mar 2020 12:21:40 +0100 Subject: [PATCH] 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 --- .../ipq40xx/base-files/etc/board.d/02_network | 2 +- .../arm/boot/dts/qcom-ipq4019-eap2200.dts | 20 +++++++++---------- .../arm/boot/dts/qcom-ipq4019-eap2200.dts | 20 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) 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 190286541a3..fb41572e372 100755 --- 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 6862ca87e36..ec3ce447cc7 100644 --- 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 = ; - }; - }; - 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 = ; + }; + }; + 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 6862ca87e36..ec3ce447cc7 100644 --- 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 = ; - }; - }; - 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 = ; + }; + }; + leds { compatible = "gpio-leds"; -- 2.30.2