subject:"\[LEDE\-DEV\] \[PATCH\] ar71xx\: set status led for the gl\-\* boards"

Re: [LEDE-DEV] [PATCH] ar71xx: set status led for the gl-* boards

2017-03-05 Thread John Crispin



On 28/02/2017 14:18, Wojciech Jowsa wrote:
> This sets status_led for the  gl-ar300m and gl-mifi boards, and fixes led 
> names
> so that they follow correct naming scheme.
> It also fixes mangled whitespace in the mach-gl-ar300m.c.
> 
> Signed-off-by: Wojciech Jowsa 

Applying: ar71xx: set status led for the gl-* boards
fatal: corrupt patch at line 88
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 ar71xx: set status led for the gl-* boards
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
applying 733516 FAILED

the patch has line breakages at 3 places where your mail clients wrapped
the mail at 80 chars. once i fixed these manually, git complains about
other whitespace errors. please look at "git send-email" you mail client
is evidently broken

John

> ---
>  target/linux/ar71xx/base-files/etc/board.d/01_leds |  21 +-
>  target/linux/ar71xx/base-files/etc/diag.sh |   4 +-
>  .../ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c  | 222 
> ++---
>  .../ar71xx/files/arch/mips/ath79/mach-gl-mifi.c|  10 +-
>  4 files changed, 129 insertions(+), 128 deletions(-)
> 
> 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 4dc4bfd..0ed533d 100755
> --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
> +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
> @@ -312,19 +312,18 @@ dlan-pro-1200-ac)
> ucidef_set_led_gpio "plcw" "dLAN" "devolo:status:dlan" "17" "0"
> ucidef_set_led_gpio "plcr" "dLAN" "devolo:error:dlan" "16" "0"
> ;;
> -gl-ar150|\
> -gl-ar300|\
> -gl-ar300m|\
> +gl-ar300m)
> +   ucidef_set_led_wlan "wlan" "WLAN" "$board:red:wlan" "phy0tpt"
> +   ;;
>  gl-mifi)
> +   ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
> +   ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0"
> +   ucidef_set_led_netdev "lan" "LAN" "$board:green:lan" "eth1"
> +   ucidef_set_led_netdev "3gnet" "3GNET" "$board:green:net" "3g-wan"
> +   ;;
> +gl-ar150|\
> +gl-ar300)
> ucidef_set_led_wlan "wlan" "WLAN" "$board:wlan" "phy0tpt"
> -
> -   case "$board" in
> -   gl-mifi)
> -   ucidef_set_led_netdev "wan" "WAN" "$board:wan" "eth0"
> -   ucidef_set_led_netdev "lan" "LAN" "$board:lan" "eth1"
> -   ucidef_set_led_netdev "3gnet" "3GNET" "$board:net" "3g-wan"
> -   ;;
> -   esac
> ;;
>  gl-domino|\
>  sc300m|\
> diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
> b/target/linux/ar71xx/base-files/etc/diag.sh
> index 1064641..7987e51 100644
> --- a/target/linux/ar71xx/base-files/etc/diag.sh
> +++ b/target/linux/ar71xx/base-files/etc/diag.sh
> @@ -61,7 +61,9 @@ get_status_led() {
> ap90q|\
> cpe830|\
> cpe870|\
> -   gl-inet)
> +   gl-inet|\
> +   gl-mifi|\
> +   gl-ar300m)
> status_led="$board:green:lan"
> ;;
> ap96)
> diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
> b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
> index 62906a1..8f4a0c5 100644
> --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
> +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
> @@ -6,9 +6,9 @@
>   *  Copyright (C) 2013 alzhao 
>   *  Copyright (C) 2014 Michel Stempin 
>   *
> - *  This program is free software; you can redistribute it and/or modify it
> - *  under the terms of the GNU General Public License version 2 as published
> - *  by the Free Software Foundation.
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License version 2 as published
> + * by the Free Software Foundation.
>   */
> 
>  #include 
> @@ -37,130 +37,130 @@
>  #define GL_AR300M_GPIO_BTN_LEFT0
>  #define GL_AR300M_GPIO_BTN_RIGHT   1
> 
> -#define GL_AR300M_KEYS_POLL_INTERVAL20  /* msecs */
> -#define GL_AR300M_KEYS_DEBOUNCE_INTERVAL(3 * 
> GL_AR300M_KEYS_POLL_INTERVAL)
> +#define GL_AR300M_KEYS_POLL_INTERVAL   20  /* msecs */
> +#define GL_AR300M_KEYS_DEBOUNCE_INTERVAL   (3 *
> GL_AR300M_KEYS_POLL_INTERVAL)
> 
> -#define GL_AR300M_MAC0_OFFSET   0
> -#define GL_AR300M_MAC1_OFFSET   6
> -#define GL_AR300M_WMAC_CALDATA_OFFSET   0x1000
> -#define GL_AR300M_PCIE_CALDATA_OFFSET   0x5000
> +#define GL_AR300M_MAC0_OFFSET  0
> +#define GL_AR300M_MAC1_OFFSET  6
> +#define GL_AR300M_WMAC_CALDATA_OFFSET  0x1000
> +#define GL_AR300M_PCIE_CALDATA_OFFSET  0x5000
> 
>  static struct gpio_led gl_ar300m_leds_gpio[] __initdata = {
> -{
> -.name = "gl-ar300m:usb",
> -.gpio

Re: [LEDE-DEV] [PATCH] ar71xx: set status led for the gl-* boards

2017-02-28 Thread Wojciech Jowsa

Hi,

Spaces have been there from the first commit but I have fixed that in
the latest patch.
Hope, this is the last one :)

On Mon, Feb 27, 2017 at 11:32 AM, John Crispin  wrote:
>
>
> On 15/02/2017 16:33, Wojciech Jowsa wrote:
>> This sets status_led for the  gl-ar300m and gl-mifi boards, and fixes led 
>> names
>> so that they follow correct naming scheme.
>>
>>
>> Signed-off-by: Wojciech Jowsa 
>
> Hi,
>
> thanks for changing the leds globally, however when you sent this patch
> it got whitespace mangled and tabs were replaced with spaces. could you
> try and resend it without mangling whitespaces please ?
>
> John
>
>> ---
>>  target/linux/ar71xx/base-files/etc/board.d/01_leds  | 21 
>> ++---
>>  target/linux/ar71xx/base-files/etc/diag.sh  |  4 +++-
>>  .../ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c   |  8 
>>  .../ar71xx/files/arch/mips/ath79/mach-gl-mifi.c | 10 +-
>>  4 files changed, 22 insertions(+), 21 deletions(-)
>>
>> 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 131b63e..f5c6043 100755
>> --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
>> +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
>> @@ -312,19 +312,18 @@ dlan-pro-1200-ac)
>>   ucidef_set_led_gpio "plcw" "dLAN" "devolo:status:dlan" "17" "0"
>>   ucidef_set_led_gpio "plcr" "dLAN" "devolo:error:dlan" "16" "0"
>>   ;;
>> -gl-ar150|\
>> -gl-ar300|\
>> -gl-ar300m|\
>> +gl-ar300m)
>> + ucidef_set_led_wlan "wlan" "WLAN" "$board:red:wlan" "phy0tpt"
>> + ;;
>>  gl-mifi)
>> + ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
>> + ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0"
>> + ucidef_set_led_netdev "lan" "LAN" "$board:green:lan" "eth1"
>> + ucidef_set_led_netdev "3gnet" "3GNET" "$board:green:net" "wwan0"
>> + ;;
>> +gl-ar150|\
>> +gl-ar300)
>>   ucidef_set_led_wlan "wlan" "WLAN" "$board:wlan" "phy0tpt"
>> -
>> - case "$board" in
>> - gl-mifi)
>> - ucidef_set_led_netdev "wan" "WAN" "$board:wan" "eth0"
>> - ucidef_set_led_netdev "lan" "LAN" "$board:lan" "eth1"
>> - ucidef_set_led_netdev "3gnet" "3GNET" "$board:net" "wwan0"
>> - ;;
>> - esac
>>   ;;
>>  gl-domino|\
>>  sc300m|\
>> diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
>> b/target/linux/ar71xx/base-files/etc/diag.sh
>> index ae6c693..ed9bf3a 100644
>> --- a/target/linux/ar71xx/base-files/etc/diag.sh
>> +++ b/target/linux/ar71xx/base-files/etc/diag.sh
>> @@ -60,7 +60,9 @@ get_status_led() {
>>   ap90q|\
>>   cpe830|\
>>   cpe870|\
>> - gl-inet)
>> + gl-inet|\
>> + gl-mifi|\
>> + gl-ar300m)
>>   status_led="$board:green:lan"
>>   ;;
>>   ap96)
>> diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
>> b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
>> index 62906a1..5b7f958 100644
>> --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
>> +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
>> @@ -47,23 +47,23 @@
>>
>>  static struct gpio_led gl_ar300m_leds_gpio[] __initdata = {
>>  {
>> -.name = "gl-ar300m:usb",
>> +.name = "gl-ar300m:green:usb",
>>  .gpio = GL_AR300M_GPIO_LED_USB,
>>  .active_low = 0,
>>  .default_state = 1,
>>  },
>>  {
>> -.name = "gl-ar300m:wlan",
>> +.name = "gl-ar300m:red:wlan",
>>  .gpio = GL_AR300M_GPIO_LED_WLAN,
>>  .active_low = 1,
>>  },
>>  {
>> -.name = "gl-ar300m:lan",
>> +.name = "gl-ar300m:green:lan",
>>  .gpio = GL_AR300M_GPIO_LED_LAN,
>>  .active_low = 1,
>>  },
>>  {
>> -.name = "gl-ar300m:system",
>> +.name = "gl-ar300m:green:system",
>>  .gpio = GL_AR300M_GPIO_LED_SYSTEM,
>>  .active_low = 1,
>>  .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 42f4415..14365b7 100644
>> --- 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:green:wan",
>>   .gpio = GL_MIFI_GPIO_LED_WAN,
>>   .active_low = 0,
>>   },
>>   {
>> - .name = "gl-mifi:lan",
>> + .name = "gl-mifi:green:lan",
>>   .gpio = GL_MIFI_GPIO_LED_LAN,
>>   .active_low = 0,
>>   },
>>   {
>> - .name = "gl-mifi:wlan",
>> + .name = "gl-mifi:green:wlan",
>>   .gpio = GL_MIFI_GPIO_LED_WLAN,
>>   .active_low = 0,
>>   },
>>   {
>> - .name = "gl-mifi:net",
>> + .name = "gl-mifi:green:net",
>>   .gpio = GL_MIFI_GPIO_LED_NET,
>>   .active_low = 0,
>>   },
>>   {
>> - .name = "gl-mifi:3gcontrol",
>> + .name = "gl-mifi:green:3gcontrol",
>>   .gpio = GL_MIFI_GPIO_LED_3GCONTROL,
>>   .active_low = 0,
>>   }
>>



-- 
Wojciech

[LEDE-DEV] [PATCH] ar71xx: set status led for the gl-* boards

2017-02-28 Thread Wojciech Jowsa

This sets status_led for the  gl-ar300m and gl-mifi boards, and fixes led names
so that they follow correct naming scheme.
It also fixes mangled whitespace in the mach-gl-ar300m.c.

Signed-off-by: Wojciech Jowsa 
---
 target/linux/ar71xx/base-files/etc/board.d/01_leds |  21 +-
 target/linux/ar71xx/base-files/etc/diag.sh |   4 +-
 .../ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c  | 222 ++---
 .../ar71xx/files/arch/mips/ath79/mach-gl-mifi.c|  10 +-
 4 files changed, 129 insertions(+), 128 deletions(-)

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 4dc4bfd..0ed533d 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -312,19 +312,18 @@ dlan-pro-1200-ac)
ucidef_set_led_gpio "plcw" "dLAN" "devolo:status:dlan" "17" "0"
ucidef_set_led_gpio "plcr" "dLAN" "devolo:error:dlan" "16" "0"
;;
-gl-ar150|\
-gl-ar300|\
-gl-ar300m|\
+gl-ar300m)
+   ucidef_set_led_wlan "wlan" "WLAN" "$board:red:wlan" "phy0tpt"
+   ;;
 gl-mifi)
