diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-27 11:09:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-27 11:09:23 -0400 |
| commit | 1d1f98c8eed7bb4792300e655c2cb70136928f74 (patch) | |
| tree | d08df140d52bd1298fa0e81ce908e2e09a880e5d /drivers/gpio/omap_gpio.c | |
| parent | e908d20fcbd847e17345591fc171b59d9a156516 (diff) | |
| parent | 933bf2644591281ed96f9d5771cbb35fe95bcb00 (diff) | |
Merge tag 'dm-pull-next-27sep21' of https://source.denx.de/u-boot/custodians/u-boot-dm into next
Various of-platdata improvements, including CONFIG_OF_REAL
Diffstat (limited to 'drivers/gpio/omap_gpio.c')
| -rw-r--r-- | drivers/gpio/omap_gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/omap_gpio.c b/drivers/gpio/omap_gpio.c index 316a28efa6b..50c4f75ddf5 100644 --- a/drivers/gpio/omap_gpio.c +++ b/drivers/gpio/omap_gpio.c @@ -336,7 +336,7 @@ static int omap_gpio_bind(struct udevice *dev) } #endif -#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) +#if CONFIG_IS_ENABLED(OF_REAL) static const struct udevice_id omap_gpio_ids[] = { { .compatible = "ti,omap3-gpio" }, { .compatible = "ti,omap4-gpio" }, @@ -362,7 +362,7 @@ U_BOOT_DRIVER(gpio_omap) = { .name = "gpio_omap", .id = UCLASS_GPIO, #if CONFIG_IS_ENABLED(OF_CONTROL) -#if !CONFIG_IS_ENABLED(OF_PLATDATA) +#if CONFIG_IS_ENABLED(OF_REAL) .of_match = omap_gpio_ids, .of_to_plat = of_match_ptr(omap_gpio_of_to_plat), .plat_auto = sizeof(struct omap_gpio_plat), |