| Message ID | 20210525090822.64577-4-tanureal@opensource.cirrus.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0e91438ff7045d89b3e82bcef90fadd002eb1c74 |
| Headers | show |
| Series | [1/4] ASoC: cs42l42: Fix 1536000 Bit Clock instability | expand |
On 25/05/2021 10:08, Lucas Tanure wrote: > Jack must be connected before reporting button events and > if the jack is disconnected button release must be reported > > Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com> > --- > sound/soc/codecs/cs42l42.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c > index 8260de81b56c..eff013f295be 100644 > --- a/sound/soc/codecs/cs42l42.c > +++ b/sound/soc/codecs/cs42l42.c > @@ -1478,6 +1478,10 @@ static irqreturn_t cs42l42_irq_thread(int irq, void *data) > default: > break; > } > + snd_soc_jack_report(cs42l42->jack, 0, > + SND_JACK_BTN_0 | SND_JACK_BTN_1 | > + SND_JACK_BTN_2 | SND_JACK_BTN_3); > + > dev_dbg(component->dev, "Unplug event\n"); > } > break; > @@ -1489,7 +1493,7 @@ static irqreturn_t cs42l42_irq_thread(int irq, void *data) > } > > /* Check button detect status */ > - if ((~masks[7]) & irq_params_table[7].mask) { > + if (cs42l42->plug_state == CS42L42_TS_PLUG && ((~masks[7]) & irq_params_table[7].mask)) { > if (!(current_button_status & > CS42L42_M_HSBIAS_HIZ_MASK)) { > > Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index 8260de81b56c..eff013f295be 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -1478,6 +1478,10 @@ static irqreturn_t cs42l42_irq_thread(int irq, void *data) default: break; } + snd_soc_jack_report(cs42l42->jack, 0, + SND_JACK_BTN_0 | SND_JACK_BTN_1 | + SND_JACK_BTN_2 | SND_JACK_BTN_3); + dev_dbg(component->dev, "Unplug event\n"); } break; @@ -1489,7 +1493,7 @@ static irqreturn_t cs42l42_irq_thread(int irq, void *data) } /* Check button detect status */ - if ((~masks[7]) & irq_params_table[7].mask) { + if (cs42l42->plug_state == CS42L42_TS_PLUG && ((~masks[7]) & irq_params_table[7].mask)) { if (!(current_button_status & CS42L42_M_HSBIAS_HIZ_MASK)) {
Jack must be connected before reporting button events and if the jack is disconnected button release must be reported Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com> --- sound/soc/codecs/cs42l42.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)