lkml.org 
[lkml]   [2020]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 222/252] regulator: pfuze100: limit pfuze-support-disable-sw to pfuze{100,200}
    Date
    From: Sean Nyekjaer <sean@geanix.com>

    commit 365ec8b61689bd64d6a61e129e0319bf71336407 upstream.

    Limit the fsl,pfuze-support-disable-sw to the pfuze100 and pfuze200
    variants.
    When enabling fsl,pfuze-support-disable-sw and using a pfuze3000 or
    pfuze3001, the driver would choose pfuze100_sw_disable_regulator_ops
    instead of the newly introduced and correct pfuze3000_sw_regulator_ops.

    Signed-off-by: Sean Nyekjaer <sean@geanix.com>
    Fixes: 6f1cf5257acc ("regualtor: pfuze100: correct sw1a/sw2 on pfuze3000")
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/r/20201110174113.2066534-1-sean@geanix.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/regulator/pfuze100-regulator.c | 13 ++++++++-----
    1 file changed, 8 insertions(+), 5 deletions(-)

    --- a/drivers/regulator/pfuze100-regulator.c
    +++ b/drivers/regulator/pfuze100-regulator.c
    @@ -836,11 +836,14 @@ static int pfuze100_regulator_probe(stru
    * the switched regulator till yet.
    */
    if (pfuze_chip->flags & PFUZE_FLAG_DISABLE_SW) {
    - if (pfuze_chip->regulator_descs[i].sw_reg) {
    - desc->ops = &pfuze100_sw_disable_regulator_ops;
    - desc->enable_val = 0x8;
    - desc->disable_val = 0x0;
    - desc->enable_time = 500;
    + if (pfuze_chip->chip_id == PFUZE100 ||
    + pfuze_chip->chip_id == PFUZE200) {
    + if (pfuze_chip->regulator_descs[i].sw_reg) {
    + desc->ops = &pfuze100_sw_disable_regulator_ops;
    + desc->enable_val = 0x8;
    + desc->disable_val = 0x0;
    + desc->enable_time = 500;
    + }
    }
    }


    \
     
     \ /
      Last update: 2020-11-23 14:09    [W:4.038 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site