linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] regulator: tps6586x: add SMx slew rate setting
@ 2011-08-04 11:34 dahuang
  2011-08-04 12:12 ` Mark Brown
  2011-08-04 12:42 ` Mark Brown
  0 siblings, 2 replies; 13+ messages in thread
From: dahuang @ 2011-08-04 11:34 UTC (permalink / raw)
  To: lrg, broonie, mike, sameo, xxie, gking; +Cc: linux-kernel, Danny Huang

From: Danny Huang <dahuang@nvidia.com>

Add output vlotage slew rate setting for SM0/SM1

From: Xin Xie <xxie@nvidia.com>

Signed-off-by: Xin Xie <xxie@nvidia.com>
Signed-off-by: Danny Huang <dahuang@nvidia.com>
---
 drivers/regulator/tps6586x-regulator.c |   27 ++++++++++++++++++++++++++-
 include/linux/mfd/tps6586x.h           |   15 +++++++++++++++
 2 files changed, 41 insertions(+), 1 deletions(-)

diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index bb04a75..9e5b459 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -332,6 +332,31 @@ static inline int tps6586x_regulator_preinit(struct device *parent,
 				 1 << ri->enable_bit[1]);
 }
 
+static int tps6586x_regulator_set_slew_rate(struct platform_device *pdev)
+{
+	struct device *parent = pdev->dev.parent;
+	struct regulator_init_data *p = pdev->dev.platform_data;
+	struct tps6586x_settings *setting = p->driver_data;
+	uint8_t reg;
+
+	if (setting == NULL)
+		return 0;
+
+	/* only SM0 and SM1 can have the slew rate settings */
+	switch (pdev->id) {
+	case TPS6586X_ID_SM_0:
+		reg = TPS6586X_SM0SL;
+		break;
+	case TPS6586X_ID_SM_1:
+		reg = TPS6586X_SM1SL;
+		break;
+	default:
+		dev_err(&pdev->dev, "invalid regulator ID\n");
+		return -EINVAL;
+	}
+	return tps6586x_write(parent, reg, setting->slew_rate);
+}
+
 static inline struct tps6586x_regulator *find_regulator_info(int id)
 {
 	struct tps6586x_regulator *ri;
@@ -374,7 +399,7 @@ static int __devinit tps6586x_regulator_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, rdev);
 
-	return 0;
+	return tps6586x_regulator_set_slew_rate(pdev);
 }
 
 static int __devexit tps6586x_regulator_remove(struct platform_device *pdev)
diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h
index b6bab1b..9dfb2bb 100644
--- a/include/linux/mfd/tps6586x.h
+++ b/include/linux/mfd/tps6586x.h
@@ -48,6 +48,21 @@ enum {
 	TPS6586X_INT_RTC_ALM2,
 };
 
+enum {
+	TPS6586x_SLEW_RATE_INSTANTLY,
+	TPS6586x_SLEW_RATE_110UV,
+	TPS6586x_SLEW_RATE_220UV,
+	TPS6586x_SLEW_RATE_440UV,
+	TPS6586x_SLEW_RATE_880UV,
+	TPS6586x_SLEW_RATE_1760UV,
+	TPS6586x_SLEW_RATE_3520UV,
+	TPS6586x_SLEW_RATE_7040UV,
+};
+
+struct tps6586x_settings {
+	int slew_rate;
+};
+
 struct tps6586x_subdev_info {
 	int		id;
 	const char	*name;
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [PATCH] regulator: tps6586x: add SMx slew rate setting
@ 2011-08-09 10:47 dahuang
  2011-08-09 16:06 ` Mark Brown
                   ` (2 more replies)
  0 siblings, 3 replies; 13+ messages in thread
From: dahuang @ 2011-08-09 10:47 UTC (permalink / raw)
  To: broonie, lrg, mike, sameo, xxie; +Cc: linux-kernel, Danny Huang

From: Xin Xie <xxie@nvidia.com>

Add output vlotage slew rate setting for SM0/SM1

Signed-off-by: Xin Xie <xxie@nvidia.com>
Signed-off-by: Danny Huang <dahuang@nvidia.com>
---
 drivers/regulator/tps6586x-regulator.c |   32 +++++++++++++++++++++++++++++++-
 include/linux/mfd/tps6586x.h           |   16 ++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index bb04a75..dbcf09d 100644
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -332,6 +332,36 @@ static inline int tps6586x_regulator_preinit(struct device *parent,
 				 1 << ri->enable_bit[1]);
 }
 
