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

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;
                 }