Skip to contentSkip to conversation

regulator: tps6586x: add version detection and voltage tables

PATCH Applied Stefan Agner 5 participants 15 messages Dec 6, 2013 – Dec 12, 2013 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

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

This is the 5th version of this patchset which adds version detection for the tps6586x mfd family. Just discovered a missing null reference check which did not triggered in my tests, sorry about that.

This is required because some regulator versions use different voltage tables. The regulator driver now uses the right voltage table according to the version.

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 v4:
- Use variable named version instead of ret

Changes since v3:
- Check if version specific table is necessary

Changes since v2:
- Avoid moving devm_kzalloc
- Removed reg_ from reg_version
- Moved walk through version dependent tables to find_regulator_info, removed the inline definition. This reduces .o size and encapsulates the logic of finding the right regulator into one function. It comes with a slight code duplication, the table search now appears twice.

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                     | 50 +++++++++++++---
 drivers/regulator/tps6586x-regulator.c     | 93 ++++++++++++++++++++++++------
 include/linux/mfd/tps6586x.h               |  7 +++
 4 files changed, 140 insertions(+), 44 deletions(-)
Signature · 1 line
1.8.4.2
#1 lore raw

PATCH v5 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.

---
Changes since v4:
- Use variable named version instead of ret

Changes since v2:
- Avoid moving devm_kzalloc

---
 drivers/mfd/tps6586x.c       | 50 +++++++++++++++++++++++++++++++++++++-------
 include/linux/mfd/tps6586x.h |  7 +++++++
 2 files changed, 49 insertions(+), 8 deletions(-)
