Skip to contentSkip to conversation

regulator: tps6586x: add version detection and voltage tables

PATCH Superseded Stefan Agner 3 participants 8 messages Dec 1, 2013 – Dec 2, 2013

Subsystems (4)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v2 cover regulator: tps6586x: add version detection and voltage tables

regulator: tps6586x: add version detection and voltage tables

This is the 2nd version of this patchset which adds version detection for the tps6586x mfd family. This is required because some regulator versions use different voltage tables. The regulator driver now uses the right voltage table according to the version. Is it still posible to see this patch in v3.13?

While at it, there are a few other incorrect regulator entries in the device tree, change them accordingly (this patch is new and grew out of a patch with the same name which Lucas Stach posted in July).

Tested on Colibri T20 V1.1 and V1.2 which makes use of diffent version of that regulator.

Changes since v1:
- Merged DT and driver change (preserves bisectability)
- Use different regulator tables for different regulator version
* This also makes the TPS6586X_ANY version needless
- Replaced enum with defines
- Move version message in a sperate function
- Include regulator bugfix, use correct supply voltage
- Checked all voltages, fix SM0/SM1 (Core/CPU) and LDO6 voltage (VDAC/VI) in another commit
- Rebased on top of v3.13-rc2

Stefan Agner (3):
mfd: tps6586x: add version detection
regulator: tps6586x: add and use correct voltage table
ARM: tegra: correct Colibri T20 regulator settings

 arch/arm/boot/dts/tegra20-colibri-512.dtsi | 34 ++++++------
 drivers/mfd/tps6586x.c                     | 47 +++++++++++++---
 drivers/regulator/tps6586x-regulator.c     | 89 +++++++++++++++++++++++-------
 include/linux/mfd/tps6586x.h               |  7 +++
 4 files changed, 132 insertions(+), 45 deletions(-)
Signature · 1 line
1.8.4.2
#1 lore raw

PATCH v2 1/3 mfd: tps6586x: add version detection

Use the VERSIONCRC to determine the exact device version. According to the datasheet this register can be used as device identifier. The identification is needed since some tps6586x regulators use a different voltage table.

---
 drivers/mfd/tps6586x.c       | 47 +++++++++++++++++++++++++++++++++++++-------
 include/linux/mfd/tps6586x.h |  7 +++++++
 2 files changed, 47 insertions(+), 7 deletions(-)
drivers/mfd/tps6586x.c +40 -7
index ee61fd7..8fc5a68 100644
@@ -124,6 +124,7 @@ struct tps6586x {
 	struct device		*dev;
 	struct i2c_client	*client;
 	struct regmap		*regmap;
+	int			version;
 
 	int			irq;
 	struct irq_chip		irq_chip;
@@ -208,6 +209,14 @@ int tps6586x_irq_get_virq(struct device *dev, int irq)
 }
 EXPORT_SYMBOL_GPL(tps6586x_irq_get_virq);
 
+int tps6586x_get_version(struct device *dev)
+{
+	struct tps6586x *tps6586x = dev_get_drvdata(dev);
+
+	return tps6586x->version;
+}
+EXPORT_SYMBOL_GPL(tps6586x_get_version);
+
 static int __remove_subdev(struct device *dev, void *unused)
 {
 	platform_device_unregister(to_platform_device(dev));
@@ -472,6 +481,31 @@ static void tps6586x_power_off(void)
 	tps6586x_set_bits(tps6586x_dev, TPS6586X_SUPPLYENE, SLEEP_MODE_BIT);
 }
 
