The standard property for describing the band width of a NAND
memory is "nand-bus-width" not "bank-width". The new bindings
support both so make Linux check both in priority order.
Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
---
drivers/mtd/nand/raw/gpio.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/raw/gpio.c b/drivers/mtd/nand/raw/gpio.c
index 5553101c709c..d5bd245b0c0d 100644
--- a/drivers/mtd/nand/raw/gpio.c
+++ b/drivers/mtd/nand/raw/gpio.c
@@ -183,7 +183,15 @@ static int gpio_nand_get_config(struct device *dev,
{
u32 val;
- if (!device_property_read_u32(dev, "bank-width", &val)) {
+ /* The preferred binding takes precedence */
+ if (!device_property_read_u32(dev, "nand-bus-width", &val)) {
+ if (val == 16) {
+ chip->options |= NAND_BUSWIDTH_16;
+ } else if (val != 8) {
+ dev_err(dev, "invalid nand-bus-width %u\n", val);
+ return -EINVAL;
+ }
+ } else if (!device_property_read_u32(dev, "bank-width", &val)) {
if (val == 2) {
chip->options |= NAND_BUSWIDTH_16;
} else if (val != 1) {
--
2.34.1
