Skip to content

Commit

Permalink
mfd: Fix twl6040 revision information
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Peter Ujfalusi authored and Samuel Ortiz committed Jul 24, 2012
1 parent 9247135 commit be4ac00
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions include/linux/mfd/twl6040.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/codecs/twl6040.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit be4ac00

Please sign in to comment.