iio: adc: mcp3911: correct "microchip,device-addr" property
authorMarcus Folkesson <marcus.folkesson@gmail.com>
Fri, 22 Jul 2022 13:07:19 +0000 (15:07 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 21 Aug 2022 17:24:16 +0000 (18:24 +0100)
Go for the right property name that is documented in the bindings.

Fixes: 3a89b289df5d ("iio: adc: add support for mcp3911")
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20220722130726.7627-3-marcus.folkesson@gmail.com
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/mcp3911.c

index f581cef..f887507 100644 (file)
@@ -210,7 +210,14 @@ static int mcp3911_config(struct mcp3911 *adc)
        u32 configreg;
        int ret;
 
-       device_property_read_u32(dev, "device-addr", &adc->dev_addr);
+       ret = device_property_read_u32(dev, "microchip,device-addr", &adc->dev_addr);
+
+       /*
+        * Fallback to "device-addr" due to historical mismatch between
+        * dt-bindings and implementation
+        */
+       if (ret)
+               device_property_read_u32(dev, "device-addr", &adc->dev_addr);
        if (adc->dev_addr > 3) {
                dev_err(&adc->spi->dev,
                        "invalid device address (%i). Must be in range 0-3.\n",