diff options
| author | Tom Rini <[email protected]> | 2018-11-29 16:36:53 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-11-29 16:36:53 -0500 |
| commit | 6d4a3ff2649faa2cf2739e332557f256cc34831e (patch) | |
| tree | 0d732648670188246051bd404544c3612f920d62 /drivers | |
| parent | 93e72ac472b537bb4b0c6a97a7e6aab2b37860c6 (diff) | |
| parent | 30bade20a67a8205e10d006d8e1ac66552c1b137 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/dwapb_gpio.c | 7 | ||||
| -rw-r--r-- | drivers/spi/cadence_qspi.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c index 68836a79021..e55fb4ac73d 100644 --- a/drivers/gpio/dwapb_gpio.c +++ b/drivers/gpio/dwapb_gpio.c @@ -180,6 +180,13 @@ static int gpio_dwapb_bind(struct udevice *dev) plat->pins = fdtdec_get_int(blob, node, "snps,nr-gpios", 0); plat->name = fdt_stringlist_get(blob, node, "bank-name", 0, NULL); + if (!plat->name) { + /* + * Fall back to node name. This means accessing pins + * via bank name won't work. + */ + plat->name = fdt_get_name(blob, node, NULL); + } ret = device_bind(dev, dev->driver, plat->name, plat, -1, &subdev); diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index 29db6fa3684..11fce9c4fe5 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -329,7 +329,7 @@ static const struct dm_spi_ops cadence_spi_ops = { }; static const struct udevice_id cadence_spi_ids[] = { - { .compatible = "cadence,qspi" }, + { .compatible = "cdns,qspi-nor" }, { } }; |