From: Marcus Cooper <marcus.xm.coo...@stericsson.com>
On newer variants of the ab a version and revision value can be
read. This modification merges these two values to create a
chip id.
Signed-off-by: Marcus Cooper <marcus.xm.coo...@stericsson.com>
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
Reviewed-by: Mattias WALLIN <mattias.wal...@stericsson.com>
Tested-by: Jonas ABERG <jonas.ab...@stericsson.com>
---
drivers/mfd/ab8500-core.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 7c20728..678afd0 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -1095,9 +1095,15 @@ static ssize_t show_chip_id(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct ab8500 *ab8500;
+ int chip_id = -EINVAL;
ab8500 = dev_get_drvdata(dev);
- return sprintf(buf, "%#x\n", ab8500 ? ab8500->chip_id : -EINVAL);
+ if(ab8500) {
+ chip_id = ab8500->chip_id;
+ if((is_ab8505(ab8500) || is_ab9540(ab8500)) && ab8500->version
!= 0xFF)
+ chip_id = (ab8500->version << 8) | chip_id;
+ }
+ return sprintf(buf, "%#x\n", chip_id);
}
/*
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
