Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d1f92f05754116fc65cb1165d4942d25df6f200e

Authored by Andrew Chew
Committed by Samuel Ortiz
1 parent b0b4a7c28e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

mfd: Add TPS658621C device ID 

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

Signed-off-by: Andrew Chew <achew@nvidia.com>
Acked-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

drivers/mfd/tps6586x.c
Diff comments   View file @ d1f92f0
... ... @@ -47,6 +47,7 @@
47 47 /* device id */
48 48 #define TPS6586X_VERSIONCRC 0xcd
49 49 #define TPS658621A_VERSIONCRC 0x15
  50 +#define TPS658621C_VERSIONCRC 0x2c
50 51  
51 52 struct tps6586x_irq_data {
52 53 u8 mask_reg;
... ... @@ -497,7 +498,8 @@
497 498 return -EIO;
498 499 }
499 500  
500   - if (ret != TPS658621A_VERSIONCRC) {
  501 + if ((ret != TPS658621A_VERSIONCRC) &&
  502 + (ret != TPS658621C_VERSIONCRC)) {
501 503 dev_err(&client->dev, "Unsupported chip ID: %x\n", ret);
502 504 return -ENODEV;
503 505 }