lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 070/178] regualtor: pfuze100: correct sw1a/sw2 on pfuze3000
    Date
    From: Robin Gong <yibin.gong@nxp.com>

    [ Upstream commit 6f1cf5257acc6e6242ddf2f52bc7912aed77b79f ]

    PFUZE100_SWB_REG is not proper for sw1a/sw2, because enable_mask/enable_reg
    is not correct. On PFUZE3000, sw1a/sw2 should be the same as sw1a/sw2 on
    pfuze100 except that voltages are not linear, so add new PFUZE3000_SW_REG
    and pfuze3000_sw_regulator_ops which like the non-linear PFUZE100_SW_REG
    and pfuze100_sw_regulator_ops.

    Fixes: 1dced996ee70 ("regulator: pfuze100: update voltage setting for pfuze3000 sw1a")
    Reported-by: Christophe Meynard <Christophe.Meynard@ign.fr>
    Signed-off-by: Robin Gong <yibin.gong@nxp.com>
    Link: https://lore.kernel.org/r/1592171648-8752-1-git-send-email-yibin.gong@nxp.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/regulator/pfuze100-regulator.c | 60 +++++++++++++++++---------
    1 file changed, 39 insertions(+), 21 deletions(-)

    diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c
    index 689537927f6f7..4c8e8b4722872 100644
    --- a/drivers/regulator/pfuze100-regulator.c
    +++ b/drivers/regulator/pfuze100-regulator.c
    @@ -209,6 +209,19 @@ static const struct regulator_ops pfuze100_swb_regulator_ops = {

    };

    +static const struct regulator_ops pfuze3000_sw_regulator_ops = {
    + .enable = regulator_enable_regmap,
    + .disable = regulator_disable_regmap,
    + .is_enabled = regulator_is_enabled_regmap,
    + .list_voltage = regulator_list_voltage_table,
    + .map_voltage = regulator_map_voltage_ascend,
    + .set_voltage_sel = regulator_set_voltage_sel_regmap,
    + .get_voltage_sel = regulator_get_voltage_sel_regmap,
    + .set_voltage_time_sel = regulator_set_voltage_time_sel,
    + .set_ramp_delay = pfuze100_set_ramp_delay,
    +
    +};
    +
    #define PFUZE100_FIXED_REG(_chip, _name, base, voltage) \
    [_chip ## _ ## _name] = { \
    .desc = { \
    @@ -318,23 +331,28 @@ static const struct regulator_ops pfuze100_swb_regulator_ops = {
    .stby_mask = 0x20, \
    }

    -
    -#define PFUZE3000_SW2_REG(_chip, _name, base, min, max, step) { \
    - .desc = { \
    - .name = #_name,\
    - .n_voltages = ((max) - (min)) / (step) + 1, \
    - .ops = &pfuze100_sw_regulator_ops, \
    - .type = REGULATOR_VOLTAGE, \
    - .id = _chip ## _ ## _name, \
    - .owner = THIS_MODULE, \
    - .min_uV = (min), \
    - .uV_step = (step), \
    - .vsel_reg = (base) + PFUZE100_VOL_OFFSET, \
    - .vsel_mask = 0x7, \
    - }, \
    - .stby_reg = (base) + PFUZE100_STANDBY_OFFSET, \
    - .stby_mask = 0x7, \
    -}
    +/* No linar case for the some switches of PFUZE3000 */
    +#define PFUZE3000_SW_REG(_chip, _name, base, mask, voltages) \
    + [_chip ## _ ## _name] = { \
    + .desc = { \
    + .name = #_name, \
    + .n_voltages = ARRAY_SIZE(voltages), \
    + .ops = &pfuze3000_sw_regulator_ops, \
    + .type = REGULATOR_VOLTAGE, \
    + .id = _chip ## _ ## _name, \
    + .owner = THIS_MODULE, \
    + .volt_table = voltages, \
    + .vsel_reg = (base) + PFUZE100_VOL_OFFSET, \
    + .vsel_mask = (mask), \
    + .enable_reg = (base) + PFUZE100_MODE_OFFSET, \
    + .enable_mask = 0xf, \
    + .enable_val = 0x8, \
    + .enable_time = 500, \
    + }, \
    + .stby_reg = (base) + PFUZE100_STANDBY_OFFSET, \
    + .stby_mask = (mask), \
    + .sw_reg = true, \
    + }

    #define PFUZE3000_SW3_REG(_chip, _name, base, min, max, step) { \
    .desc = { \
    @@ -391,9 +409,9 @@ static struct pfuze_regulator pfuze200_regulators[] = {
    };

    static struct pfuze_regulator pfuze3000_regulators[] = {
    - PFUZE100_SWB_REG(PFUZE3000, SW1A, PFUZE100_SW1ABVOL, 0x1f, pfuze3000_sw1a),
    + PFUZE3000_SW_REG(PFUZE3000, SW1A, PFUZE100_SW1ABVOL, 0x1f, pfuze3000_sw1a),
    PFUZE100_SW_REG(PFUZE3000, SW1B, PFUZE100_SW1CVOL, 700000, 1475000, 25000),
    - PFUZE100_SWB_REG(PFUZE3000, SW2, PFUZE100_SW2VOL, 0x7, pfuze3000_sw2lo),
    + PFUZE3000_SW_REG(PFUZE3000, SW2, PFUZE100_SW2VOL, 0x7, pfuze3000_sw2lo),
    PFUZE3000_SW3_REG(PFUZE3000, SW3, PFUZE100_SW3AVOL, 900000, 1650000, 50000),
    PFUZE100_SWB_REG(PFUZE3000, SWBST, PFUZE100_SWBSTCON1, 0x3, pfuze100_swbst),
    PFUZE100_SWB_REG(PFUZE3000, VSNVS, PFUZE100_VSNVSVOL, 0x7, pfuze100_vsnvs),
    @@ -407,8 +425,8 @@ static struct pfuze_regulator pfuze3000_regulators[] = {
    };

    static struct pfuze_regulator pfuze3001_regulators[] = {
    - PFUZE100_SWB_REG(PFUZE3001, SW1, PFUZE100_SW1ABVOL, 0x1f, pfuze3000_sw1a),
    - PFUZE100_SWB_REG(PFUZE3001, SW2, PFUZE100_SW2VOL, 0x7, pfuze3000_sw2lo),
    + PFUZE3000_SW_REG(PFUZE3001, SW1, PFUZE100_SW1ABVOL, 0x1f, pfuze3000_sw1a),
    + PFUZE3000_SW_REG(PFUZE3001, SW2, PFUZE100_SW2VOL, 0x7, pfuze3000_sw2lo),
    PFUZE3000_SW3_REG(PFUZE3001, SW3, PFUZE100_SW3AVOL, 900000, 1650000, 50000),
    PFUZE100_SWB_REG(PFUZE3001, VSNVS, PFUZE100_VSNVSVOL, 0x7, pfuze100_vsnvs),
    PFUZE100_VGEN_REG(PFUZE3001, VLDO1, PFUZE100_VGEN1VOL, 1800000, 3300000, 100000),
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 21:54    [W:4.326 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site