bmips: fix leds on f@st3864op

gpio-leds were not working on F@ST3864OP before  was merged.

This pull request adds definitions for all LEDs, including the previously
non-working WAN LEDs.

Signed-off-by: Hang Zhou <929513338@qq.com>
Link: https://github.com/openwrt/openwrt/pull/20533
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

diff --git a/target/linux/bmips/bcm63268/base-files/etc/board.d/01_leds b/target/linux/bmips/bcm63268/base-files/etc/board.d/01_leds
index 8af1b775045ab58c383fab279cfbc70daf9083e7..8606a49c6f4e40c60374b1fd00d5040360b84445 100644 (file)
--- a/target/linux/bmips/bcm63268/base-files/etc/board.d/01_leds
+++ b/target/linux/bmips/bcm63268/base-files/etc/board.d/01_leds
@@ -23,6 +23,10 @@ sercomm,shg2500)
        ucidef_set_led_usbport "usb1" "USB1" "blue:modem" "usb1-port1" "usb2-port1"
        ucidef_set_led_usbport "usb2" "USB2" "green:modem" "usb1-port2" "usb2-port2"
        ;;
+sagem,fast-3864-op)
+       ucidef_set_led_netdev "wan_link" "WAN_LINK" "amber:wan" "wan" "link"
+       ucidef_set_led_netdev "wan_act" "WAN_ACT" "green:wan" "wan" "rx tx"
+       ;;
 esac
 
 board_config_flush

diff --git a/target/linux/bmips/dts/bcm63168-sagem-fast-3864-op.dts b/target/linux/bmips/dts/bcm63168-sagem-fast-3864-op.dts
index 91d22a2eb5079512bbc9ed305dd24ebd87c80e19..bc08346d3c712730f549f5dd9612f239001b59b8 100644 (file)
--- a/target/linux/bmips/dts/bcm63168-sagem-fast-3864-op.dts
+++ b/target/linux/bmips/dts/bcm63168-sagem-fast-3864-op.dts
@@ -11,6 +11,10 @@
                led-failsafe = &led_power_red;
                led-running = &led_power_green;
                led-upgrade = &led_power_green;
+
+               led-dsl = &led_dsl_green;
+               led-internet = &led_internet_green;
+               led-usb = &led_usb_green;
        };
 
        keys {
@@ -38,6 +42,56 @@
                        debounce-interval = <60>;
                };
        };
+
+       leds {
+               compatible = "gpio-leds";
+
+               led_internet_green: led@8 {
+                       label = "green:internet";
+                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+               };
+
+               led_usb_green: led@9 {
+                       label = "green:dsl_bonding";
+                       gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
+               };
+
+               led_power_red: led@15 {
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_RED>;
+                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+               };
+
+               led_power_green: led@20 {
+                       function = LED_FUNCTION_POWER;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
+               };
+
+               led@36 {
+                       function = LED_FUNCTION_WLAN;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 36 GPIO_ACTIVE_LOW>;
+               };
+
+               led@37 {
+                       label = "green:wlan_pull_up";
+                       default-state = "on";
+                       gpios = <&gpio 37 GPIO_ACTIVE_HIGH>;
+               };
+
+               led@38 {
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_AMBER>;
+                       gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
+               };
+
+               led@39 {
+                       function = LED_FUNCTION_WAN;
+                       color = <LED_COLOR_ID_GREEN>;
+                       gpios = <&gpio 39 GPIO_ACTIVE_LOW>;
+               };
+       };
 };
 
 &ehci {
@@ -59,7 +113,7 @@
        brcm,serial-mux;
 
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_leds &pinctrl_serial_led>;
+       pinctrl-0 = <&pinctrl_serial_led>;
 
        led@0 {
                reg = <0>;
@@ -81,7 +135,7 @@
                label = "red:internet";
        };
 
-       led@3 {
+       led_dsl_green: led@3 {
                reg = <3>;
                active-low;
                label = "green:dsl";
@@ -98,32 +152,6 @@
                active-low;
                label = "red:fxs";
        };
-
-       led@8 {
-               reg = <8>;
-               active-low;
-               label = "green:internet";
-       };
-
-       led@9 {
-               reg = <9>;
-               active-low;
-               label = "green:dsl_bonding";
-       };
-
-       led_power_red: led@15 {
-               reg = <15>;
-               active-low;
-               function = LED_FUNCTION_POWER;
-               color = <LED_COLOR_ID_RED>;
-       };
-
-       led_power_green: led@20 {
-               reg = <20>;
-               active-low;
-               function = LED_FUNCTION_POWER;
-               color = <LED_COLOR_ID_GREEN>;
-       };
 };
 
 &mdio_ext {
@@ -241,14 +269,6 @@
        status = "okay";
 };
 
-&pinctrl {
-       pinctrl_leds: leds {
-               function = "led";
-               pins = "gpio8", "gpio9", "gpio15",
-                      "gpio20";
-       };
-};
-
 &switch0 {
        dsa,member = <0 0>;
 

diff --git a/target/linux/bmips/image/bcm63268.mk b/target/linux/bmips/image/bcm63268.mk
index 3f98acc56ff05689652130bfcdf10b8ec51cb503..49fc8626cd0e620e8c088b90f3184813b9fc6bb0 100644 (file)
--- a/target/linux/bmips/image/bcm63268.mk
+++ b/target/linux/bmips/image/bcm63268.mk
@@ -71,6 +71,7 @@ define Device/sagem_fast-3864-op
   SUBPAGESIZE := 512
   VID_HDR_OFFSET := 2048
   DEVICE_PACKAGES += $(USB2_PACKAGES) \
+    kmod-leds-gpio \
     kmod-leds-bcm6328
   CFE_WFI_FLASH_TYPE := 3
   CFE_WFI_VERSION := 0x5732