gpio: Enable hogging support in SPL

Use the CONFIG macros to conditionally build the GPIO hogging support in
either the SPL or U-Boot, or both, depending on the configuration. Also
call the GPIO hog probe function in the common SPL board initialization
as an equivalent to adding it to the U-Boot init sequence functions.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index b452d4feeb2fa3a48aca55313dbe17036e7e5668..c9750ee163767b34593103f3f2d1251f569bcb8d 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -20,6 +20,7 @@
 #include <serial.h>
 #include <spl.h>
 #include <asm/global_data.h>
+#include <asm-generic/gpio.h>
 #include <asm/u-boot.h>
 #include <nand.h>
 #include <fat.h>
@@ -743,6 +744,9 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
                }
        }
 
+       if (CONFIG_IS_ENABLED(GPIO_HOG))
+               gpio_hog_probe_all();
+
 #if CONFIG_IS_ENABLED(BOARD_INIT)
        spl_board_init();
 #endif

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index a55e36869348ceed5f2825765da427fa67dab2f4..89068c7800d126ecf87a01e5f2352c670f380140 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -57,6 +57,15 @@ config GPIO_HOG
          is a mechanism providing automatic GPIO request and config-
          uration as part of the gpio-controller's driver probe function.
 
+config SPL_GPIO_HOG
+       bool "Enable GPIO hog support in SPL"
+       depends on SPL_GPIO_SUPPORT
+       help
+         Enable gpio hog support in SPL
+         The GPIO chip may contain GPIO hog definitions. GPIO hogging
+         is a mechanism providing automatic GPIO request and config-
+         uration as part of the gpio-controller's driver probe function.
+
 config DM_GPIO_LOOKUP_LABEL
        bool "Enable searching for gpio labelnames"
        depends on DM_GPIO

diff --git a/drivers/gpio/gpio-uclass.c b/drivers/gpio/gpio-uclass.c
index be00a1f7d871f7c13c6f3a5405c1e840deb61edb..0ed32b721709a64b3693a03916ff167feb296142 100644 (file)
--- a/drivers/gpio/gpio-uclass.c
+++ b/drivers/gpio/gpio-uclass.c
@@ -1458,9 +1458,6 @@ void devm_gpiod_put(struct udevice *dev, struct gpio_desc *desc)
 
 static int gpio_post_bind(struct udevice *dev)
 {
-       struct udevice *child;
-       ofnode node;
-
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
        struct dm_gpio_ops *ops = (struct dm_gpio_ops *)device_get_ops(dev);
        static int reloc_done;
@@ -1491,7 +1488,10 @@ static int gpio_post_bind(struct udevice *dev)
        }
 #endif
 
-       if (CONFIG_IS_ENABLED(OF_REAL) && IS_ENABLED(CONFIG_GPIO_HOG)) {
+       if (CONFIG_IS_ENABLED(GPIO_HOG)) {
+               struct udevice *child;
+               ofnode node;
+
                dev_for_each_subnode(node, dev) {
                        if (ofnode_read_bool(node, "gpio-hog")) {
                                const char *name = ofnode_get_name(node);