+   ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
+   ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0"
+   ucidef_set_led_netdev "lan" "LAN" "$board:green:lan" "eth1"
+   ucidef_set_led_netdev "3gnet" "3GNET" "$board:green:net" "3g-wan"
+   ;;
+gl-ar150|\
+gl-ar300)
ucidef_set_led_wlan "wlan" "WLAN" "$board:wlan" "phy0tpt"
-
-   case "$board" in
-   gl-mifi)
-   ucidef_set_led_netdev "wan" "WAN" "$board:wan" "eth0"
-   ucidef_set_led_netdev "lan" "LAN" "$board:lan" "eth1"
-   ucidef_set_led_netdev "3gnet" "3GNET" "$board:net" "3g-wan"
-   ;;
-   esac
;;
 gl-domino|\
 sc300m|\
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
index 1064641..7987e51 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -61,7 +61,9 @@ get_status_led() {
ap90q|\
cpe830|\
cpe870|\
-   gl-inet)
+   gl-inet|\
+   gl-mifi|\
+   gl-ar300m)
status_led="$board:green:lan"
;;
ap96)
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
index 62906a1..8f4a0c5 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
@@ -6,9 +6,9 @@
  *  Copyright (C) 2013 alzhao 
  *  Copyright (C) 2014 Michel Stempin 
  *