+static void tps6586x_print_version(struct i2c_client *client, int version)
+{
+	const char *name;
+
+	switch (version) {
+	case TPS658621A:
+		name = "TPS658621A";
+		break;
+	case TPS658621CD:
+		name = "TPS658621C/D";
+		break;
+	case TPS658623:
+		name = "TPS658623";
+		break;
+	case TPS658643:
+		name = "TPS658643";
+		break;
+	default:
+		name = "TPS6586X";
+		break;
+	}
+
+	dev_info(&client->dev, "Found %s, VERSIONCRC is %02x\n", name, version);
+}
+
 static int tps6586x_i2c_probe(struct i2c_client *client,
 					const struct i2c_device_id *id)
 {
@@ -487,19 +521,18 @@ static int tps6586x_i2c_probe(struct i2c_client *client,
 		return -ENOTSUPP;
 	}
 
+	tps6586x = devm_kzalloc(&client->dev, sizeof(*tps6586x), GFP_KERNEL);
+	if (!tps6586x)
+		return -ENOMEM;
+
 	ret = i2c_smbus_read_byte_data(client, TPS6586X_VERSIONCRC);
 	if (ret < 0) {
 		dev_err(&client->dev, "Chip ID read failed: %d\n", ret);
 		return -EIO;
 	}
 
-	dev_info(&client->dev, "VERSIONCRC is %02x\n", ret);
-
-	tps6586x = devm_kzalloc(&client->dev, sizeof(*tps6586x), GFP_KERNEL);
-	if (tps6586x == NULL) {
-		dev_err(&client->dev, "memory for tps6586x alloc failed\n");
-		return -ENOMEM;
-	}
+	tps6586x->version = ret;
+	tps6586x_print_version(client, tps6586x->version);
 
 	tps6586x->client = client;
 	tps6586x->dev = &client->dev;
include/linux/mfd/tps6586x.h +7 -0
index 8799454..cbecec2 100644
@@ -13,6 +13,12 @@
 #define TPS6586X_SLEW_RATE_SET		0x08
 #define TPS6586X_SLEW_RATE_MASK         0x07
 
+/* VERSION CRC */
+#define TPS658621A	0x15
+#define TPS658621CD	0x2c
+#define TPS658623	0x1b
+#define TPS658643	0x03
+
 enum {
 	TPS6586X_ID_SYS,
 	TPS6586X_ID_SM_0,
@@ -97,5 +103,6 @@ extern int tps6586x_clr_bits(struct device *dev, int reg, uint8_t bit_mask);
 extern int tps6586x_update(struct device *dev, int reg, uint8_t val,
 			   uint8_t mask);
 extern int tps6586x_irq_get_virq(struct device *dev, int irq);
+extern int tps6586x_get_version(struct device *dev);
 
 #endif /*__LINUX_MFD_TPS6586X_H */
Signature · 1 line
1.8.4.2
#2 lore raw

Re: [PATCH v2 1/3] mfd: tps6586x: add version detection

Quoted 71 lines · Stefan Agner

Use the VERSIONCRC to determine the exact device version. According to the datasheet this register can be used as device identifier. The identification is needed since some tps6586x regulators use a different voltage table.

---
 drivers/mfd/tps6586x.c       | 47 +++++++++++++++++++++++++++++++++++++-------
 include/linux/mfd/tps6586x.h |  7 +++++++
 2 files changed, 47 insertions(+), 7 deletions(-)
drivers/mfd/tps6586x.c +34 -0
index ee61fd7..8fc5a68 100644
@@ -124,6 +124,7 @@ struct tps6586x {
 	struct device		*dev;
 	struct i2c_client	*client;
 	struct regmap		*regmap;
+	int			version;
 
 	int			irq;
 	struct irq_chip		irq_chip;
@@ -208,6 +209,14 @@ int tps6586x_irq_get_virq(struct device *dev, int irq)
 }
 EXPORT_SYMBOL_GPL(tps6586x_irq_get_virq);
 
+int tps6586x_get_version(struct device *dev)
+{
+	struct tps6586x *tps6586x = dev_get_drvdata(dev);
+
+	return tps6586x->version;
+}
+EXPORT_SYMBOL_GPL(tps6586x_get_version);
+
 static int __remove_subdev(struct device *dev, void *unused)
 {
 	platform_device_unregister(to_platform_device(dev));
@@ -472,6 +481,31 @@ static void tps6586x_power_off(void)
 	tps6586x_set_bits(tps6586x_dev, TPS6586X_SUPPLYENE, SLEEP_MODE_BIT);
 }
 
+static void tps6586x_print_version(struct i2c_client *client, int version)
+{
+	const char *name;
+
+	switch (version) {
+	case TPS658621A:
+		name = "TPS658621A";
+		break;
+	case TPS658621CD:
+		name = "TPS658621C/D";
+		break;
+	case TPS658623:
+		name = "TPS658623";
+		break;
+	case TPS658643:
+		name = "TPS658643";
+		break;
+	default:
+		name = "TPS6586X";
+		break;
+	}
+
+	dev_info(&client->dev, "Found %s, VERSIONCRC is %02x\n", name, version);
+}
+
 static int tps6586x_i2c_probe(struct i2c_client *client,
 					const struct i2c_device_id *id)
 {

drivers/mfd/tps6586x.c static int tps6586x_i2c_probe(struct i2c_client *client, · line 527

Quoted 7 lines
drivers/mfd/tps6586x.c +4 -0
@@ -487,19 +521,18 @@ static int tps6586x_i2c_probe(struct i2c_client *client,
 		return -ENOTSUPP;
 	}
 
+	tps6586x = devm_kzalloc(&client->dev, sizeof(*tps6586x), GFP_KERNEL);
+	if (!tps6586x)
+		return -ENOMEM;
+

This hunk is being needlessly moved around....

Quoted 5 lines
drivers/mfd/tps6586x.c +0 -0
 	ret = i2c_smbus_read_byte_data(client, TPS6586X_VERSIONCRC);
 	if (ret < 0) {
 		dev_err(&client->dev, "Chip ID read failed: %d\n", ret);
 		return -EIO;
 	}

drivers/mfd/tps6586x.c static int tps6586x_i2c_probe(struct i2c_client *client, · line 535

Quoted 10 lines
drivers/mfd/tps6586x.c +2 -7
 
-	dev_info(&client->dev, "VERSIONCRC is %02x\n", ret);
-
-	tps6586x = devm_kzalloc(&client->dev, sizeof(*tps6586x), GFP_KERNEL);
-	if (tps6586x == NULL) {
-		dev_err(&client->dev, "memory for tps6586x alloc failed\n");
-		return -ENOMEM;
-	}
+	tps6586x->version = ret;
+	tps6586x_print_version(client, tps6586x->version);

... none of this new code overwrites "ret", so you could just keep the previous order of operations. It probably doesn't matter all that much, but deferring allocation until we're sure that the chip actually exists is a minor optimization. Also not moving that hunk around makes the patch simpler.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131202/343b80b9/attachment-0001.sig>

maintainer
#3 lore raw

Re: [PATCH v2 1/3] mfd: tps6586x: add version detection

In reply to Stefan Agner

drivers/mfd/tps6586x.c int tps6586x_irq_get_virq(struct device *dev, int irq) · line 218

Quoted 7 lines · Stefan Agner
drivers/mfd/tps6586x.c +7 -0
+int tps6586x_get_version(struct device *dev)
+{
+	struct tps6586x *tps6586x = dev_get_drvdata(dev);
+
+	return tps6586x->version;
+}
+EXPORT_SYMBOL_GPL(tps6586x_get_version);

May as well make this a static inline in the header.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131202/955b912f/attachment.sig>

#4 lore raw

PATCH v2 2/3 regulator: tps6586x: add and use correct voltage table

In reply to Stefan Agner

Depending on the regulator version, the voltage table might be different. Use version specific regulator tables in order to select correct voltage table. For the following regulator versions different voltage tables are now used:

* TPS658623: Use correct voltage table for SM2
* TPS658643: New voltage table for SM2

Both versions are in use on the Colibri T20 module. Make use of the correct tables by requesting the correct SM2 voltage of 1.8V.

This change is not backward compatible since an old driver is not able to correctly set that value. The value 1.8V is out of range for the old driver and will refuse to probe the device. The regulator starts with default settings and the driver shows appropriate error messages.

On Colibri T20, the old value used to work with TPS658623 since the driver applied a wrong voltage table too. However, the TPS658643 used on V1.2 devices uses yet another voltage table and those broke that pseudo-compatibility. The regulator driver now has the correct voltage table for both regulator versions and those the correct voltage can be used in the device tree.

---
 arch/arm/boot/dts/tegra20-colibri-512.dtsi |  4 +-
 drivers/regulator/tps6586x-regulator.c     | 89 +++++++++++++++++++++++-------
 2 files changed, 70 insertions(+), 23 deletions(-)
arch/arm/boot/dts/tegra20-colibri-512.dtsi +2 -2
index d5c9bca..cbe89ff 100644
@@ -268,8 +268,8 @@
 					reg = <3>;
 					regulator-compatible = "sm2";
 					regulator-name = "vdd_sm2,vin_ldo*";
-					regulator-min-microvolt = <3700000>;
-					regulator-max-microvolt = <3700000>;
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
 					regulator-always-on;
 				};
 
drivers/regulator/tps6586x-regulator.c +68 -21

144 lines not on this page · raw message

Signature · 1 line
1.8.4.2
#5 lore raw

Re: [PATCH v2 2/3] regulator: tps6586x: add and use correct voltage table

On Sun, Dec 01, 2013 at 04:59:14PM +0100, Stefan Agner wrote:
[...]

This looks pretty good generally. A few minor nits below...

Quoted 1 line
drivers/regulator/tps6586x-regulator.c +0 -0

[...]

drivers/regulator/tps6586x-regulator.c static const unsigned int tps6586x_ldo0_voltages[] = { · line 92

Quoted 4 lines
drivers/regulator/tps6586x-regulator.c +1 -0
+#define tps658623_sm2_voltages tps6586x_ldo4_voltages
 static const unsigned int tps6586x_ldo4_voltages[] = {
 	1700000, 1725000, 1750000, 1775000, 1800000, 1825000, 1850000, 1875000,
 	1900000, 1925000, 1950000, 1975000, 2000000, 2025000, 2050000, 2075000,

I'd put the #define below the ldo4 table. This doesn't actually matter for the preprocessor, but it makes it easier to read the code. Also an additional blank line would help with readability.

drivers/regulator/tps6586x-regulator.c static const unsigned int tps6586x_dvm_voltages[] = { · line 174

Quoted 2 lines
drivers/regulator/tps6586x-regulator.c +2 -0
+	TPS6586X_LDO(LDO_0, "vinldo01", tps6586x_ldo0, SUPPLYV1, 5, 3, ENC, 0,
+					END, 0),

Perhaps reduce the indentation here so there's more room in case this ever needs to be extended?

drivers/regulator/tps6586x-regulator.c static int tps6586x_regulator_probe(struct platform_device *pdev) · line 383

Quoted 5 lines
drivers/regulator/tps6586x-regulator.c +1 -0
@@ -351,6 +380,7 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
 	struct regulator_init_data *reg_data;
 	struct tps6586x_platform_data *pdata;
 	struct of_regulator_match *tps6586x_reg_matches = NULL;
+	int reg_version;

Why the prefix "reg_"?

Quoted 10 lines
drivers/regulator/tps6586x-regulator.c +2 -1
@@ -373,10 +403,27 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
+	reg_version = tps6586x_get_version(pdev->dev.parent);
+
 	for (id = 0; id < TPS6586X_ID_MAX_REGULATOR; ++id) {
 		reg_data = pdata->reg_init_data[id];
 
-		ri = find_regulator_info(id);

drivers/regulator/tps6586x-regulator.c static int tps6586x_regulator_probe(struct platform_device *pdev) · line 420

Quoted 10 lines
drivers/regulator/tps6586x-regulator.c +10 -0
+		switch(reg_version) {
+		case TPS658623:
+			ri = find_regulator_info(id, tps658623_regulator,
+					ARRAY_SIZE(tps658623_regulator));
+			break;
+		case TPS658643:
+			ri = find_regulator_info(id, tps658643_regulator,
+					ARRAY_SIZE(tps658643_regulator));
+			break;
+		}

Perhaps instead of repeating the function calls this could be:

		switch (version) {
		case TPS6586XYZ:
			num = ARRAY_SIZE(tps6586xyz_regulator);
			table = tps6586xys_regulator;
			break;

		...
		}

		if (table)
			ri = find_regulator_info(id, table, num);

That's slightly longer, but I find that to be more intuitive. Perhaps a bit more future-proof since you only have a single call. But that's perhaps subjective, so I'm fine with your alternative, too.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131202/cd4a8799/attachment.sig>

#6 lore raw

Re: [PATCH v2 2/3] regulator: tps6586x: add and use correct voltage table

Am 2013-12-02 10:36, schrieb Thierry Reding:

Quoted 16 lines · Stefan Agner

[...]

This looks pretty good generally. A few minor nits below...

Quoted 1 line
drivers/regulator/tps6586x-regulator.c +0 -0

[...]

drivers/regulator/tps6586x-regulator.c static const unsigned int tps6586x_ldo0_voltages[] = { · line 92

Quoted 4 lines
drivers/regulator/tps6586x-regulator.c +1 -0
+#define tps658623_sm2_voltages tps6586x_ldo4_voltages
 static const unsigned int tps6586x_ldo4_voltages[] = {
 	1700000, 1725000, 1750000, 1775000, 1800000, 1825000, 1850000, 1875000,
 	1900000, 1925000, 1950000, 1975000, 2000000, 2025000, 2050000, 2075000,

I'd put the #define below the ldo4 table. This doesn't actually matter for the preprocessor, but it makes it easier to read the code. Also an additional blank line would help with readability.

Quoted 5 lines

drivers/regulator/tps6586x-regulator.c static const unsigned int tps6586x_dvm_voltages[] = { · line 174

Quoted 2 lines
drivers/regulator/tps6586x-regulator.c +2 -0
+	TPS6586X_LDO(LDO_0, "vinldo01", tps6586x_ldo0, SUPPLYV1, 5, 3, ENC, 0,
+					END, 0),

Perhaps reduce the indentation here so there's more room in case this ever needs to be extended?

The last 4 lines indentation was already that far, so I just adopted those lines in order to avoid having to touch them too.

Quoted 44 lines

drivers/regulator/tps6586x-regulator.c static int tps6586x_regulator_probe(struct platform_device *pdev) · line 383

Quoted 6 lines
drivers/regulator/tps6586x-regulator.c +1 -0
@@ -351,6 +380,7 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
 	struct regulator_init_data *reg_data;
 	struct tps6586x_platform_data *pdata;
 	struct of_regulator_match *tps6586x_reg_matches = NULL;
+	int reg_version;

Why the prefix "reg_"?

Quoted 10 lines
drivers/regulator/tps6586x-regulator.c +2 -1
@@ -373,10 +403,27 @@ static int tps6586x_regulator_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
+	reg_version = tps6586x_get_version(pdev->dev.parent);
+
 	for (id = 0; id < TPS6586X_ID_MAX_REGULATOR; ++id) {
 		reg_data = pdata->reg_init_data[id];
 
-		ri = find_regulator_info(id);

drivers/regulator/tps6586x-regulator.c static int tps6586x_regulator_probe(struct platform_device *pdev) · line 420

Quoted 10 lines
drivers/regulator/tps6586x-regulator.c +10 -0
+		switch(reg_version) {
+		case TPS658623:
+			ri = find_regulator_info(id, tps658623_regulator,
+					ARRAY_SIZE(tps658623_regulator));
+			break;
+		case TPS658643:
+			ri = find_regulator_info(id, tps658643_regulator,
+					ARRAY_SIZE(tps658643_regulator));
+			break;
+		}

Perhaps instead of repeating the function calls this could be:

		switch (version) {
		case TPS6586XYZ:
			num = ARRAY_SIZE(tps6586xyz_regulator);
			table = tps6586xys_regulator;
			break;

		...
		}

		if (table)
			ri = find_regulator_info(id, table, num);
Quoted 3 lines

That's slightly longer, but I find that to be more intuitive. Perhaps a bit more future-proof since you only have a single call. But that's perhaps subjective, so I'm fine with your alternative, too.

Sounds reasonable, will change that accordingly in the next patch version.

#7 lore raw

PATCH v2 3/3 ARM: tegra: correct Colibri T20 regulator settings

In reply to Stefan Agner

Set the parent of the regulators LDO2 to LDO9 according to the schematic. Set the base voltage to 3.3V, there is only 3.3V on the module itself.

Set the Core and CPU voltage to the specified voltages of 1.2V and 1.0V respectivly.

LDO6 should deliver 2.85V. The attached peripherals were not in use so far.

---
 arch/arm/boot/dts/tegra20-colibri-512.dtsi | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)
arch/arm/boot/dts/tegra20-colibri-512.dtsi +15 -15
index cbe89ff..51e0880 100644
@@ -225,15 +225,15 @@
 			#gpio-cells = <2>;
 			gpio-controller;
 
-			sys-supply = <&vdd_5v0_reg>;
+			sys-supply = <&vdd_3v3_reg>;
 			vin-sm0-supply = <&sys_reg>;
 			vin-sm1-supply = <&sys_reg>;
 			vin-sm2-supply = <&sys_reg>;
 			vinldo01-supply = <&sm2_reg>;
-			vinldo23-supply = <&sm2_reg>;
-			vinldo4-supply = <&sm2_reg>;
-			vinldo678-supply = <&sm2_reg>;
-			vinldo9-supply = <&sm2_reg>;
+			vinldo23-supply = <&vdd_3v3_reg>;
+			vinldo4-supply = <&vdd_3v3_reg>;
+			vinldo678-supply = <&vdd_3v3_reg>;
+			vinldo9-supply = <&vdd_3v3_reg>;
 
 			regulators {
 				#address-cells = <1>;
@@ -250,8 +250,8 @@
 					reg = <1>;
 					regulator-compatible = "sm0";
 					regulator-name = "vdd_sm0,vdd_core";
-					regulator-min-microvolt = <1275000>;
-					regulator-max-microvolt = <1275000>;
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <1200000>;
 					regulator-always-on;
 				};
 
@@ -259,8 +259,8 @@
 					reg = <2>;
 					regulator-compatible = "sm1";
 					regulator-name = "vdd_sm1,vdd_cpu";
-					regulator-min-microvolt = <1100000>;
-					regulator-max-microvolt = <1100000>;
+					regulator-min-microvolt = <1000000>;
+					regulator-max-microvolt = <1000000>;
 					regulator-always-on;
 				};
 
@@ -316,8 +316,8 @@
 					reg = <10>;
 					regulator-compatible = "ldo6";
 					regulator-name = "vdd_ldo6,avdd_vdac,vddio_vi,vddio_cam";
-					regulator-min-microvolt = <1800000>;
-					regulator-max-microvolt = <1800000>;
+					regulator-min-microvolt = <2850000>;
+					regulator-max-microvolt = <2850000>;
 				};
 
 				hdmi_vdd_reg: regulator at 11 {
@@ -504,12 +504,12 @@
 		#address-cells = <1>;
 		#size-cells = <0>;
 
-		vdd_5v0_reg: regulator at 100 {
+		vdd_3v3_reg: regulator at 100 {
 			compatible = "regulator-fixed";
 			reg = <100>;
-			regulator-name = "vdd_5v0";
-			regulator-min-microvolt = <5000000>;
-			regulator-max-microvolt = <5000000>;
+			regulator-name = "vdd_3v3";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
 			regulator-always-on;
 		};
 
Signature · 1 line
1.8.4.2