diff options
| author | Tom Rini <[email protected]> | 2023-03-01 16:07:24 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-03-01 16:07:24 -0500 |
| commit | 33fb2d130e28982b488c2a54978031835ed2aa71 (patch) | |
| tree | bcbe5f62935925e7f2df5bfc2380e8d740646f44 /drivers | |
| parent | b0eda49bc9b00503366f2ec431be0178caf9e9b5 (diff) | |
| parent | abe2a16aa52ea21acb435e9f1d9c85f5ac4e7794 (diff) | |
Merge tag 'dm-pull-29feb23' of https://source.denx.de/u-boot/custodians/u-boot-dm
minor sandbox fixes
a37xx fix
Add camel-case tool, since the conversion will take a while
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 14 | ||||
| -rw-r--r-- | drivers/timer/sandbox_timer.c | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c index 25fbe39abd1..1be6252227d 100644 --- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c @@ -745,6 +745,19 @@ static int armada_37xx_pinctrl_probe(struct udevice *dev) return 0; } +static int armada_37xx_pinctrl_bind(struct udevice *dev) +{ + /* + * Make sure that the pinctrl driver gets probed after binding + * as on A37XX the pinctrl driver is the one that is also + * registering the GPIO one during probe, so if its not probed + * GPIO-s are not registered as well. + */ + dev_or_flags(dev, DM_FLAG_PROBE_AFTER_BIND); + + return 0; +} + static const struct udevice_id armada_37xx_pinctrl_of_match[] = { { .compatible = "marvell,armada3710-sb-pinctrl", @@ -762,6 +775,7 @@ U_BOOT_DRIVER(armada_37xx_pinctrl) = { .id = UCLASS_PINCTRL, .of_match = of_match_ptr(armada_37xx_pinctrl_of_match), .probe = armada_37xx_pinctrl_probe, + .bind = armada_37xx_pinctrl_bind, .priv_auto = sizeof(struct armada_37xx_pinctrl), .ops = &armada_37xx_pinctrl_ops, }; diff --git a/drivers/timer/sandbox_timer.c b/drivers/timer/sandbox_timer.c index c846bfb9f12..1da7e0c3a76 100644 --- a/drivers/timer/sandbox_timer.c +++ b/drivers/timer/sandbox_timer.c @@ -66,6 +66,8 @@ U_BOOT_DRIVER(sandbox_timer) = { }; /* This is here in case we don't have a device tree */ +#if !CONFIG_IS_ENABLED(OF_PLATDATA) U_BOOT_DRVINFO(sandbox_timer_non_fdt) = { .name = "sandbox_timer", }; +#endif |