board: stm32mp1: update management of boot-led

Force boot-led ON and no more rely on default-state.
This patch avoid device-tree modification for U-Boot.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>

diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
index 5844d41c536f51e55b2b5dacd64f3e9b6da481f8..c52abeb1e7fcdc930de7c0fed70b575ca6648ec4 100644 (file)
--- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
@@ -27,10 +27,6 @@
                        default-state = "off";
                        status = "okay";
                };
-
-               blue {
-                       default-state = "on";
-               };
        };
 };
 

diff --git a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
index ed2f024be9810d5cdc78c073a231f1ee7d16099e..84af7fa47b78a54744a69850279bf11232fa8939 100644 (file)
--- a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
@@ -28,10 +28,6 @@
                        default-state = "off";
                        status = "okay";
                };
-
-               blue {
-                       default-state = "on";
-               };
        };
 };
 

diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c
index d83081d9e2207d8218a894478afc6f6ee98225a7..20823f511a068bb08a508d97dc00f51d10727392 100644 (file)
--- a/board/st/stm32mp1/stm32mp1.c
+++ b/board/st/stm32mp1/stm32mp1.c
@@ -255,7 +255,6 @@ int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
 
 #endif /* CONFIG_USB_GADGET */
 
-#ifdef CONFIG_LED
 static int get_led(struct udevice **dev, char *led_string)
 {
        char *led_name;
@@ -281,6 +280,9 @@ static int setup_led(enum led_state_t cmd)
        struct udevice *dev;
        int ret;
 
+       if (!CONFIG_IS_ENABLED(LED))
+               return 0;
+
        ret = get_led(&dev, "u-boot,boot-led");
        if (ret)
                return ret;
@@ -288,32 +290,29 @@ static int setup_led(enum led_state_t cmd)
        ret = led_set_state(dev, cmd);
        return ret;
 }
-#endif
 
 static void __maybe_unused led_error_blink(u32 nb_blink)
 {
-#ifdef CONFIG_LED
        int ret;
        struct udevice *led;
        u32 i;
-#endif
 
        if (!nb_blink)
                return;
 
-#ifdef CONFIG_LED
-       ret = get_led(&led, "u-boot,error-led");
-       if (!ret) {
-               /* make u-boot,error-led blinking */
-               /* if U32_MAX and 125ms interval, for 17.02 years */
-               for (i = 0; i < 2 * nb_blink; i++) {
-                       led_set_state(led, LEDST_TOGGLE);
-                       mdelay(125);
-                       WATCHDOG_RESET();
+       if (CONFIG_IS_ENABLED(LED)) {
+               ret = get_led(&led, "u-boot,error-led");
+               if (!ret) {
+                       /* make u-boot,error-led blinking */
+                       /* if U32_MAX and 125ms interval, for 17.02 years */
+                       for (i = 0; i < 2 * nb_blink; i++) {
+                               led_set_state(led, LEDST_TOGGLE);
+                               mdelay(125);
+                               WATCHDOG_RESET();
+                       }
+                       led_set_state(led, LEDST_ON);
                }
-               led_set_state(led, LEDST_ON);
        }
-#endif
 
        /* infinite: the boot process must be stopped */
        if (nb_blink == U32_MAX)
@@ -646,6 +645,8 @@ int board_init(void)
        if (CONFIG_IS_ENABLED(LED))
                led_default_state();
 
+       setup_led(LEDST_ON);
+
        return 0;
 }
 
@@ -700,9 +701,7 @@ int board_late_init(void)
 
 void board_quiesce_devices(void)
 {
-#ifdef CONFIG_LED
        setup_led(LEDST_OFF);
-#endif
 }
 
 /* eth init function : weak called in eqos driver */