On 06/11/17 12:41, Ladislav Michl wrote:
> Error out only if both 'bank-width' and 'gpmc,device-width' are missing.
> As 'bank-width' is mostly used for NOR devices and all other devices must
> use 'gpmc,device-width' update the error message accordingly.
>
> Signed-off-by: Ladislav Michl <ladis@xxxxxxxxxxxxxx>
Looks good to me. I'll queue it for v4.16. Thanks.
> ---
> Changes:
> v2: update commit log
>
> drivers/memory/omap-gpmc.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
> index 6383152e9826..90a66b3f7ae1 100644
> --- a/drivers/memory/omap-gpmc.c
> +++ b/drivers/memory/omap-gpmc.c
> @@ -2157,8 +2157,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;
> }
>
--
cheers,
-roger
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
