diff options
-rw-r--r-- | drivers/mfd/twl6040-core.c | 2 | ||||
-rw-r--r-- | include/linux/mfd/twl6040.h | 5 |
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) | |||
491 | } | 491 | } |
492 | 492 | ||
493 | /* ERRATA: Automatic power-up is not possible in ES1.0 */ | 493 | /* ERRATA: Automatic power-up is not possible in ES1.0 */ |
494 | if (twl6040->rev == TWL6040_REV_ES1_0) | 494 | if (twl6040_get_revid(twl6040) == TWL6040_REV_ES1_0) |
495 | twl6040->audpwron = -EINVAL; | 495 | twl6040->audpwron = -EINVAL; |
496 | 496 | ||
497 | /* codec interrupt */ | 497 | /* 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); | |||
225 | int twl6040_irq_init(struct twl6040 *twl6040); | 225 | int twl6040_irq_init(struct twl6040 *twl6040); |
226 | void twl6040_irq_exit(struct twl6040 *twl6040); | 226 | void twl6040_irq_exit(struct twl6040 *twl6040); |
227 | 227 | ||
228 | static inline int twl6040_get_revid(struct twl6040 *twl6040) | ||
229 | { | ||
230 | return twl6040->rev; | ||
231 | } | ||
232 | |||
228 | #endif /* End of __TWL6040_CODEC_H__ */ | 233 | #endif /* End of __TWL6040_CODEC_H__ */ |