ar71xx: fix LED names for GL Innovations boards

Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>

diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds
index e960e88a2e2b622efe8bde0042c3393aaec77f46..86a296ef0fc925ded98e2ae82c5beabd280d8fde 100755 (executable)
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -214,26 +214,26 @@ dlan-pro-1200-ac)
        ucidef_set_led_gpio "plcr" "dLAN" "devolo:error:dlan" "16" "0"
        ;;
 gl-ar150)
-       ucidef_set_led_wlan "wlan" "WLAN" "gl_ar150:wlan" "phy0tpt"
+       ucidef_set_led_wlan "wlan" "WLAN" "gl-ar150:wlan" "phy0tpt"
        ;;
 gl-ar300)
-       ucidef_set_led_wlan "wlan" "WLAN" "gl_ar300:wlan" "phy0tpt"
+       ucidef_set_led_wlan "wlan" "WLAN" "gl-ar300:wlan" "phy0tpt"
        ;;
 gl-ar300m)
        ucidef_set_led_wlan "wlan" "WLAN" "gl-ar300m:wlan" "phy0tpt"
        ;;
 gl-domino)
-       ucidef_set_led_wlan "wlan" "WLAN" "domino:blue:wlan" "phy0tpt"
+       ucidef_set_led_wlan "wlan" "WLAN" "gl-domino:blue:wlan" "phy0tpt"
        ;;
 gl-inet)
-       ucidef_set_led_netdev "lan" "LAN" "gl-connect:green:lan" "eth1"
-       ucidef_set_led_wlan "wlan" "WLAN" "gl-connect:red:wlan" "phy0tpt"
+       ucidef_set_led_netdev "lan" "LAN" "gl-inet:green:lan" "eth1"
+       ucidef_set_led_wlan "wlan" "WLAN" "gl-inet:red:wlan" "phy0tpt"
        ;;
 gl-mifi)
-       ucidef_set_led_netdev "wan" "WAN" "gl_mifi:wan" "eth0"
-       ucidef_set_led_netdev "lan" "LAN" "gl_mifi:lan" "eth1"
-       ucidef_set_led_netdev "3gnet" "3GNET" "gl_mifi:net" "3g-wan"
-       ucidef_set_led_wlan "wlan" "WLAN" "gl_mifi:wlan" "phy0tpt"
+       ucidef_set_led_netdev "wan" "WAN" "gl-mifi:wan" "eth0"
+       ucidef_set_led_netdev "lan" "LAN" "gl-mifi:lan" "eth1"
+       ucidef_set_led_netdev "3gnet" "3GNET" "gl-mifi:net" "3g-wan"
+       ucidef_set_led_wlan "wlan" "WLAN" "gl-mifi:wlan" "phy0tpt"
        ;;
 esr900)
        ucidef_set_led_wlan "wlan2g" "WLAN 2.4 GHz" "engenius:blue:wlan-2g" "phy0tpt"

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index fd6117bc253a90b8e1b4c0089edd2aa3d798eda8..d6e257d6372e6913a4d3ad8071aa122a14b41e96 100644 (file)
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -144,7 +144,7 @@ get_status_led() {
                status_led="belkin:blue:status"
                ;;
        gl-inet)
