lkml.org 
[lkml]   [2022]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 021/141] iio: adc: mcp3911: correct "microchip,device-addr" property
    Date
    From: Marcus Folkesson <marcus.folkesson@gmail.com>

    [ Upstream commit cfbd76d5c9c449739bb74288d982bccf9ff822f4 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iio/adc/mcp3911.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c
    index 608842632925..7eecbfd491a4 100644
    --- a/drivers/iio/adc/mcp3911.c
    +++ b/drivers/iio/adc/mcp3911.c
    @@ -217,7 +217,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",
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-09-26 12:56    [W:3.787 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site