From 6afcdf496b97501eb6eccd1efade21025bf45a9f Mon Sep 17 00:00:00 2001 From: liaohj Date: Tue, 10 Sep 2019 15:29:43 +0800 Subject: [PATCH] :ti2558 :disable smart pa irq pin pullup 1.disable smart pa irq pin pullup - for smart pa irq pin, need defalut pullup - currently,smart pa internal pull up and ap side donot pull up. - it is ok for smart pa interrupt,but because gpio 100 is for boot config - pin,so when warm reset, smart pa internal pull up will cause to - enter 9008,no ramdump. - change to ap side irq pin pullup,and ti2558 do not internal pullup. 2.fix right speaker no interrupt. Change-Id: I823c10d7354c4a37014d879542fc2c7937600996 Signed-off-by: liaohj Reviewed-on: https://gerrit.mot.com/1418606 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wanlong Zhou Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- sound/soc/codecs/tas2562-codec.c | 2 +- sound/soc/codecs/tas2562-regmap.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/tas2562-codec.c b/sound/soc/codecs/tas2562-codec.c index bdf1bf4c5b06..19597fd0d00d 100644 --- a/sound/soc/codecs/tas2562-codec.c +++ b/sound/soc/codecs/tas2562-codec.c @@ -973,7 +973,7 @@ static int tas2562_load_init(struct tas2562_priv *p_tas2562) #endif ret = p_tas2562->write(p_tas2562, channel_both, - TAS2562_MISCCONFIGURATIONREG0, 0xcf); + TAS2562_MISCCONFIGURATIONREG0, 0xc7); if (ret < 0) return ret; if(p_tas2562->mn_channels == 2) { diff --git a/sound/soc/codecs/tas2562-regmap.c b/sound/soc/codecs/tas2562-regmap.c index 286fa7874026..66e2861e65f2 100644 --- a/sound/soc/codecs/tas2562-regmap.c +++ b/sound/soc/codecs/tas2562-regmap.c @@ -590,7 +590,7 @@ static void irq_work_routine(struct work_struct *work) goto reload; dev_dbg(p_tas2562->dev, "IRQ status : 0x%x, 0x%x, 0x%x, 0x%x\n", - nDevInt3Status, nDevInt4Status, + nDevInt1Status, nDevInt2Status, nDevInt3Status, nDevInt4Status); if (((nDevInt1Status & 0x7) != 0) @@ -749,12 +749,12 @@ static void irq_work_routine(struct work_struct *work) p_tas2562->mn_err_code &= ~ERROR_CLASSD_PWR; } - n_result = p_tas2562->write(p_tas2562, channel_left, + n_result = p_tas2562->write(p_tas2562, channel_both, TAS2562_INTERRUPTMASKREG0, 0xf8); if (n_result < 0) goto reload; - n_result = p_tas2562->write(p_tas2562, channel_left, + n_result = p_tas2562->write(p_tas2562, channel_both, TAS2562_INTERRUPTMASKREG1, 0xb1); if (n_result < 0) goto reload; @@ -1037,7 +1037,7 @@ static int tas2562_i2c_probe(struct i2c_client *p_client, } gpio_direction_input(p_tas2562->mn_irq_gpio); tas2562_dev_write(p_tas2562, channel_both, - TAS2562_MISCCONFIGURATIONREG0, 0xce); + TAS2562_MISCCONFIGURATIONREG0, 0xc6); p_tas2562->mn_irq = gpio_to_irq(p_tas2562->mn_irq_gpio); dev_info(p_tas2562->dev, "irq = %d\n", p_tas2562->mn_irq); @@ -1064,7 +1064,7 @@ static int tas2562_i2c_probe(struct i2c_client *p_client, } gpio_direction_input(p_tas2562->mn_irq_gpio2); tas2562_dev_write(p_tas2562, channel_both, - TAS2562_MISCCONFIGURATIONREG0, 0xce); + TAS2562_MISCCONFIGURATIONREG0, 0xc6); p_tas2562->mn_irq2 = gpio_to_irq(p_tas2562->mn_irq_gpio2); dev_info(p_tas2562->dev, "irq = %d\n", p_tas2562->mn_irq2);