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/pinctrl/intel/pinctrl_apl.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/pinctrl/intel/pinctrl_apl.c')
| -rw-r--r-- | drivers/pinctrl/intel/pinctrl_apl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c index acaa55d2e7f..181a6ff2702 100644 --- a/drivers/pinctrl/intel/pinctrl_apl.c +++ b/drivers/pinctrl/intel/pinctrl_apl.c @@ -155,7 +155,7 @@ static int apl_pinctrl_of_to_plat(struct udevice *dev) return intel_pinctrl_of_to_plat(dev, comm, 2); } -#if !CONFIG_IS_ENABLED(OF_PLATDATA) +#if CONFIG_IS_ENABLED(OF_REAL) static const struct udevice_id apl_gpio_ids[] = { { .compatible = "intel,apl-pinctrl"}, { } @@ -168,7 +168,7 @@ U_BOOT_DRIVER(intel_apl_pinctrl) = { .of_match = of_match_ptr(apl_gpio_ids), .probe = intel_pinctrl_probe, .ops = &intel_pinctrl_ops, -#if !CONFIG_IS_ENABLED(OF_PLATDATA) +#if CONFIG_IS_ENABLED(OF_REAL) .bind = dm_scan_fdt_dev, #endif .of_to_plat = apl_pinctrl_of_to_plat, |