-               status_led="gl-connect:green:lan"
+               status_led="$board:green:lan"
                ;;
        epg5000|\
        esr1750)

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c
index 310182cc8e9c22e2bfcb168996d4f01d117dc103..e0d1ea4381396b138a435f2f8b9e480a11787607 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c
@@ -42,17 +42,17 @@
 
 static struct gpio_led gl_ar150_leds_gpio[] __initdata = {
        {
-               .name = "gl_ar150:wlan",
+               .name = "gl-ar150:wlan",
                .gpio = GL_AR150_GPIO_LED_WLAN,
                .active_low = 0,
        },
        {
-               .name = "gl_ar150:lan",
+               .name = "gl-ar150:lan",
                .gpio = GL_AR150_GPIO_LED_LAN,
                .active_low = 0,
        },
        {
-               .name = "gl_ar150:wan",
+               .name = "gl-ar150:wan",
                .gpio = GL_AR150_GPIO_LED_WAN,
                .active_low = 0,
                .default_state = 1,

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300.c
index 47db6de18840e76007599e0f7f744eedeff4f732..6f01b9e4def3a61a94a3764286294d84bbfbd73d 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300.c
@@ -41,12 +41,12 @@
 
 static struct gpio_led gl_ar300_leds_gpio[] __initdata = {
        {
-               .name = "gl_ar300:wlan",
+               .name = "gl-ar300:wlan",
                .gpio = GL_AR300_GPIO_LED_WLAN,
                .active_low = 1,
        },
        {
-               .name = "gl_ar300:wan",
+               .name = "gl-ar300:wan",
                .gpio = GL_AR300_GPIO_LED_WAN,
                .active_low = 1,
        },

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-domino.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-domino.c
index a8a42ad04249e2cb40876fec8121947726c40cc5..4ff8ff637e1dea27560d6d5e7e0f27905e2c851a 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-domino.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-domino.c
@@ -47,32 +47,32 @@
 
 static struct gpio_led domino_leds_gpio[] __initdata = {
        {
-               .name = "domino:blue:wlan",
+               .name = "gl-domino:blue:wlan",
                .gpio = DOMINO_GPIO_LED_WLAN,
                .active_low = 0,
        },
        {
-               .name = "domino:red:wan",
+               .name = "gl-domino:red:wan",
                .gpio = DOMINO_GPIO_LED_WAN,
                .active_low = 1,
        },
        {
-               .name = "domino:white:usb",
+               .name = "gl-domino:white:usb",
                .gpio = DOMINO_GPIO_LED_USB,
                .active_low = 0,
        },
        {
-               .name = "domino:green:lan1",
+               .name = "gl-domino:green:lan1",
                .gpio = DOMINO_GPIO_LED_LAN1,
                .active_low = 0,
        },
        {
-               .name = "domino:yellow:wps",
+               .name = "gl-domino:yellow:wps",
                .gpio = DOMINO_GPIO_LED_WPS,
                .active_low = 1,
        },
        {
-               .name = "domino:orange:sys",
+               .name = "gl-domino:orange:sys",
                .gpio = DOMINO_GPIO_LED_SYS,
                .active_low = 1,
        },

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-inet.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-inet.c
index 0713f1403d5ff6f631c134a7a2c03cf7ba98c359..6f603d9579c2cfebe7e55a73ba664f8066ab0d92 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-inet.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-inet.c
@@ -41,12 +41,12 @@ static struct flash_platform_data gl_inet_flash_data = {
 
 static struct gpio_led gl_inet_leds_gpio[] __initdata = {
        {
-               .name = "gl-connect:red:wlan",
+               .name = "gl-inet:red:wlan",
                .gpio = GL_INET_GPIO_LED_WLAN,
                .active_low = 0,
        },
        {
-               .name = "gl-connect:green:lan",
+               .name = "gl-inet:green:lan",
                .gpio = GL_INET_GPIO_LED_LAN,
                .active_low = 0,
                .default_state = 1,

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c
index 567fef9c9c00b2a97dd1bce0a8b0611e218e3424..42f4415d7fe0252aadf39e2ca50f96566c023728 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c
@@ -41,27 +41,27 @@
 
 static struct gpio_led gl_mifi_leds_gpio[] __initdata = {
        {
-               .name = "gl_mifi:wan",
+               .name = "gl-mifi:wan",
                .gpio = GL_MIFI_GPIO_LED_WAN,
                .active_low = 0,
        },
        {
-               .name = "gl_mifi:lan",
+               .name = "gl-mifi:lan",
                .gpio = GL_MIFI_GPIO_LED_LAN,
                .active_low = 0,
        },
        {
-               .name = "gl_mifi:wlan",
+               .name = "gl-mifi:wlan",
                .gpio = GL_MIFI_GPIO_LED_WLAN,
                .active_low = 0,
        },
        {
-               .name = "gl_mifi:net",
+               .name = "gl-mifi:net",
                .gpio = GL_MIFI_GPIO_LED_NET,
                .active_low = 0,
        },
        {
-               .name = "gl_mifi:3gcontrol",
+               .name = "gl-mifi:3gcontrol",
                .gpio = GL_MIFI_GPIO_LED_3GCONTROL,
                .active_low = 0,
        }