Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: codecs: lpass-wsa-macro: remove mix path event
All it does it disable the mix path clk bit, but this is already managed by
the WSA_RX_MIX0_CLK/WSA_RX_MIX1_CLK supplies.
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Tested-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>
Link: https://patch.msgid.link/20251117051523.16462-3-jonathan@marek.ca
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Jonathan Marek
and committed by
Mark Brown
c47f28ef
902f497a
+4
-42
+4
-42
sound/soc/codecs/lpass-wsa-macro.c
+4
-42
sound/soc/codecs/lpass-wsa-macro.c
···
1563
1563
return 0;
1564
1564
}
1565
1565
1566
-
static int wsa_macro_enable_mix_path(struct snd_soc_dapm_widget *w,
1567
-
struct snd_kcontrol *kcontrol, int event)
1568
-
{
1569
-
struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
1570
-
u16 path_reg;
1571
-
1572
-
switch (w->shift) {
1573
-
case WSA_MACRO_RX_MIX0:
1574
-
path_reg = CDC_WSA_RX0_RX_PATH_MIX_CTL;
1575
-
break;
1576
-
case WSA_MACRO_RX_MIX1:
1577
-
path_reg = CDC_WSA_RX1_RX_PATH_MIX_CTL;
1578
-
break;
1579
-
default:
1580
-
return 0;
1581
-
}
1582
-
1583
-
switch (event) {
1584
-
case SND_SOC_DAPM_POST_PMU:
1585
-
break;
1586
-
case SND_SOC_DAPM_POST_PMD:
1587
-
snd_soc_component_update_bits(component, path_reg,
1588
-
CDC_WSA_RX_PATH_MIX_CLK_EN_MASK,
1589
-
CDC_WSA_RX_PATH_MIX_CLK_DISABLE);
1590
-
break;
1591
-
}
1592
-
1593
-
return 0;
1594
-
}
1595
-
1596
1566
static void wsa_macro_hd2_control(struct snd_soc_component *component,
1597
1567
u16 reg, int event)
1598
1568
{
···
2443
2473
SND_SOC_DAPM_MUX("WSA_RX0 INP0", SND_SOC_NOPM, 0, 0, &rx0_prim_inp0_mux_v2_1),
2444
2474
SND_SOC_DAPM_MUX("WSA_RX0 INP1", SND_SOC_NOPM, 0, 0, &rx0_prim_inp1_mux_v2_1),
2445
2475
SND_SOC_DAPM_MUX("WSA_RX0 INP2", SND_SOC_NOPM, 0, 0, &rx0_prim_inp2_mux_v2_1),
2446
-
SND_SOC_DAPM_MUX_E("WSA_RX0 MIX INP", SND_SOC_NOPM, WSA_MACRO_RX_MIX0,
2447
-
0, &rx0_mix_mux_v2_1, wsa_macro_enable_mix_path,
2448
-
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
2476
+
SND_SOC_DAPM_MUX("WSA_RX0 MIX INP", SND_SOC_NOPM, 0, 0, &rx0_mix_mux_v2_1),
2449
2477
SND_SOC_DAPM_MUX("WSA_RX1 INP0", SND_SOC_NOPM, 0, 0, &rx1_prim_inp0_mux_v2_1),
2450
2478
SND_SOC_DAPM_MUX("WSA_RX1 INP1", SND_SOC_NOPM, 0, 0, &rx1_prim_inp1_mux_v2_1),
2451
2479
SND_SOC_DAPM_MUX("WSA_RX1 INP2", SND_SOC_NOPM, 0, 0, &rx1_prim_inp2_mux_v2_1),
2452
-
SND_SOC_DAPM_MUX_E("WSA_RX1 MIX INP", SND_SOC_NOPM, WSA_MACRO_RX_MIX1,
2453
-
0, &rx1_mix_mux_v2_1, wsa_macro_enable_mix_path,
2454
-
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
2480
+
SND_SOC_DAPM_MUX("WSA_RX1 MIX INP", SND_SOC_NOPM, 0, 0, &rx1_mix_mux_v2_1),
2455
2481
};
2456
2482
2457
2483
static const struct snd_soc_dapm_widget wsa_macro_dapm_widgets_v2_5[] = {
2458
2484
SND_SOC_DAPM_MUX("WSA_RX0 INP0", SND_SOC_NOPM, 0, 0, &rx0_prim_inp0_mux_v2_5),
2459
2485
SND_SOC_DAPM_MUX("WSA_RX0 INP1", SND_SOC_NOPM, 0, 0, &rx0_prim_inp1_mux_v2_5),
2460
2486
SND_SOC_DAPM_MUX("WSA_RX0 INP2", SND_SOC_NOPM, 0, 0, &rx0_prim_inp2_mux_v2_5),
2461
-
SND_SOC_DAPM_MUX_E("WSA_RX0 MIX INP", SND_SOC_NOPM, WSA_MACRO_RX_MIX0,
2462
-
0, &rx0_mix_mux_v2_5, wsa_macro_enable_mix_path,
2463
-
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
2487
+
SND_SOC_DAPM_MUX("WSA_RX0 MIX INP", SND_SOC_NOPM, 0, 0, &rx0_mix_mux_v2_5),
2464
2488
SND_SOC_DAPM_MUX("WSA_RX1 INP0", SND_SOC_NOPM, 0, 0, &rx1_prim_inp0_mux_v2_5),
2465
2489
SND_SOC_DAPM_MUX("WSA_RX1 INP1", SND_SOC_NOPM, 0, 0, &rx1_prim_inp1_mux_v2_5),
2466
2490
SND_SOC_DAPM_MUX("WSA_RX1 INP2", SND_SOC_NOPM, 0, 0, &rx1_prim_inp2_mux_v2_5),
2467
-
SND_SOC_DAPM_MUX_E("WSA_RX1 MIX INP", SND_SOC_NOPM, WSA_MACRO_RX_MIX1,
2468
-
0, &rx1_mix_mux_v2_5, wsa_macro_enable_mix_path,
2469
-
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
2491
+
SND_SOC_DAPM_MUX("WSA_RX1 MIX INP", SND_SOC_NOPM, 0, 0, &rx1_mix_mux_v2_5),
2470
2492
};
2471
2493
2472
2494
static const struct snd_soc_dapm_route wsa_audio_map[] = {