- *  This program is free software; you can redistribute it and/or modify it
- *  under the terms of the GNU General Public License version 2 as published
- *  by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
  */

 #include 
@@ -37,130 +37,130 @@
 #define GL_AR300M_GPIO_BTN_LEFT0
 #define GL_AR300M_GPIO_BTN_RIGHT   1

-#define GL_AR300M_KEYS_POLL_INTERVAL20  /* msecs */
-#define GL_AR300M_KEYS_DEBOUNCE_INTERVAL(3 * GL_AR300M_KEYS_POLL_INTERVAL)
+#define GL_AR300M_KEYS_POLL_INTERVAL   20  /* msecs */
+#define GL_AR300M_KEYS_DEBOUNCE_INTERVAL   (3 *
GL_AR300M_KEYS_POLL_INTERVAL)

-#define GL_AR300M_MAC0_OFFSET   0
-#define GL_AR300M_MAC1_OFFSET   6
-#define GL_AR300M_WMAC_CALDATA_OFFSET   0x1000
-#define GL_AR300M_PCIE_CALDATA_OFFSET   0x5000
+#define GL_AR300M_MAC0_OFFSET  0
+#define GL_AR300M_MAC1_OFFSET  6
+#define GL_AR300M_WMAC_CALDATA_OFFSET  0x1000
+#define GL_AR300M_PCIE_CALDATA_OFFSET  0x5000

 static struct gpio_led gl_ar300m_leds_gpio[] __initdata = {
-{
-.name = "gl-ar300m:usb",
-.gpio = GL_AR300M_GPIO_LED_USB,
-.active_low = 0,
-.default_state = 1,
-},
-{
-.name = "gl-ar300m:wlan",
-.gpio = GL_AR300M_GPIO_LED_WLAN,
-.active_low = 1,
-},
-{
-.name = "gl-ar300m:lan",
-.gpio = GL_AR300M_GPIO_LED_LAN,
-.active_low = 1,
-},
-{
-.name = "gl-ar300m:system",
-.gpio = GL_AR300M_GPIO_LED_SYSTEM,
-.active_low = 1,
-.default_state = 1,
-},
+   {
+   .name = "gl-ar300m:green:usb",
+   .gpio = GL_AR300M_GPIO_LED_USB,
+   .active_low = 0,
+   .default_state = 1,
+   },
+   {
+   .name = "gl-ar300m:green:wlan",
+   .gpio = GL_AR300M_GPIO_LED_WLAN,
+   .active_low = 1,
+   },
+   {
+   .name = "gl-ar300m::green:lan",
+   .gpio = GL_AR300M_GPIO_LED_LAN,
+   .active_low = 1,
+   },
+   {
+

[LEDE-DEV] [PATCH] ar71xx: set status led for the gl-* boards

2017-02-15 Thread Wojciech Jowsa

This sets status_led for the  gl-ar300m and gl-mifi boards, and fixes led names
so that they follow correct naming scheme.


Signed-off-by: Wojciech Jowsa 
---
 target/linux/ar71xx/base-files/etc/board.d/01_leds  | 21 ++---
 target/linux/ar71xx/base-files/etc/diag.sh  |  4 +++-
 .../ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c   |  8 
 .../ar71xx/files/arch/mips/ath79/mach-gl-mifi.c | 10 +-
 4 files changed, 22 insertions(+), 21 deletions(-)

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 131b63e..f5c6043 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
@@ -312,19 +312,18 @@ dlan-pro-1200-ac)
  ucidef_set_led_gpio "plcw" "dLAN" "devolo:status:dlan" "17" "0"
  ucidef_set_led_gpio "plcr" "dLAN" "devolo:error:dlan" "16" "0"
  ;;
-gl-ar150|\
-gl-ar300|\
-gl-ar300m|\
+gl-ar300m)
+ ucidef_set_led_wlan "wlan" "WLAN" "$board:red:wlan" "phy0tpt"
+ ;;
 gl-mifi)
+ ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan" "phy0tpt"
+ ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0"
+ ucidef_set_led_netdev "lan" "LAN" "$board:green:lan" "eth1"
+ ucidef_set_led_netdev "3gnet" "3GNET" "$board:green:net" "wwan0"
+ ;;
+gl-ar150|\
+gl-ar300)
  ucidef_set_led_wlan "wlan" "WLAN" "$board:wlan" "phy0tpt"
-
- case "$board" in
- gl-mifi)
- ucidef_set_led_netdev "wan" "WAN" "$board:wan" "eth0"
- ucidef_set_led_netdev "lan" "LAN" "$board:lan" "eth1"
- ucidef_set_led_netdev "3gnet" "3GNET" "$board:net" "wwan0"
- ;;
- esac
  ;;
 gl-domino|\
 sc300m|\
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
index ae6c693..ed9bf3a 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -60,7 +60,9 @@ get_status_led() {
  ap90q|\
  cpe830|\
  cpe870|\
- gl-inet)
+ gl-inet|\
+ gl-mifi|\
+ gl-ar300m)
  status_led="$board:green:lan"
  ;;
  ap96)
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
index 62906a1..5b7f958 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c
@@ -47,23 +47,23 @@

 static struct gpio_led gl_ar300m_leds_gpio[] __initdata = {
 {
-.name = "gl-ar300m:usb",
+.name = "gl-ar300m:green:usb",
 .gpio = GL_AR300M_GPIO_LED_USB,
 .active_low = 0,
 .default_state = 1,
 },
 {
-.name = "gl-ar300m:wlan",
+.name = "gl-ar300m:red:wlan",
 .gpio = GL_AR300M_GPIO_LED_WLAN,
 .active_low = 1,
 },
 {
-.name = "gl-ar300m:lan",
+.name = "gl-ar300m:green:lan",
 .gpio = GL_AR300M_GPIO_LED_LAN,
 .active_low = 1,
 },
 {
-.name = "gl-ar300m:system",
+.name = "gl-ar300m:green:system",
 .gpio = GL_AR300M_GPIO_LED_SYSTEM,
 .active_low = 1,
 .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 42f4415..14365b7 100644
--- 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:green:wan",
  .gpio = GL_MIFI_GPIO_LED_WAN,
  .active_low = 0,
  },
  {
- .name = "gl-mifi:lan",
+ .name = "gl-mifi:green:lan",
  .gpio = GL_MIFI_GPIO_LED_LAN,
  .active_low = 0,
  },
  {
- .name = "gl-mifi:wlan",
+ .name = "gl-mifi:green:wlan",
  .gpio = GL_MIFI_GPIO_LED_WLAN,
  .active_low = 0,
  },
  {
- .name = "gl-mifi:net",
+ .name = "gl-mifi:green:net",
  .gpio = GL_MIFI_GPIO_LED_NET,
  .active_low = 0,
  },
  {
- .name = "gl-mifi:3gcontrol",
+ .name = "gl-mifi:green:3gcontrol",
  .gpio = GL_MIFI_GPIO_LED_3GCONTROL,
  .active_low = 0,
  }
-- 
2.8.1

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] ar71xx: set status led for the gl-* boards

