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.

parents dd533734 c18a7ac3

drivers/memory/omap-gpmc.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}