diff --git a/asoc/codecs/bolero/bolero-cdc.c b/asoc/codecs/bolero/bolero-cdc.c index c46bcad0cd..8843fdfc12 100644 --- a/asoc/codecs/bolero/bolero-cdc.c +++ b/asoc/codecs/bolero/bolero-cdc.c @@ -735,7 +735,7 @@ void bolero_unregister_macro(struct device *dev, u16 macro_id) } EXPORT_SYMBOL(bolero_unregister_macro); -void bolero_wsa_pa_on(struct device *dev) +void bolero_wsa_pa_on(struct device *dev, bool adie_lb) { struct bolero_priv *priv; @@ -753,8 +753,12 @@ void bolero_wsa_pa_on(struct device *dev) dev_err(dev, "%s: priv is null\n", __func__); return; } - - bolero_cdc_notifier_call(priv, BOLERO_WCD_EVT_PA_ON_POST_FSCLK); + if (adie_lb) + bolero_cdc_notifier_call(priv, + BOLERO_WCD_EVT_PA_ON_POST_FSCLK_ADIE_LB); + else + bolero_cdc_notifier_call(priv, + BOLERO_WCD_EVT_PA_ON_POST_FSCLK); } EXPORT_SYMBOL(bolero_wsa_pa_on); diff --git a/asoc/codecs/bolero/bolero-cdc.h b/asoc/codecs/bolero/bolero-cdc.h index 1f21fd69c8..0d941d4213 100644 --- a/asoc/codecs/bolero/bolero-cdc.h +++ b/asoc/codecs/bolero/bolero-cdc.h @@ -105,7 +105,7 @@ int bolero_set_port_map(struct snd_soc_component *component, u32 size, void *dat int bolero_tx_clk_switch(struct snd_soc_component *component, int clk_src); int bolero_register_event_listener(struct snd_soc_component *component, bool enable); -void bolero_wsa_pa_on(struct device *dev); +void bolero_wsa_pa_on(struct device *dev, bool adie_lb); bool bolero_check_core_votes(struct device *dev); int bolero_tx_mclk_enable(struct snd_soc_component *c, bool enable); int bolero_get_version(struct device *dev); @@ -183,7 +183,7 @@ static inline int bolero_register_event_listener( return 0; } -static void bolero_wsa_pa_on(struct device *dev) +static void bolero_wsa_pa_on(struct device *dev, bool adie_lb) { } diff --git a/asoc/codecs/bolero/internal.h b/asoc/codecs/bolero/internal.h index 503443158c..d3a072c9ce 100644 --- a/asoc/codecs/bolero/internal.h +++ b/asoc/codecs/bolero/internal.h @@ -16,6 +16,7 @@ enum { BOLERO_WCD_EVT_SSR_DOWN, BOLERO_WCD_EVT_SSR_UP, BOLERO_WCD_EVT_PA_ON_POST_FSCLK, + BOLERO_WCD_EVT_PA_ON_POST_FSCLK_ADIE_LB, }; enum { diff --git a/asoc/codecs/bolero/wsa-macro.c b/asoc/codecs/bolero/wsa-macro.c index 5c59d6de4f..7080143c95 100644 --- a/asoc/codecs/bolero/wsa-macro.c +++ b/asoc/codecs/bolero/wsa-macro.c @@ -845,6 +845,7 @@ static int wsa_macro_digital_mute(struct snd_soc_dai *dai, int mute) uint16_t j = 0, reg = 0, mix_reg = 0, dsm_reg = 0; u16 int_mux_cfg0 = 0, int_mux_cfg1 = 0; u8 int_mux_cfg0_val = 0, int_mux_cfg1_val = 0; + bool adie_lb = false; if (mute) return 0; @@ -881,7 +882,7 @@ static int wsa_macro_digital_mute(struct snd_soc_dai *dai, int mute) } } } - bolero_wsa_pa_on(wsa_dev); + bolero_wsa_pa_on(wsa_dev, adie_lb); break; default: break; @@ -1472,6 +1473,7 @@ static int wsa_macro_enable_main_path(struct snd_soc_dapm_widget *w, u16 reg = 0; struct device *wsa_dev = NULL; struct wsa_macro_priv *wsa_priv = NULL; + bool adie_lb = false; if (!wsa_macro_get_data(component, &wsa_dev, &wsa_priv, __func__)) return -EINVAL; @@ -1482,9 +1484,10 @@ static int wsa_macro_enable_main_path(struct snd_soc_dapm_widget *w, switch (event) { case SND_SOC_DAPM_PRE_PMU: if (wsa_macro_adie_lb(component, w->shift)) { + adie_lb = true; snd_soc_component_update_bits(component, reg, 0x20, 0x20); - bolero_wsa_pa_on(wsa_dev); + bolero_wsa_pa_on(wsa_dev, adie_lb); } break; default: @@ -2566,10 +2569,10 @@ static const struct snd_soc_dapm_widget wsa_macro_dapm_widgets[] = { SND_SOC_DAPM_MUX_E("WSA_RX1 MIX INP", SND_SOC_NOPM, 0, 0, &rx1_mix_mux, wsa_macro_enable_mix_path, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), - SND_SOC_DAPM_MIXER_E("WSA_RX INT0 MIX", SND_SOC_NOPM, + SND_SOC_DAPM_PGA_E("WSA_RX INT0 MIX", SND_SOC_NOPM, 0, 0, NULL, 0, wsa_macro_enable_main_path, SND_SOC_DAPM_PRE_PMU), - SND_SOC_DAPM_MIXER_E("WSA_RX INT1 MIX", SND_SOC_NOPM, + SND_SOC_DAPM_PGA_E("WSA_RX INT1 MIX", SND_SOC_NOPM, 1, 0, NULL, 0, wsa_macro_enable_main_path, SND_SOC_DAPM_PRE_PMU), SND_SOC_DAPM_MIXER("WSA_RX INT0 SEC MIX", SND_SOC_NOPM, 0, 0, NULL, 0), diff --git a/asoc/codecs/wsa881x.c b/asoc/codecs/wsa881x.c index 401607731e..04aad461c3 100644 --- a/asoc/codecs/wsa881x.c +++ b/asoc/codecs/wsa881x.c @@ -118,6 +118,7 @@ enum { BOLERO_WSA_EVT_SSR_DOWN, BOLERO_WSA_EVT_SSR_UP, BOLERO_WSA_EVT_PA_ON_POST_FSCLK, + BOLERO_WSA_EVT_PA_ON_POST_FSCLK_ADIE_LB, }; struct wsa_ctrl_platform_data { @@ -1400,6 +1401,7 @@ static int wsa881x_event_notify(struct notifier_block *nb, 0x80, 0x00); break; case BOLERO_WSA_EVT_PA_ON_POST_FSCLK: + case BOLERO_WSA_EVT_PA_ON_POST_FSCLK_ADIE_LB: if ((snd_soc_component_read32(wsa881x->component, WSA881X_SPKR_DAC_CTL) & 0x80) == 0x80) snd_soc_component_update_bits(wsa881x->component, diff --git a/asoc/codecs/wsa883x/internal.h b/asoc/codecs/wsa883x/internal.h index 3dc362784d..2be12f7171 100644 --- a/asoc/codecs/wsa883x/internal.h +++ b/asoc/codecs/wsa883x/internal.h @@ -66,6 +66,7 @@ enum { BOLERO_WSA_EVT_SSR_DOWN, BOLERO_WSA_EVT_SSR_UP, BOLERO_WSA_EVT_PA_ON_POST_FSCLK, + BOLERO_WSA_EVT_PA_ON_POST_FSCLK_ADIE_LB, }; struct wsa_ctrl_platform_data { diff --git a/asoc/codecs/wsa883x/wsa883x.c b/asoc/codecs/wsa883x/wsa883x.c index 8993c102b9..b5db7dcdae 100644 --- a/asoc/codecs/wsa883x/wsa883x.c +++ b/asoc/codecs/wsa883x/wsa883x.c @@ -134,6 +134,7 @@ enum { enum { SPKR_STATUS = 0, WSA_SUPPLIES_LPM_MODE, + SPKR_ADIE_LB, }; enum { @@ -962,6 +963,7 @@ static int wsa883x_enable_swr_dac_port(struct snd_soc_dapm_widget *w, &port_type[0]); break; case SND_SOC_DAPM_POST_PMU: + set_bit(SPKR_STATUS, &wsa883x->status_mask); break; case SND_SOC_DAPM_PRE_PMD: wsa883x_set_port(component, SWR_DAC_PORT, @@ -1020,7 +1022,9 @@ static int wsa883x_spkr_event(struct snd_soc_dapm_widget *w, /* Force remove group */ swr_remove_from_group(wsa883x->swr_slave, wsa883x->swr_slave->dev_num); - set_bit(SPKR_STATUS, &wsa883x->status_mask); + if (test_bit(SPKR_ADIE_LB, &wsa883x->status_mask)) + snd_soc_component_update_bits(component, + WSA883X_PA_FSM_CTL, 0x01, 0x01); break; case SND_SOC_DAPM_PRE_PMD: snd_soc_component_update_bits(component, WSA883X_PA_FSM_CTL, @@ -1028,6 +1032,7 @@ static int wsa883x_spkr_event(struct snd_soc_dapm_widget *w, wcd_disable_irq(&wsa883x->irq_info, WSA883X_IRQ_INT_PDM_WD); wcd_disable_irq(&wsa883x->irq_info, WSA883X_IRQ_INT_UVLO); clear_bit(SPKR_STATUS, &wsa883x->status_mask); + clear_bit(SPKR_ADIE_LB, &wsa883x->status_mask); break; } return 0; @@ -1380,6 +1385,10 @@ static int wsa883x_event_notify(struct notifier_block *nb, WSA883X_PA_FSM_CTL, 0x01, 0x01); break; + case BOLERO_WSA_EVT_PA_ON_POST_FSCLK_ADIE_LB: + if (test_bit(SPKR_STATUS, &wsa883x->status_mask)) + set_bit(SPKR_ADIE_LB, &wsa883x->status_mask); + break; default: dev_dbg(wsa883x->dev, "%s: unknown event %d\n", __func__, event);