Merge "asoc: get and put for TERT_TDM_TX_0 ADM channels" (bccb3b18) · Commits · e / devices / android_kernel_fairphone_FP5

asoc/msm-pcm-routing-v2.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -3780,7 +3780,7 @@ static int msm_routing_lsm_func_put(struct snd_kcontrol *kcontrol,
		return afe_port_set_mad_type(port_id, mad_type);
		}

		static const char *const adm_override_chs_text[] = {"Zero", "One", "Two"};
		static const char *const adm_override_chs_text[] = {"Zero", "One", "Two", "Three", "Four"};

		static SOC_ENUM_SINGLE_EXT_DECL(adm_override_chs,
		adm_override_chs_text);
		@@ -3795,6 +3795,8 @@ static int msm_routing_adm_get_backend_idx(struct snd_kcontrol *kcontrol)
		backend_id = MSM_BACKEND_DAI_SLIMBUS_9_TX;
		} else if (strnstr(kcontrol->id.name, "SLIM7_TX", sizeof("SLIM7_TX"))) {
		backend_id = MSM_BACKEND_DAI_SLIMBUS_7_TX;
		} else if (strnstr(kcontrol->id.name, "TERT_TDM_TX_0", sizeof("TERT_TDM_TX_0"))) {
		backend_id = MSM_BACKEND_DAI_TERT_TDM_TX_0;
		} else {
		pr_err("%s: unsupported backend id: %s",
		__func__, kcontrol->id.name);
		@@ -3851,6 +3853,9 @@ static const struct snd_kcontrol_new adm_channel_config_controls[] = {
		SOC_ENUM_EXT("SLIM7_TX ADM Channels", adm_override_chs,
		msm_routing_adm_channel_config_get,
		msm_routing_adm_channel_config_put),
		SOC_ENUM_EXT("TERT_TDM_TX_0 ADM Channels", adm_override_chs,
		msm_routing_adm_channel_config_get,
		msm_routing_adm_channel_config_put),
		};

		static int msm_routing_slim_0_rx_aanc_mux_get(struct snd_kcontrol *kcontrol,