lkml.org 
[lkml]   [2017]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 146/172] regulator: tps65086: Fix DT node referencing in of_parse_cb
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Andrew F. Davis <afd@ti.com>

    commit 6308f1787fb85bc98b7241a08a9f7f33b47f8b61 upstream.

    When we check for additional DT properties in the current node we
    use the device_node passed in with the configuration data, this
    will not point to the correct DT node, use the one passed in
    for this purpose.

    Fixes: d2a2e729a666 ("regulator: tps65086: Add regulator driver for the TPS65086 PMIC")
    Reported-by: Steven Kipisz <s-kipisz2@ti.com>
    Signed-off-by: Andrew F. Davis <afd@ti.com>
    Tested-by: Steven Kipisz <s-kipisz2@ti.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/regulator/tps65086-regulator.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/regulator/tps65086-regulator.c
    +++ b/drivers/regulator/tps65086-regulator.c
    @@ -161,14 +161,14 @@ static struct tps65086_regulator regulat
    TPS65086_SWITCH("VTT", "vtt", VTT, TPS65086_SWVTT_EN, BIT(4)),
    };

    -static int tps65086_of_parse_cb(struct device_node *dev,
    +static int tps65086_of_parse_cb(struct device_node *node,
    const struct regulator_desc *desc,
    struct regulator_config *config)
    {
    int ret;

    /* Check for 25mV step mode */
    - if (of_property_read_bool(config->of_node, "ti,regulator-step-size-25mv")) {
    + if (of_property_read_bool(node, "ti,regulator-step-size-25mv")) {
    switch (desc->id) {
    case BUCK1:
    case BUCK2:
    @@ -192,7 +192,7 @@ static int tps65086_of_parse_cb(struct d
    }

    /* Check for decay mode */
    - if (desc->id <= BUCK6 && of_property_read_bool(config->of_node, "ti,regulator-decay")) {
    + if (desc->id <= BUCK6 && of_property_read_bool(node, "ti,regulator-decay")) {
    ret = regmap_write_bits(config->regmap,
    regulators[desc->id].decay_reg,
    regulators[desc->id].decay_mask,

    \
     
     \ /
      Last update: 2017-07-03 16:17    [W:4.030 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site