Skip to contentSkip to conversation

mfd: Add TPS658621C device ID

PATCH In review [email protected] 3 participants 3 messages Oct 5, 2010 – Oct 19, 2010 Multifunction devices (MFD)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mfd: Add TPS658621C device ID

From: Andrew Chew <[email protected]>

The interface for this device should be identical to that of the TPS658521A.

---
 drivers/mfd/tps6586x.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/mfd/tps6586x.c +3 -1
index 117eb7c..b4931ab 100644
@@ -47,6 +47,7 @@
 /* device id */
 #define TPS6586X_VERSIONCRC	0xcd
 #define TPS658621A_VERSIONCRC	0x15
+#define TPS658621C_VERSIONCRC	0x2c
 
 struct tps6586x_irq_data {
 	u8	mask_reg;
@@ -497,7 +498,8 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
 		return -EIO;
 	}
 
-	if (ret != TPS658621A_VERSIONCRC) {
+	if ((ret != TPS658621A_VERSIONCRC) &&
+	    (ret != TPS658621C_VERSIONCRC)) {
 		dev_err(&client->dev, "Unsupported chip ID: %x\n", ret);
 		return -ENODEV;
 	}
Signature · 1 line
1.7.0.4
Acked-by on v1 1/1
#1 lore raw

Hi Samuel,

Can you please queue this?

Quoted 6 lines · [email protected] wrote:

From: Andrew Chew <[email protected]>

The interface for this device should be identical to that of the TPS658521A.

Quoted 26 lines
---
 drivers/mfd/tps6586x.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/mfd/tps6586x.c +3 -1
index 117eb7c..b4931ab 100644
@@ -47,6 +47,7 @@
 /* device id */
 #define TPS6586X_VERSIONCRC	0xcd
 #define TPS658621A_VERSIONCRC	0x15
+#define TPS658621C_VERSIONCRC	0x2c
 
 struct tps6586x_irq_data {
 	u8	mask_reg;
@@ -497,7 +498,8 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
 		return -EIO;
 	}
 
-	if (ret != TPS658621A_VERSIONCRC) {
+	if ((ret != TPS658621A_VERSIONCRC) &&
+	    (ret != TPS658621C_VERSIONCRC)) {
 		dev_err(&client->dev, "Unsupported chip ID: %x\n", ret);
 		return -ENODEV;
 	}
Signature · 2 lines
Sincerely yours,
Mike.
#2 lore raw

Hi Mike, Andrew,

Quoted 4 lines · Mike Rapoport

Hi Samuel,

Can you please queue this?

Patch applied now, many thanks.

Cheers,
Samuel.

Quoted 39 lines
Quoted 6 lines · [email protected] wrote:

From: Andrew Chew <[email protected]>

The interface for this device should be identical to that of the TPS658521A.

Quoted 24 lines

---
drivers/mfd/tps6586x.c | 4 +++-

1 files changed, 3 insertions(+), 1 deletions(-)
drivers/mfd/tps6586x.c +3 -1
index 117eb7c..b4931ab 100644
@@ -47,6 +47,7 @@
 /* device id */
 #define TPS6586X_VERSIONCRC	0xcd
 #define TPS658621A_VERSIONCRC	0x15
+#define TPS658621C_VERSIONCRC	0x2c
 struct tps6586x_irq_data {
 	u8	mask_reg;
@@ -497,7 +498,8 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
 		return -EIO;
 	}
-	if (ret != TPS658621A_VERSIONCRC) {
+	if ((ret != TPS658621A_VERSIONCRC) &&
+	    (ret != TPS658621C_VERSIONCRC)) {
 		dev_err(&client->dev, "Unsupported chip ID: %x\n", ret);
 		return -ENODEV;
 	}
Signature · 2 lines
Sincerely yours,
Mike.
Signature · 2 lines
Intel Open Source Technology Centre
http://oss.intel.com/