diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-07-16 11:49:43 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-07-25 00:26:58 +0200 |
| commit | be4ac00ac486aa68f82a940602963c466cea1a4e (patch) | |
| tree | 00fb70e415a3d34b5aaabb1215975fead6063ee2 | |
| parent | mfd: Matches should be NULL when populate anatop child devices (diff) | |
| download | linux-be4ac00ac486aa68f82a940602963c466cea1a4e.tar.xz linux-be4ac00ac486aa68f82a940602963c466cea1a4e.zip | |
mfd: Fix twl6040 revision information
twl6040 ES1.1 and ES1.2 have the same revid (0x01).
ES1.3 of twl6040 REVID is 0x02.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
| -rw-r--r-- | include/linux/mfd/twl6040.h | 4 | ||||
| -rw-r--r-- | sound/soc/codecs/twl6040.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index dcc0e12b8038..00b330e578b1 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h @@ -161,8 +161,8 @@ #define TWL6040_CELLS 2 #define TWL6040_REV_ES1_0 0x00 -#define TWL6040_REV_ES1_1 0x01 -#define TWL6040_REV_ES1_2 0x02 +#define TWL6040_REV_ES1_1 0x01 /* Rev ES1.1 and ES1.2 */ +#define TWL6040_REV_ES1_3 0x02 #define TWL6040_IRQ_TH 0 #define TWL6040_IRQ_PLUG 1 diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index a36e9fcdf184..2786de218a3c 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -653,7 +653,7 @@ int twl6040_get_hs_step_size(struct snd_soc_codec *codec) { struct twl6040 *twl6040 = codec->control_data; - if (twl6040_get_revid(twl6040) < TWL6040_REV_ES1_2) + if (twl6040_get_revid(twl6040) < TWL6040_REV_ES1_3) /* For ES under ES_1.3 HS step is 2 mV */ return 2; else |