ASoC: codecs: lpass-wsa-macro: add RX4/RX5/RX6/RX7/RX8
Subsystems (4)
PATCH v2 1/1 ASoC: codecs: lpass-wsa-macro: add RX4/RX5/RX6/RX7/RX8
This allows playback using the WSA_2CH AIF, which feeds RX4 and RX5 on both WSA and WSA2.
RX6/RX7/RX8 can be tested with the regular WSA AIF (the 3rd intf is RX8, the 5th intf is RX6/7).
Signed-off-by Jonathan Marek <[email protected]>
---
v2: added RX6/RX7/RX8
this depends on the other patches from the original series
sound/soc/codecs/lpass-wsa-macro.c | 96 +++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 2 deletions(-)
sound/soc/codecs/lpass-wsa-macro.c +94 -2
@@ -300,6 +300,11 @@ enum {WSA_MACRO_RX_MIX ,WSA_MACRO_RX_MIX0 =WSA_MACRO_RX_MIX ,WSA_MACRO_RX_MIX1 , +WSA_MACRO_RX4 , +WSA_MACRO_RX5 , +WSA_MACRO_RX6 , +WSA_MACRO_RX7 , +WSA_MACRO_RX8 , WSA_MACRO_RX_MAX, };
@@ -2228,6 +2233,16 @@ static const struct snd_kcontrol_new rx_mux[WSA_MACRO_RX_MAX] = { wsa_macro_rx_mux_get, wsa_macro_rx_mux_put),SOC_DAPM_ENUM_EXT ("WSA RX_MIX1 Mux" , rx_mux_enum, wsa_macro_rx_mux_get, wsa_macro_rx_mux_put), +SOC_DAPM_ENUM_EXT ("WSA RX4 Mux" , rx_mux_enum, + wsa_macro_rx_mux_get, wsa_macro_rx_mux_put), +SOC_DAPM_ENUM_EXT ("WSA RX5 Mux" , rx_mux_enum, + wsa_macro_rx_mux_get, wsa_macro_rx_mux_put), +SOC_DAPM_ENUM_EXT ("WSA RX6 Mux" , rx_mux_enum, + wsa_macro_rx_mux_get, wsa_macro_rx_mux_put), +SOC_DAPM_ENUM_EXT ("WSA RX7 Mux" , rx_mux_enum, + wsa_macro_rx_mux_get, wsa_macro_rx_mux_put), +SOC_DAPM_ENUM_EXT ("WSA RX8 Mux" , rx_mux_enum, + wsa_macro_rx_mux_get, wsa_macro_rx_mux_put), }; static int wsa_macro_vi_feed_mixer_get(struct snd_kcontrol *kcontrol,
@@ -2410,6 +2425,16 @@ static const struct snd_soc_dapm_widget wsa_macro_dapm_widgets_v2_5[] = {SND_SOC_DAPM_MUX ("WSA_RX1 INP1" ,SND_SOC_NOPM ,0 ,0 , &rx1_prim_inp1_mux_v2_5),SND_SOC_DAPM_MUX ("WSA_RX1 INP2" ,SND_SOC_NOPM ,0 ,0 , &rx1_prim_inp2_mux_v2_5),SND_SOC_DAPM_MUX ("WSA_RX1 MIX INP" ,SND_SOC_NOPM ,0 ,0 , &rx1_mix_mux_v2_5), +SND_SOC_DAPM_MIXER ("WSA RX4" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ), +SND_SOC_DAPM_MIXER ("WSA RX5" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ), +SND_SOC_DAPM_MIXER ("WSA RX6" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ), +SND_SOC_DAPM_MIXER ("WSA RX7" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ), +SND_SOC_DAPM_MIXER ("WSA RX8" ,SND_SOC_NOPM ,0 ,0 ,NULL ,0 ), +SND_SOC_DAPM_MUX ("WSA RX4 MUX" ,SND_SOC_NOPM ,WSA_MACRO_RX4 ,0 , &rx_mux[WSA_MACRO_RX4 ]), +SND_SOC_DAPM_MUX ("WSA RX5 MUX" ,SND_SOC_NOPM ,WSA_MACRO_RX5 ,0 , &rx_mux[WSA_MACRO_RX5 ]), +SND_SOC_DAPM_MUX ("WSA RX6 MUX" ,SND_SOC_NOPM ,WSA_MACRO_RX6 ,0 , &rx_mux[WSA_MACRO_RX6 ]), +SND_SOC_DAPM_MUX ("WSA RX7 MUX" ,SND_SOC_NOPM ,WSA_MACRO_RX7 ,0 , &rx_mux[WSA_MACRO_RX7 ]), + SND_SOC_DAPM_MUX("WSA RX8 MUX", SND_SOC_NOPM, WSA_MACRO_RX8, 0, &rx_mux[WSA_MACRO_RX8]), }; static const struct snd_soc_dapm_route wsa_audio_map[] = {
@@ -2529,6 +2554,64 @@ static const struct snd_soc_dapm_route wsa_audio_map[] = { {"WSA_SPK2 OUT", NULL, "WSA_MCLK"}, }; +static const struct snd_soc_dapm_route wsa_audio_map_v2_5[] = { + {"WSA RX4 MUX" ,"AIF1_PB" ,"WSA AIF1 PB" }, + {"WSA RX5 MUX" ,"AIF1_PB" ,"WSA AIF1 PB" }, + {"WSA RX6 MUX" ,"AIF1_PB" ,"WSA AIF1 PB" }, + {"WSA RX7 MUX" ,"AIF1_PB" ,"WSA AIF1 PB" }, + {"WSA RX8 MUX" ,"AIF1_PB" ,"WSA AIF1 PB" }, + {"WSA RX4 MUX" ,"AIF_MIX1_PB" ,"WSA AIF_MIX1 PB" }, + {"WSA RX5 MUX" ,"AIF_MIX1_PB" ,"WSA AIF_MIX1 PB" }, + {"WSA RX6 MUX" ,"AIF_MIX1_PB" ,"WSA AIF_MIX1 PB" }, + {"WSA RX7 MUX" ,"AIF_MIX1_PB" ,"WSA AIF_MIX1 PB" }, + {"WSA RX8 MUX" ,"AIF_MIX1_PB" ,"WSA AIF_MIX1 PB" }, + {"WSA RX4" ,NULL ,"WSA RX4 MUX" }, + {"WSA RX5" ,NULL ,"WSA RX5 MUX" }, + {"WSA RX6" ,NULL ,"WSA RX6 MUX" }, + {"WSA RX7" ,NULL ,"WSA RX7 MUX" }, + {"WSA RX8" ,NULL ,"WSA RX8 MUX" }, + {"WSA_RX0 INP0" ,"RX4" ,"WSA RX4" }, + {"WSA_RX0 INP0" ,"RX5" ,"WSA RX5" }, + {"WSA_RX0 INP0" ,"RX6" ,"WSA RX6" }, + {"WSA_RX0 INP0" ,"RX7" ,"WSA RX7" }, + {"WSA_RX0 INP0" ,"RX8" ,"WSA RX8" }, + {"WSA_RX0 INP1" ,"RX4" ,"WSA RX4" }, + {"WSA_RX0 INP1" ,"RX5" ,"WSA RX5" }, + {"WSA_RX0 INP1" ,"RX6" ,"WSA RX6" }, + {"WSA_RX0 INP1" ,"RX7" ,"WSA RX7" }, + {"WSA_RX0 INP1" ,"RX8" ,"WSA RX8" }, + {"WSA_RX0 INP2" ,"RX4" ,"WSA RX4" }, + {"WSA_RX0 INP2" ,"RX5" ,"WSA RX5" }, + {"WSA_RX0 INP2" ,"RX6" ,"WSA RX6" }, + {"WSA_RX0 INP2" ,"RX7" ,"WSA RX7" }, + {"WSA_RX0 INP2" ,"RX8" ,"WSA RX8" }, + {"WSA_RX0 MIX INP" ,"RX4" ,"WSA RX4" }, + {"WSA_RX0 MIX INP" ,"RX5" ,"WSA RX5" }, + {"WSA_RX0 MIX INP" ,"RX6" ,"WSA RX6" }, + {"WSA_RX0 MIX INP" ,"RX7" ,"WSA RX7" }, + {"WSA_RX0 MIX INP" ,"RX8" ,"WSA RX8" }, + {"WSA_RX1 INP0" ,"RX4" ,"WSA RX4" }, + {"WSA_RX1 INP0" ,"RX5" ,"WSA RX5" }, + {"WSA_RX1 INP0" ,"RX6" ,"WSA RX6" }, + {"WSA_RX1 INP0" ,"RX7" ,"WSA RX7" }, + {"WSA_RX1 INP0" ,"RX8" ,"WSA RX8" }, + {"WSA_RX1 INP1" ,"RX4" ,"WSA RX4" }, + {"WSA_RX1 INP1" ,"RX5" ,"WSA RX5" }, + {"WSA_RX1 INP1" ,"RX6" ,"WSA RX6" }, + {"WSA_RX1 INP1" ,"RX7" ,"WSA RX7" }, + {"WSA_RX1 INP1" ,"RX8" ,"WSA RX8" }, + {"WSA_RX1 INP2" ,"RX4" ,"WSA RX4" }, + {"WSA_RX1 INP2" ,"RX5" ,"WSA RX5" }, + {"WSA_RX1 INP2" ,"RX6" ,"WSA RX6" }, + {"WSA_RX1 INP2" ,"RX7" ,"WSA RX7" }, + {"WSA_RX1 INP2" ,"RX8" ,"WSA RX8" }, + {"WSA_RX1 MIX INP" ,"RX4" ,"WSA RX4" }, + {"WSA_RX1 MIX INP" ,"RX5" ,"WSA RX5" }, + {"WSA_RX1 MIX INP" ,"RX6" ,"WSA RX6" }, + {"WSA_RX1 MIX INP" ,"RX7" ,"WSA RX7" }, + {"WSA_RX1 MIX INP" ,"RX8" ,"WSA RX8" }, +}; +static int wsa_swrm_clock (struct wsa_macro *wsa,bool enable) {struct regmap *regmap = wsa->regmap;
@@ -2562,7 +2645,9 @@ static int wsa_macro_component_probe(struct snd_soc_component *comp)struct snd_soc_dapm_context *dapm =snd_soc_component_get_dapm (comp);struct wsa_macro *wsa =snd_soc_component_get_drvdata (comp);const struct snd_soc_dapm_widget *widgets; -unsigned int num_widgets; +const struct snd_soc_dapm_route *routes; +unsigned int num_widgets, num_routes; +int ret;snd_soc_component_init_regmap (comp, wsa->regmap);
@@ -2587,6 +2672,7 @@ static int wsa_macro_component_probe(struct snd_soc_component *comp)case LPASS_CODEC_VERSION_2_1 : widgets = wsa_macro_dapm_widgets_v2_1; num_widgets =ARRAY_SIZE (wsa_macro_dapm_widgets_v2_1); + num_routes =0 ;break ;case LPASS_CODEC_VERSION_2_5 :case LPASS_CODEC_VERSION_2_6 :
@@ -2595,12 +2681,18 @@ static int wsa_macro_component_probe(struct snd_soc_component *comp)case LPASS_CODEC_VERSION_2_9 : widgets = wsa_macro_dapm_widgets_v2_5; num_widgets =ARRAY_SIZE (wsa_macro_dapm_widgets_v2_5); + routes = wsa_audio_map_v2_5; + num_routes =ARRAY_SIZE (wsa_audio_map_v2_5);break ;default :return -EINVAL ; } -return snd_soc_dapm_new_controls (dapm, widgets, num_widgets); + ret =snd_soc_dapm_new_controls (dapm, widgets, num_widgets); +if (ret) +return ret; + +return snd_soc_dapm_add_routes (dapm, routes, num_routes); }static int swclk_gate_enable (struct clk_hw *hw)
Signature · 1 line
2.51.0
Mark Brown
maintainerQuoted 5 lines · Jonathan Marek
This allows playback using the
WSA_2CHAIF, which feeds RX4 and RX5 on both WSA and WSA2.RX6/RX7/RX8 can be tested with the regular WSA AIF (the 3rd intf is RX8, the 5th intf is RX6/7).
This doesn't apply against current code, please check and resend.