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>

diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index dcc0e12b803847237006ba6bc408dacc50196508..00b330e578b1066be84c14f4544e59995e0ebd87 100644 (file)
--- 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 a36e9fcdf184f9d9a4774937063d6b622ea616bb..2786de218a3c7cae99b99d838c84450c5546ff44 100644 (file)
--- 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