diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-12-21 16:23:36 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-12-21 16:23:36 +0100 |
| commit | f9988fbb93c8c4de9f8ec37f63ebb7bf705c7c45 (patch) | |
| tree | effc22f981900804da8405f54188c87ca125e5c9 /drivers | |
| parent | a8e9f5f6725129d19b73dbe1211b38e8688b9f0b (diff) | |
| parent | c18a7ac3398d0cef29749f9568666db8321aa4c9 (diff) | |
| download | linux-0-day-f9988fbb93c8c4de9f8ec37f63ebb7bf705c7c45.tar.gz linux-0-day-f9988fbb93c8c4de9f8ec37f63ebb7bf705c7c45.tar.xz | |
Merge tag 'gpmc-omap-for-v4.16-immutable' of https://github.com/rogerq/linux into next/drivers
Pull "OMAP-GPMC: driver updates for v4.16" from Roger Quadros:
* Error out only if both 'bank-width' and 'gpmc,device-width' DT properties are missing.
* tag 'gpmc-omap-for-v4.16-immutable' of https://github.com/rogerq/linux:
memory: omap-gpmc: Make 'bank-width' property optional
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index a385a35c7de92..0e30ee1c86777 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -2077,8 +2077,9 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, } else { ret = of_property_read_u32(child, "bank-width", &gpmc_s.device_width); - if (ret < 0) { - dev_err(&pdev->dev, "%pOF has no 'bank-width' property\n", + if (ret < 0 && !gpmc_s.device_width) { + dev_err(&pdev->dev, + "%pOF has no 'gpmc,device-width' property\n", child); goto err; } |