+static int tps6586x_regulator_set_slew_rate(struct platform_device *pdev)
+{
+	struct device *parent = pdev->dev.parent;
+	struct regulator_init_data *p = pdev->dev.platform_data;
+	struct tps6586x_settings *setting = p->driver_data;
+	uint8_t reg;
+
+	if (setting == NULL)
+		return 0;
+
+	if (!(setting->slew_rate & TPS6586X_SLEW_RATE_SET))
+		return 0;
+
+	/* only SM0 and SM1 can have the slew rate settings */
+	switch (pdev->id) {
+	case TPS6586X_ID_SM_0:
+		reg = TPS6586X_SM0SL;
+		break;
+	case TPS6586X_ID_SM_1:
+		reg = TPS6586X_SM1SL;
+		break;
+	default:
+		dev_warn(&pdev->dev, "Only SM0/SM1 can set slew rate\n");
+		return -EINVAL;
+	}
+
+	return tps6586x_write(parent, reg,
+			setting->slew_rate & TPS6586X_SLEW_RATE_MASK);
+}
+
 static inline struct tps6586x_regulator *find_regulator_info(int id)
 {
 	struct tps6586x_regulator *ri;
@@ -374,7 +404,7 @@ static int __devinit tps6586x_regulator_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, rdev);
 
-	return 0;
+	return tps6586x_regulator_set_slew_rate(pdev);
 }
 
 static int __devexit tps6586x_regulator_remove(struct platform_device *pdev)
diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h
index b6bab1b..b19176e 100644
--- a/include/linux/mfd/tps6586x.h
+++ b/include/linux/mfd/tps6586x.h
@@ -1,6 +1,18 @@
 #ifndef __LINUX_MFD_TPS6586X_H
 #define __LINUX_MFD_TPS6586X_H
 
+#define TPS6586X_SLEW_RATE_INSTANTLY	0x00
+#define TPS6586X_SLEW_RATE_110UV	0x01
+#define TPS6586X_SLEW_RATE_220UV	0x02
+#define TPS6586X_SLEW_RATE_440UV	0x03
+#define TPS6586X_SLEW_RATE_880UV	0x04
+#define TPS6586X_SLEW_RATE_1760UV	0x05
+#define TPS6586X_SLEW_RATE_3520UV	0x06
+#define TPS6586X_SLEW_RATE_7040UV	0x07
+
+#define TPS6586X_SLEW_RATE_SET		0x08
+#define TPS6586X_SLEW_RATE_MASK         0x07
+
 enum {
 	TPS6586X_ID_SM_0,
 	TPS6586X_ID_SM_1,
@@ -48,6 +60,10 @@ enum {
 	TPS6586X_INT_RTC_ALM2,
 };
 
+struct tps6586x_settings {
+	int slew_rate;
+};
+
 struct tps6586x_subdev_info {
 	int		id;
 	const char	*name;
-- 
1.7.6


^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2011-08-28 16:49 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-04 11:34 [PATCH] regulator: tps6586x: add SMx slew rate setting dahuang
2011-08-04 12:12 ` Mark Brown
2011-08-05 11:51   ` Danny Huang
2011-08-08  9:37     ` Mark Brown
2011-08-08 12:28       ` Danny Huang
2011-08-08 13:32         ` Mark Brown
2011-08-04 12:42 ` Mark Brown
2011-08-05 11:53   ` Danny Huang
2011-08-09 10:47 dahuang
2011-08-09 16:06 ` Mark Brown
2011-08-22  9:35 ` Samuel Ortiz
2011-08-22  9:41   ` Liam Girdwood
2011-08-28 16:49 ` Liam Girdwood

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).