2017-02-15 Thread David Woodhouse

On Wed, 2017-02-15 at 09:29 +0100, John Crispin wrote:
> 
> > --- a/target/linux/ar71xx/base-files/etc/diag.sh
> > +++ b/target/linux/ar71xx/base-files/etc/diag.sh
> > @@ -63,6 +63,10 @@ get_status_led() {
> > gl-inet)
> > status_led="$board:green:lan"
> > ;;
> > +   gl-ar300m|\
> > +   gl-mifi)
> > +   status_led="$board:lan"
> 
> Hi Wojciech,
> 
> patch is technically correct, however while reviewing it i noticed that
> the boards do not follow the correct naming scheme. normally it should
> be board:color:function. looks like the gl boards are missing the color.
> would you mind re-spinning you patch and also fixing the colors inside
> target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar300m.c and
> target/linux/ar71xx/files/arch/mips/ath79/mach-gl-mifi.c

Also... ick, we've got board details hard-coded in /etc/diag.sh, which
is what I just fixed for x86.

Should we promote target/x86/base-files/etc/diag.sh to run *everywhere*
and make things work that way? 

smime.p7s
Description: S/MIME cryptographic signature
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

[LEDE-DEV] [PATCH] ar71xx: set status led for the gl-* boards

2017-02-14 Thread Wojciech Jowsa

This sets status_led for the  gl-ar300m and gl-mifi boards.

Signed-off-by: Wojciech Jowsa 
---
 target/linux/ar71xx/base-files/etc/diag.sh | 4 
 1 file changed, 4 insertions(+)

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh
b/target/linux/ar71xx/base-files/etc/diag.sh
index a407a99..df13c43 100644
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -63,6 +63,10 @@ get_status_led() {
gl-inet)
status_led="$board:green:lan"
;;
+   gl-ar300m|\
+   gl-mifi)
+   status_led="$board:lan"
+   ;;
ap96)
status_led="$board:green:led2"
;;
-- 
2.8.1

___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Re: [LEDE-DEV] [PATCH] ar71xx: set status led for the gl-* boards

Re: [LEDE-DEV] [PATCH] ar71xx: set status led for the gl-* boards

[LEDE-DEV] [PATCH] ar71xx: set status led for the gl-* boards

[LEDE-DEV] [PATCH] ar71xx: set status led for the gl-* boards

Re: [LEDE-DEV] [PATCH] ar71xx: set status led for the gl-* boards

[LEDE-DEV] [PATCH] ar71xx: set status led for the gl-* boards

6 matches

Site Navigation

Mail list logo

Footer information