summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2011-09-15 15:39:24 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-19 23:15:38 +0100
commita69882aec380512e5d6acff9bfc4336dc5162bb4 (patch)
tree4b0361e0b2c1f453583310ecb52ac589452ae829
parent2d7c957e2ec0aebdd595a32b884a51270d34d28d (diff)
downloadlinux-3.10-a69882aec380512e5d6acff9bfc4336dc5162bb4.tar.gz
linux-3.10-a69882aec380512e5d6acff9bfc4336dc5162bb4.tar.bz2
linux-3.10-a69882aec380512e5d6acff9bfc4336dc5162bb4.zip
MFD: twl6040: Add accessor for revision ID
For client driver to use, if they need chip resvision information. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Samuel Ortiz <sameo@linux.intel.com> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--drivers/mfd/twl6040-core.c2
-rw-r--r--include/linux/mfd/twl6040.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index b0519e663be..51c3b47be65 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -491,7 +491,7 @@ static int __devinit twl6040_probe(struct platform_device *pdev)
}
/* ERRATA: Automatic power-up is not possible in ES1.0 */
- if (twl6040->rev == TWL6040_REV_ES1_0)
+ if (twl6040_get_revid(twl6040) == TWL6040_REV_ES1_0)
twl6040->audpwron = -EINVAL;
/* codec interrupt */
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index 4c806f6d663..cb3b8220712 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -225,4 +225,9 @@ unsigned int twl6040_get_sysclk(struct twl6040 *twl6040);
int twl6040_irq_init(struct twl6040 *twl6040);
void twl6040_irq_exit(struct twl6040 *twl6040);
+static inline int twl6040_get_revid(struct twl6040 *twl6040)
+{
+ return twl6040->rev;
+}
+
#endif /* End of __TWL6040_CODEC_H__ */