linux-kernel - [PATCH RFT] regulator: s2mps11: Fix ramp_delay settings for s2mps11_buck

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 17 Jul 2012 14:47:21 +0800
From:	Axel Lin <axel.lin@...il.com>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>
Cc:	Sangbeom Kim <sbkim73@...sung.com>, Liam Girdwood <lrg@...com>,
	linux-kernel@...r.kernel.org
Subject: [PATCH RFT] regulator: s2mps11: Fix ramp_delay settings for
 s2mps11_buck_ops

The ramp_delay settings were missing while converting to
regulator_set_voltage_time_sel(). Fix it.

There is no ramp_delay setting for s2mps11_ldo_ops, thus remove
setting set_voltage_sel callback for s2mps11_ldo_ops.

Signed-off-by: Axel Lin <axel.lin@...il.com>
---
 drivers/regulator/s2mps11.c |   27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 4669dc9..b0f7ac1 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -62,7 +62,6 @@ static struct regulator_ops s2mps11_ldo_ops = {
 	.disable		= regulator_disable_regmap,
 	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
 	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
-	.set_voltage_time_sel	= regulator_set_voltage_time_sel,
 };
 
 static struct regulator_ops s2mps11_buck_ops = {
@@ -291,6 +290,32 @@ static __devinit int s2mps11_pmic_probe(struct platform_device *pdev)
 	sec_reg_write(iodev, S2MPS11_REG_RAMP_BUCK, ramp_reg);
 
 	for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
+		struct regulator_desc *desc = &regulators[i];
+
+		switch (i) {
+		case S2MPS11_BUCK1:
+		case S2MPS11_BUCK6:
+			desc->ramp_delay = pdata->buck16_ramp_delay * 1000;
+			break;
+		case S2MPS11_BUCK2:
+			desc->ramp_delay = pdata->buck2_ramp_delay * 1000;
+			break;
+		case S2MPS11_BUCK3:
+		case S2MPS11_BUCK4:
+			desc->ramp_delay = pdata->buck34_ramp_delay * 1000;
+			break;
+		case S2MPS11_BUCK5:
+			desc->ramp_delay = pdata->buck5_ramp_delay * 1000;
+			break;
+		case S2MPS11_BUCK7:
+		case S2MPS11_BUCK8:
+		case S2MPS11_BUCK10:
+			desc->ramp_delay = pdata->buck7810_ramp_delay * 1000;
+			break;
+		case S2MPS11_BUCK9:
+			desc->ramp_delay = pdata->buck9_ramp_delay * 1000;
+			break;
+		}
 
 		config.dev = &pdev->dev;
 		config.regmap = iodev->regmap;
-- 
1.7.9.5



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/