am335x, guardian: update swi logic

read boot mode gpio and set the swi status

Signed-off-by: Gireesh Hiremath <Gireesh.Hiremath@in.bosch.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Link: https://lore.kernel.org/r/20210611161350.2141-12-Gireesh.Hiremath@in.bosch.com

diff --git a/board/bosch/guardian/board.c b/board/bosch/guardian/board.c
index 12d047b74b581419bc9ff36e765be8d8a965ef1a..f14ceaa1f92a1bca2f3726569a42353bc4df0234 100644 (file)
--- a/board/bosch/guardian/board.c
+++ b/board/bosch/guardian/board.c
@@ -15,6 +15,7 @@
 #include <i2c.h>
 #include <led.h>
 #include <panel.h>
+#include <linux/delay.h>
 #include <asm/global_data.h>
 #include <power/tps65217.h>
 #include <spl.h>
@@ -205,8 +206,19 @@ static void set_bootmode_env(void)
                goto err;
        }
 
-       value = dm_gpio_get_value(&boot_mode_desc);
-       value ? env_set("swi_status", "0") : env_set("swi_status", "1");
+       dm_gpio_set_dir_flags(&boot_mode_desc, GPIOD_IS_IN);
+       udelay(10);
+
+       ret = dm_gpio_get_value(&boot_mode_desc);
+       if (ret == 0) {
+               env_set("swi_status", "1");
+       } else if (ret == 1) {
+               env_set("swi_status", "0");
+       } else {
+               printf("swi status gpio error\n");
+               goto err;
+       }
+
        return;
 
 err:

diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h
index 814048bf861e9580b136cf6c85c3b4d7a370e7ed..c76f9b26fb2c9316e4272431dbe853c2c09afe49 100644 (file)
--- a/include/configs/am335x_guardian.h
+++ b/include/configs/am335x_guardian.h
@@ -64,13 +64,13 @@
                "setenv rootflags \"bulk_read,chk_data_crc\"; " \
                "setenv ethact usb_ether; " \
                "if test \"${swi_status}\" -eq 1; then " \
-                 "setenv extrabootargs \"swi_attached\"; " \
                  "if dhcp; then " \
                    "sleep 1; " \
                    "if tftp \"${tftp_load_addr}\" \"bootscript.scr\"; then " \
                      "source \"${tftp_load_addr}\"; " \
                    "fi; " \
                  "fi; " \
+                 "setenv extrabootargs $extrabootargs \"swi_attached\"; " \
                "fi;" \
                "run bootcmd_ubifs0;\0" \
        "altbootcmd=" \