The patch

   regulator: stpmic1: Remove support for regulator pull down

has been applied to the regulator tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 1614f086d5f59358d9a7842d22d950384945e612 Mon Sep 17 00:00:00 2001
From: Pascal PAILLET-LME <[email protected]>
Date: Tue, 19 Feb 2019 10:04:33 +0000
Subject: [PATCH] regulator: stpmic1: Remove support for regulator pull down

Regulator high pull down are enabled by default so remove support in the
driver.

Signed-off-by: pascal paillet <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---
 drivers/regulator/stpmic1_regulator.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/regulator/stpmic1_regulator.c 
b/drivers/regulator/stpmic1_regulator.c
index f5c0e5887189..6970e4587a57 100644
--- a/drivers/regulator/stpmic1_regulator.c
+++ b/drivers/regulator/stpmic1_regulator.c
@@ -133,7 +133,6 @@ static const struct regulator_ops stpmic1_ldo_ops = {
        .disable = regulator_disable_regmap,
        .get_voltage_sel = regulator_get_voltage_sel_regmap,
        .set_voltage_sel = regulator_set_voltage_sel_regmap,
-       .set_pull_down = regulator_set_pull_down_regmap,
        .set_over_current_protection = stpmic1_set_icc,
 };
 
@@ -145,7 +144,6 @@ static const struct regulator_ops stpmic1_ldo3_ops = {
        .disable = regulator_disable_regmap,
        .get_voltage_sel = regulator_get_voltage_sel_regmap,
        .set_voltage_sel = regulator_set_voltage_sel_regmap,
-       .set_pull_down = regulator_set_pull_down_regmap,
        .get_bypass = regulator_get_bypass_regmap,
        .set_bypass = regulator_set_bypass_regmap,
        .set_over_current_protection = stpmic1_set_icc,
@@ -155,7 +153,6 @@ static const struct regulator_ops 
stpmic1_ldo4_fixed_regul_ops = {
        .is_enabled = regulator_is_enabled_regmap,
        .enable = regulator_enable_regmap,
        .disable = regulator_disable_regmap,
-       .set_pull_down = regulator_set_pull_down_regmap,
        .set_over_current_protection = stpmic1_set_icc,
 };
 
@@ -177,7 +174,6 @@ static const struct regulator_ops stpmic1_vref_ddr_ops = {
        .is_enabled = regulator_is_enabled_regmap,
        .enable = regulator_enable_regmap,
        .disable = regulator_disable_regmap,
-       .set_pull_down = regulator_set_pull_down_regmap,
 };
 
 static const struct regulator_ops stpmic1_switch_regul_ops = {
@@ -203,8 +199,6 @@ static const struct regulator_ops stpmic1_switch_regul_ops 
= {
        .enable_val = 1, \
        .disable_val = 0, \
        .enable_time = PMIC_ENABLE_TIME_US, \
-       .pull_down_reg = ids##_PULL_DOWN_REG, \
-       .pull_down_mask = ids##_PULL_DOWN_MASK, \
        .supply_name = #base, \
 }
 
@@ -228,8 +222,6 @@ static const struct regulator_ops stpmic1_switch_regul_ops 
= {
        .bypass_mask = LDO_BYPASS_MASK, \
        .bypass_val_on = LDO_BYPASS_MASK, \
        .bypass_val_off = 0, \
-       .pull_down_reg = ids##_PULL_DOWN_REG, \
-       .pull_down_mask = ids##_PULL_DOWN_MASK, \
        .supply_name = #base, \
 }
 
@@ -247,8 +239,6 @@ static const struct regulator_ops stpmic1_switch_regul_ops 
= {
        .enable_val = 1, \
        .disable_val = 0, \
        .enable_time = PMIC_ENABLE_TIME_US, \
-       .pull_down_reg = ids##_PULL_DOWN_REG, \
-       .pull_down_mask = ids##_PULL_DOWN_MASK, \
        .supply_name = #base, \
 }
 
@@ -288,8 +278,6 @@ static const struct regulator_ops stpmic1_switch_regul_ops 
= {
        .enable_val = 1, \
        .disable_val = 0, \
        .enable_time = PMIC_ENABLE_TIME_US, \
-       .pull_down_reg = ids##_PULL_DOWN_REG, \
-       .pull_down_mask = ids##_PULL_DOWN_MASK, \
        .supply_name = #base, \
 }
 
-- 
2.20.1

Reply via email to