diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-09-22 09:56:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-22 09:56:12 +0200 |
| commit | af1910a817c5ad52c32dddacc1744cfa1b35889e (patch) | |
| tree | 2d6504a2ac5971bb84e0172bbdd309b781048849 /include/linux/mfd/twl6040.h | |
| parent | 5495ffbd7b56d8bffebc5e30f03ea374590f1bb4 (diff) | |
| parent | f648de832dbf6d1947ce5a7c0ed24a3a71d8545b (diff) | |
| download | linux-af1910a817c5ad52c32dddacc1744cfa1b35889e.tar.gz linux-af1910a817c5ad52c32dddacc1744cfa1b35889e.tar.bz2 linux-af1910a817c5ad52c32dddacc1744cfa1b35889e.zip | |
Merge branch 'topic/asoc' into topic/remove-irqf_disable
Diffstat (limited to 'include/linux/mfd/twl6040.h')
| -rw-r--r-- | include/linux/mfd/twl6040.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index 4c806f6d663e..ec1ec794fa23 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h @@ -70,9 +70,6 @@ #define TWL6040_CACHEREGNUM (TWL6040_REG_STATUS + 1) -#define TWL6040_VIOREGNUM 18 -#define TWL6040_VDDREGNUM 21 - /* INTID (0x03) fields */ #define TWL6040_THINT 0x01 @@ -225,4 +222,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__ */ |