OMAP-GPMC: driver updates for v4.16
* Error out only if both 'bank-width' and 'gpmc,device-width' DT properties are missing. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJaLpG2AAoJENJaa9O+djCTNrAP/2XYpqQ2rgTkrO8SRXonNzrz zPe/zMej38O22IkPANVxM1i2tmbZWxuk1Vi4mJ3mDY3acFCjsLtmicHHLafPxYaq 75c/pEMIQDVc5Ps3CxEVsW9Ihf3XGq+auaAEKB4iqvh8Lt238Liwg9bQH1MEqi4h 3zOvprlJrv5DBlsHP+f/dRCimnl+xCvNKlYsq3LJawMQsa0t7oAlhngs3Co8tvWS DkzBUFfnF5w90lntebjGfSpiFAUZx4vqzS/Sm7VyB31FyCiKYj590urTIPqgGov9 cWV81+yAiggk7Wt1dtrhVxRKx2IlKJn/jZ5/B3lIbeo4Gi2QRr+8deXf0v3UUCfI g6bSQdvlmqygr4G9D5ExMW7q2a2OjWAREtokedlf8zwL0YMNQeHcecK9BIX1Jl70 /b9nuh9FPrISWC7Lvm4WPieog+pdOvm/Eg7YBd1gEyJ0CvAYWYiweLNLqD9bu/no KkXh0IXR3j+/2SMqYmnnxq0c6MPYXJEN5r5SdDkB9bXEqHrVWkicWBM13Kf0t4Wk LeFQ2pbzLEfty5IJFuuprbgX4kfOWgtoJXzI/Ra2GSBgql0mh9JlJQ4bgC0NqbyR 6WQQCVUJzEu1p50pkmHvD+hNtmTDnqhKzpPm8xWxchPXcMRpV7hZiMw6VWXdqRNX O8D3UF+QbkA0hu75KMu3 =F3lZ -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
f9988fbb93
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue