lkml.org 
[lkml]   [2014]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16 045/357] i2c: mv64xxx: continue probe when clock-frequency is missing
    Date
    3.16-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chen-Yu Tsai <wens@csie.org>

    commit 0ce4bc1dbdd911ae1763e2d4ff36bd1b214a59f7 upstream.

    The "clock-frequency" DT property is listed as optional, However,
    the current code stores the return value of of_property_read_u32 in
    the return code of mv64xxx_of_config, but then forgets to clear it
    after setting the default value of "clock-frequency". It is then
    passed out to the main probe function, resulting in a probe failure
    when "clock-frequency" is missing.

    This patch checks and then throws away the return value of
    of_property_read_u32, instead of storing it and having to clear it
    afterwards.

    This issue was discovered after the property was removed from all
    sunxi DTs.

    Fixes: 4c730a06c19bb ("i2c: mv64xxx: Set bus frequency to 100kHz if clock-frequency is not provided")
    Signed-off-by: Chen-Yu Tsai <wens@csie.org>
    Acked-by: Andrew Lunn <andrew@lunn.ch>
    Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
    Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/i2c/busses/i2c-mv64xxx.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    --- a/drivers/i2c/busses/i2c-mv64xxx.c
    +++ b/drivers/i2c/busses/i2c-mv64xxx.c
    @@ -746,8 +746,7 @@ mv64xxx_of_config(struct mv64xxx_i2c_dat
    }
    tclk = clk_get_rate(drv_data->clk);

    - rc = of_property_read_u32(np, "clock-frequency", &bus_freq);
    - if (rc)
    + if (of_property_read_u32(np, "clock-frequency", &bus_freq))
    bus_freq = 100000; /* 100kHz by default */

    if (!mv64xxx_find_baud_factors(bus_freq, tclk,



    \
     
     \ /
      Last update: 2014-10-04 03:21    [W:4.103 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site