diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/bcm2835_gpio.c | 1 | ||||
| -rw-r--r-- | drivers/serial/serial_bcm283x_mu.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpio/bcm2835_gpio.c b/drivers/gpio/bcm2835_gpio.c index 8b88d7956e..8dd7a28e26 100644 --- a/drivers/gpio/bcm2835_gpio.c +++ b/drivers/gpio/bcm2835_gpio.c @@ -123,5 +123,6 @@ U_BOOT_DRIVER(gpio_bcm2835) = { .id = UCLASS_GPIO, .ops = &gpio_bcm2835_ops, .probe = bcm2835_gpio_probe, + .flags = DM_FLAG_PRE_RELOC, .priv_auto_alloc_size = sizeof(struct bcm2835_gpios), }; diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index 7357bbfb26..f4e062f0c4 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -73,6 +73,9 @@ static int bcm283x_mu_serial_probe(struct udevice *dev) struct bcm283x_mu_serial_platdata *plat = dev_get_platdata(dev); struct bcm283x_mu_priv *priv = dev_get_priv(dev); + if (plat->disabled) + return -ENODEV; + priv->regs = (struct bcm283x_mu_regs *)plat->base; return 0; |