drivers/mfd/tps6586x.c +42 -8
index ee61fd7..6f2af9c 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,12 +481,38 @@ 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)
 {
 	struct tps6586x_platform_data *pdata = dev_get_platdata(&client->dev);
 	struct tps6586x *tps6586x;
 	int ret;
+	int version;
 
 	if (!pdata && client->dev.of_node)
 		pdata = tps6586x_parse_dt(client);
@@ -487,19 +522,18 @@ static int tps6586x_i2c_probe(struct i2c_client *client,
 		return -ENOTSUPP;
 	}
 
-	ret = i2c_smbus_read_byte_data(client, TPS6586X_VERSIONCRC);
-	if (ret < 0) {
-		dev_err(&client->dev, "Chip ID read failed: %d\n", ret);
+	version = i2c_smbus_read_byte_data(client, TPS6586X_VERSIONCRC);
+	if (version < 0) {
+		dev_err(&client->dev, "Chip ID read failed: %d\n", version);
 		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");
+	if (!tps6586x)
 		return -ENOMEM;
-	}
+
+	tps6586x->version = version;
+	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 v5 1/3] mfd: tps6586x: add version detection

Quoted 10 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.

---
Changes since v4:
- Use variable named version instead of ret

Quoted 6 lines

Changes since v2:
- Avoid moving devm_kzalloc

---
 drivers/mfd/tps6586x.c       | 50 +++++++++++++++++++++++++++++++++++++-------
 include/linux/mfd/tps6586x.h |  7 +++++++
 2 files changed, 49 insertions(+), 8 deletions(-)

I think I also already gave my Reviewed-by on both this and 2/3, neither of which changed significantly enough to warrant that to be dropped. In general it's fine to keep Reviewed-by and Acked-by as long as you're only changing minor things.

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/20131206/d8a623c3/attachment.sig>

author Reviewed-by Thierry Reding
#3 lore raw

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

Am 2013-12-06 15:26, schrieb Thierry Reding:

Quoted 18 lines · Stefan Agner
Quoted 10 lines

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.

---
Changes since v4:
- Use variable named version instead of ret

Quoted 6 lines

Changes since v2:
- Avoid moving devm_kzalloc

---
 drivers/mfd/tps6586x.c       | 50 +++++++++++++++++++++++++++++++++++++-------
 include/linux/mfd/tps6586x.h |  7 +++++++
 2 files changed, 49 insertions(+), 8 deletions(-)
Quoted 6 lines

I think I also already gave my Reviewed-by on both this and 2/3, neither of which changed significantly enough to warrant that to be dropped. In general it's fine to keep Reviewed-by and Acked-by as long as you're only changing minor things.

Thierry

Ok, sorry, didn't realize that is my job to pick them up when doing new revisions. Lee, can you add this when you apply this patch?

#4 lore raw

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

Quoted 24 lines · Stefan Agner

Am 2013-12-06 15:26, schrieb Thierry Reding:

Quoted 23 lines · Stefan Agner
Quoted 10 lines

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.

---
Changes since v4:
- Use variable named version instead of ret

Quoted 6 lines

Changes since v2:
- Avoid moving devm_kzalloc

---
 drivers/mfd/tps6586x.c       | 50 +++++++++++++++++++++++++++++++++++++-------
 include/linux/mfd/tps6586x.h |  7 +++++++
 2 files changed, 49 insertions(+), 8 deletions(-)

I think I also already gave my Reviewed-by on both this and 2/3, neither of which changed significantly enough to warrant that to be dropped. In general it's fine to keep Reviewed-by and Acked-by as long as you're only changing minor things.

Quoted 4 lines
Quoted 1 line

Thierry

Ok, sorry, didn't realize that is my job to pick them up when doing new revisions. Lee, can you add this when you apply this patch?

Will it's not legislation, but it does help us a great deal.

Quoted 1 line

Sure.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#5 lore raw

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

In reply to Thierry Reding
Quoted 18 lines · Thierry Reding
Quoted 10 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.

---
Changes since v4:
- Use variable named version instead of ret

Quoted 6 lines

Changes since v2:
- Avoid moving devm_kzalloc

---
 drivers/mfd/tps6586x.c       | 50 +++++++++++++++++++++++++++++++++++++-------
 include/linux/mfd/tps6586x.h |  7 +++++++
 2 files changed, 49 insertions(+), 8 deletions(-)
Quoted 4 lines

I think I also already gave my Reviewed-by on both this and 2/3, neither of which changed significantly enough to warrant that to be dropped. In general it's fine to keep Reviewed-by and Acked-by as long as you're only changing minor things.

Don't worry Thierry, I'll ensure they are applied.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#6 lore raw

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

In reply to Stefan Agner
Quoted 10 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.

---
Changes since v4:
- Use variable named version instead of ret

Quoted 6 lines

Changes since v2:
- Avoid moving devm_kzalloc

---
 drivers/mfd/tps6586x.c       | 50 +++++++++++++++++++++++++++++++++++++-------
 include/linux/mfd/tps6586x.h |  7 +++++++
 2 files changed, 49 insertions(+), 8 deletions(-)

Applied with Acks.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#7 lore raw

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

In reply to Stefan Agner
Quoted 4 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.

FWIW, this version looks good to me now.

A message that is not in the archive (sent off-list or not yet received): CAF2Aj3i95j+ZG4gmpSS9Hq6AKXj6w7mB1psYQwT6oas3QfNBrA@mail.gmail.com

#9 lore raw

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

Quoted 5 lines · Lee Jones
Quoted 2 lines · On 6 Dec 2013 17:49, "Stephen Warren" <[email protected]…

On 12/06/2013 05:51 AM, Stefan Agner wrote:

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

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.

FWIW, this version looks good to me now.

If that's an Ack I can apply it.

Yes, it is. I thought you said you'd already applied it though, so I didn't write the ack, but if not:

#10 lore raw

PATCH v5 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.

---
Changes since v3:
- Check if version specific table is necessary

Changes since v2:
- Removed reg_ from reg_version
- Moved walk through version dependent tables to find_regulator_info, removed the inline definition. This reduces .o size and encapsulates the logic of finding the right regulator into one function. It comes with a slight code duplication, the table search now appears twice.

---
 arch/arm/boot/dts/tegra20-colibri-512.dtsi |  4 +-
 drivers/regulator/tps6586x-regulator.c     | 93 ++++++++++++++++++++++++------
 2 files changed, 76 insertions(+), 21 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 +74 -19

148 lines not on this page · raw message

Signature · 1 line
1.8.4.2
maintainer
#11 lore raw

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

Quoted 4 lines · 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:

I think this is the same as the last patch I reviewed but I don't see my
ack on it?
-------------- 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/20131206/de606f3e/attachment.sig>

author Acked-by Mark Brown Reviewed-by Thierry Reding
#12 lore raw

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

Am 2013-12-06 13:55, schrieb Mark Brown:

Quoted 8 lines · Stefan Agner
Quoted 4 lines

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:

I think this is the same as the last patch I reviewed but I don't see my ack on it?

Oh sorry, its my first multi-revision submission. I didn't realized that it is my job to add them when doing a new revision... Lee, can you add that when you apply the patch? So far I see

for this patch.

#13 lore raw

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

In reply to Stefan Agner
Quoted 34 lines · 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.

---
Changes since v3:
- Check if version specific table is necessary

Changes since v2:
- Removed reg_ from reg_version
- Moved walk through version dependent tables to find_regulator_info, removed the inline definition. This reduces .o size and encapsulates the logic of finding the right regulator into one function. It comes with a slight code duplication, the table search now appears twice.

Quoted 3 lines
---
 arch/arm/boot/dts/tegra20-colibri-512.dtsi |  4 +-
 drivers/regulator/tps6586x-regulator.c     | 93 ++++++++++++++++++++++++-----

Applied with Reviews and Acks.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#14 lore raw

PATCH v5 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
#15 lore raw

Re: [PATCH v5 3/3] ARM: tegra: correct Colibri T20 regulator settings

Quoted 9 lines · 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.

I've applied patch 3/3 only to Tegra's for-3.14/dt branch.