diff options
| author |   Boris Brezillon <boris.brezillon@free-electrons.com> | 2018-01-12 15:28:57 +0100 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2018-01-12 15:28:57 +0100 |
| commit | d2ad1fb1e718e0104e86ebadae915d3bf056a011 (patch) | |
| tree | cf67aee6d914413d04214af6fd447c05d6671193 | |
| parent | mtd: nand: use reworked NAND controller driver with Marvell EBU SoCs (diff) | |
| parent | memory: omap-gpmc: Make 'bank-width' property optional (diff) | |
| download | linux-dev-d2ad1fb1e718e0104e86ebadae915d3bf056a011.tar.xz linux-dev-d2ad1fb1e718e0104e86ebadae915d3bf056a011.zip | |
Merge tag 'gpmc-omap-for-v4.16-immutable' of https://github.com/rogerq/linux into nand/next
Pull changes needed for omap OneNAND changes from Roger Quadros:
OMAP-GPMC: driver updates for v4.16
* Error out only if both 'bank-width' and 'gpmc,device-width' DT properties are missing.
| -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 a385a35c7de9..0e30ee1c8677 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; } |