summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/tlv320aic326x.c
diff options
context:
space:
mode:
authorNikesh Oswal <noswal@nvidia.com>2012-02-08 10:33:44 -0800
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 01:12:00 -0700
commit9ef9490f3b7575a8942c21bb1a206e212c151cbc (patch)
treea98a544934254cc7b96c5282eaf85341e29fa149 /sound/soc/codecs/tlv320aic326x.c
parent92b00c05e5bef4f67d4ccedd53dc0c4323ad8b7d (diff)
asoc: codecs: aic326x: enable the headset interrupts after jack registration
Change-Id: I682ccc9ba44f82b8acf836c1703d5d54419da54b Signed-off-by: Nikesh Oswal <noswal@nvidia.com> Reviewed-on: http://git-master/r/84535 Reviewed-by: Scott Peterson <speterson@nvidia.com> Rebase-Id: Ra9a55bac3bbda84008a65174407ad8947d2e1fac
Diffstat (limited to 'sound/soc/codecs/tlv320aic326x.c')
-rw-r--r--sound/soc/codecs/tlv320aic326x.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/tlv320aic326x.c b/sound/soc/codecs/tlv320aic326x.c
index e932853eb620..b2342146f6aa 100644
--- a/sound/soc/codecs/tlv320aic326x.c
+++ b/sound/soc/codecs/tlv320aic326x.c
@@ -2449,7 +2449,7 @@ static const struct aic3262_configs aic3262_reg_init[] = {
{0, BEEP_CNTL_R2, 0x04},
/* Interrupt config for headset detection */
- {0, INT1_CNTL, 0x80},
+ //{0, INT1_CNTL, 0x80}, /*Enable INT after Jack Registration*/
{0, INT_FMT, 0x40},
{0, GPIO1_IO_CNTL, 0x14},
/* enables debounce with 512ms*/
@@ -3720,10 +3720,10 @@ int aic326x_headset_detect(struct snd_soc_codec *codec,
struct snd_soc_jack *jack, int jack_type)
{
struct aic3262_priv *aic3262 = snd_soc_codec_get_drvdata(codec);
- aic3262->headset_jack = jack;
- /*TODO*/
- aic3262_jack_handler(aic3262->irq, codec);
+ aic3262->headset_jack = jack;
+ /*Enable the Headset Interrupts*/
+ snd_soc_write(codec, INT1_CNTL, 0x80);
return 0;
}