OSDN Git Service

regulator: Revert "regulator: pfuze100: add enable/disable for switch"
authorFabio Estevam <fabio.estevam@nxp.com>
Mon, 2 Jul 2018 01:18:27 +0000 (22:18 -0300)
committerMark Brown <broonie@kernel.org>
Mon, 2 Jul 2018 09:51:38 +0000 (10:51 +0100)
This reverts commit 5fe156f1cab4f340ddb6283c993912be77594016.

Commit 5fe156f1cab4 ("regulator: pfuze100: add enable/disable for switch")
causes boot regression on some platforms such as imx6sl-evk and
imx6sll-evk.

After this commit the SW4 regulator will be turned
off and since it supplies the DDR voltage on these boards, a
kernel hang is observed.

Revert it to avoid breaking old dtb's.

Fixes: 5fe156f1cab4 ("regulator: pfuze100: add enable/disable for switch")
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/pfuze100-regulator.c

index 32f9af7..cde6eda 100644 (file)
@@ -163,9 +163,6 @@ static const struct regulator_ops pfuze100_fixed_regulator_ops = {
 };
 
 static const struct regulator_ops pfuze100_sw_regulator_ops = {
-       .enable = regulator_enable_regmap,
-       .disable = regulator_disable_regmap,
-       .is_enabled = regulator_is_enabled_regmap,
        .list_voltage = regulator_list_voltage_linear,
        .set_voltage_sel = regulator_set_voltage_sel_regmap,
        .get_voltage_sel = regulator_get_voltage_sel_regmap,
@@ -212,11 +209,6 @@ static const struct regulator_ops pfuze100_swb_regulator_ops = {
                        .uV_step = (step),      \
                        .vsel_reg = (base) + PFUZE100_VOL_OFFSET,       \
                        .vsel_mask = 0x3f,      \
-                       .enable_reg = (base) + PFUZE100_MODE_OFFSET,    \
-                       .enable_val = 0xc,      \
-                       .disable_val = 0x0,     \
-                       .enable_mask = 0xf,     \
-                       .enable_time = 500,     \
                },      \
                .stby_reg = (base) + PFUZE100_STANDBY_OFFSET,   \
                .stby_mask = 0x3f,      \