gpio: Enable hogging support in SPL
PATCH v3 1/1 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.
---
Changes since v2:
- change #if to if() in gpio_post_bind
Changes since v1:
- remove #if guards around gpio include
- change #if to if() in spl board_init_r
common/spl/spl.c | 4 ++++ drivers/gpio/Kconfig | 10 ++++++++++ drivers/gpio/gpio-uclass.c | 8 ++++---- 3 files changed, 18 insertions(+), 4 deletions(-)
common/spl/spl.c +4 -0
@@ -20,6 +20,7 @@#include <serial.h> #include <spl.h> #include <asm/global_data.h> +#include <asm/gpio.h> #include <asm/u-boot.h> #include <nand.h> #include <fat.h>
@@ -739,6 +740,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
drivers/gpio/Kconfig +10 -0
@@ -57,6 +57,16 @@ 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 + default n + 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
drivers/gpio/gpio-uclass.c +4 -4
@@ -1432,9 +1432,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;
@@ -1465,7 +1462,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);
Signature · 1 line
2.27.0
Quoted 11 lines · Eddie James
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 <[email protected]>---
Changes since v2:
- change #if toif()ingpio_post_bind
Quoted 8 lines
Changes since v1:
- remove #if guards around gpio include
- change #if toif()in splboard_init_rcommon/spl/spl.c | 4 ++++ drivers/gpio/Kconfig | 10 ++++++++++ drivers/gpio/gpio-uclass.c | 8 ++++---- 3 files changed, 18 insertions(+), 4 deletions(-)
Quoted 7 lines · Eddie James
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 <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom