Merge "ASoC: msm: qdsp6v2: Add INT3 Tx port for LSM" (45ad5727) · Commits · e / devices / android_kernel_sony_msm8998

sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c

+55 −13

Original line number	Diff line number	Diff line
		@@ -101,12 +101,15 @@ enum {
		#define TERT_MI2S_TX_TEXT "TERT_MI2S_TX"
		#define QUAT_MI2S_TX_TEXT "QUAT_MI2S_TX"
		#define ADM_LSM_TX_TEXT "ADM_LSM_TX"
		#define INT3_MI2S_TX_TEXT "INT3_MI2S_TX"

		#define LSM_FUNCTION_TEXT "LSM Function"
		static const char * const lsm_port_text[] = {
		"None",
		SLIMBUS_0_TX_TEXT, SLIMBUS_1_TX_TEXT, SLIMBUS_2_TX_TEXT,
		SLIMBUS_3_TX_TEXT, SLIMBUS_4_TX_TEXT, SLIMBUS_5_TX_TEXT,
		TERT_MI2S_TX_TEXT, QUAT_MI2S_TX_TEXT, ADM_LSM_TX_TEXT
		TERT_MI2S_TX_TEXT, QUAT_MI2S_TX_TEXT, ADM_LSM_TX_TEXT,
		INT3_MI2S_TX_TEXT, SLIMBUS_TX_VI_TEXT
		};

		struct msm_pcm_route_bdai_pp_params {
		@@ -2309,6 +2312,9 @@ static int msm_routing_lsm_port_put(struct snd_kcontrol *kcontrol,
		case 9:
		lsm_port = ADM_LSM_PORT_ID;
		break;
		case 10:
		lsm_port = AFE_PORT_ID_INT3_MI2S_TX;
		break;
		default:
		pr_err("Default lsm port");
		break;
		@@ -2337,17 +2343,21 @@ static int msm_routing_lsm_func_get(struct snd_kcontrol *kcontrol,
		return -EINVAL;
		}

		/Check for Tertiary TX port/
		if (!strcmp(kcontrol->id.name, lsm_port_text[7])) {
		ucontrol->value.integer.value[0] = MADSWAUDIO;
		return 0;
		}

		port_id = i * 2 + 1 + SLIMBUS_0_RX;

		if (!strcmp(kcontrol->id.name, lsm_port_text[8]))
		/Check for Tertiary/Quaternary/INT3 TX port/
		if (strnstr(kcontrol->id.name, lsm_port_text[7],
		strlen(lsm_port_text[7])))
		port_id = AFE_PORT_ID_TERTIARY_MI2S_TX;

		if (strnstr(kcontrol->id.name, lsm_port_text[8],
		strlen(lsm_port_text[8])))
		port_id = AFE_PORT_ID_QUATERNARY_MI2S_TX;

		if (strnstr(kcontrol->id.name, lsm_port_text[10],
		strlen(lsm_port_text[10])))
		port_id = AFE_PORT_ID_INT3_MI2S_TX;

		mad_type = afe_port_get_mad_type(port_id);
		pr_debug("%s: port_id 0x%x, mad_type %d\n", __func__, port_id,
		mad_type);
		@@ -2414,17 +2424,19 @@ static int msm_routing_lsm_func_put(struct snd_kcontrol *kcontrol,
		return -EINVAL;
		}

		/Check for Tertiary TX port/
		/Check for Tertiary/Quaternary/INT3 TX port/
		if (strnstr(kcontrol->id.name, lsm_port_text[7],
		strlen(lsm_port_text[7]))) {
		strlen(lsm_port_text[7])))
		port_id = AFE_PORT_ID_TERTIARY_MI2S_TX;
		mad_type = MAD_SW_AUDIO;
		}

		if (strnstr(kcontrol->id.name, lsm_port_text[8],
		strlen(lsm_port_text[8])))
		port_id = AFE_PORT_ID_QUATERNARY_MI2S_TX;

		if (strnstr(kcontrol->id.name, lsm_port_text[10],
		strlen(lsm_port_text[10])))
		port_id = AFE_PORT_ID_INT3_MI2S_TX;

		pr_debug("%s: port_id 0x%x, mad_type %d\n", __func__, port_id,
		mad_type);
		return afe_port_set_mad_type(port_id, mad_type);
		@@ -9227,6 +9239,9 @@ static const struct snd_kcontrol_new lsm1_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,
		MSM_FRONTEND_DAI_LSM1, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		SOC_SINGLE_EXT("INT3_MI2S_TX", MSM_BACKEND_DAI_INT3_MI2S_TX,
		MSM_FRONTEND_DAI_LSM1, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		};

		static const struct snd_kcontrol_new lsm2_mixer_controls[] = {
		@@ -9251,6 +9266,9 @@ static const struct snd_kcontrol_new lsm2_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,
		MSM_FRONTEND_DAI_LSM2, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		SOC_SINGLE_EXT("INT3_MI2S_TX", MSM_BACKEND_DAI_INT3_MI2S_TX,
		MSM_FRONTEND_DAI_LSM2, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		};

		static const struct snd_kcontrol_new lsm3_mixer_controls[] = {
		@@ -9275,6 +9293,9 @@ static const struct snd_kcontrol_new lsm3_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,
		MSM_FRONTEND_DAI_LSM3, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		SOC_SINGLE_EXT("INT3_MI2S_TX", MSM_BACKEND_DAI_INT3_MI2S_TX,
		MSM_FRONTEND_DAI_LSM3, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		};

		static const struct snd_kcontrol_new lsm4_mixer_controls[] = {
		@@ -9299,6 +9320,9 @@ static const struct snd_kcontrol_new lsm4_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,
		MSM_FRONTEND_DAI_LSM4, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		SOC_SINGLE_EXT("INT3_MI2S_TX", MSM_BACKEND_DAI_INT3_MI2S_TX,
		MSM_FRONTEND_DAI_LSM4, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		};

		static const struct snd_kcontrol_new lsm5_mixer_controls[] = {
		@@ -9323,6 +9347,9 @@ static const struct snd_kcontrol_new lsm5_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,
		MSM_FRONTEND_DAI_LSM5, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		SOC_SINGLE_EXT("INT3_MI2S_TX", MSM_BACKEND_DAI_INT3_MI2S_TX,
		MSM_FRONTEND_DAI_LSM5, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		};

		static const struct snd_kcontrol_new lsm6_mixer_controls[] = {
		@@ -9347,6 +9374,9 @@ static const struct snd_kcontrol_new lsm6_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,
		MSM_FRONTEND_DAI_LSM6, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		SOC_SINGLE_EXT("INT3_MI2S_TX", MSM_BACKEND_DAI_INT3_MI2S_TX,
		MSM_FRONTEND_DAI_LSM6, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		};

		static const struct snd_kcontrol_new lsm7_mixer_controls[] = {
		@@ -9371,6 +9401,9 @@ static const struct snd_kcontrol_new lsm7_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,
		MSM_FRONTEND_DAI_LSM7, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		SOC_SINGLE_EXT("INT3_MI2S_TX", MSM_BACKEND_DAI_INT3_MI2S_TX,
		MSM_FRONTEND_DAI_LSM7, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		};

		static const struct snd_kcontrol_new lsm8_mixer_controls[] = {
		@@ -9395,6 +9428,9 @@ static const struct snd_kcontrol_new lsm8_mixer_controls[] = {
		SOC_SINGLE_EXT("QUAT_MI2S_TX", MSM_BACKEND_DAI_QUATERNARY_MI2S_TX,
		MSM_FRONTEND_DAI_LSM8, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		SOC_SINGLE_EXT("INT3_MI2S_TX", MSM_BACKEND_DAI_INT3_MI2S_TX,
		MSM_FRONTEND_DAI_LSM8, 1, 0, msm_routing_get_listen_mixer,
		msm_routing_put_listen_mixer),
		};

		static const struct snd_kcontrol_new slim_fm_switch_mixer_controls =
		@@ -9509,6 +9545,8 @@ static const struct snd_kcontrol_new lsm_controls[] = {
		msm_routing_lsm_func_get, msm_routing_lsm_func_put),
		SOC_ENUM_EXT(QUAT_MI2S_TX_TEXT" "LSM_FUNCTION_TEXT, lsm_func_enum,
		msm_routing_lsm_func_get, msm_routing_lsm_func_put),
		SOC_ENUM_EXT(INT3_MI2S_TX_TEXT" "LSM_FUNCTION_TEXT, lsm_func_enum,
		msm_routing_lsm_func_get, msm_routing_lsm_func_put),
		/* kcontrol of lsm_port */
		SOC_ENUM_EXT("LSM1 Port", lsm_port_enum,
		msm_routing_lsm_port_get,
		@@ -13046,7 +13084,6 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"SLIM4_UL_HL", NULL, "SLIMBUS_4_TX"},
		{"SLIM8_UL_HL", NULL, "SLIMBUS_8_TX"},


		{"LSM1 Mixer", "SLIMBUS_0_TX", "SLIMBUS_0_TX"},
		{"LSM1 Mixer", "SLIMBUS_1_TX", "SLIMBUS_1_TX"},
		{"LSM1 Mixer", "SLIMBUS_3_TX", "SLIMBUS_3_TX"},
		@@ -13054,6 +13091,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"LSM1 Mixer", "SLIMBUS_5_TX", "SLIMBUS_5_TX"},
		{"LSM1 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
		{"LSM1 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},
		{"LSM1 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},
		{"LSM1_UL_HL", NULL, "LSM1 Mixer"},

		{"LSM2 Mixer", "SLIMBUS_0_TX", "SLIMBUS_0_TX"},
		@@ -13063,6 +13101,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"LSM2 Mixer", "SLIMBUS_5_TX", "SLIMBUS_5_TX"},
		{"LSM2 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
		{"LSM2 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},
		{"LSM2 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},
		{"LSM2_UL_HL", NULL, "LSM2 Mixer"},


		@@ -13073,6 +13112,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"LSM3 Mixer", "SLIMBUS_5_TX", "SLIMBUS_5_TX"},
		{"LSM3 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
		{"LSM3 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},
		{"LSM3 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},
		{"LSM3_UL_HL", NULL, "LSM3 Mixer"},


		@@ -13083,6 +13123,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"LSM4 Mixer", "SLIMBUS_5_TX", "SLIMBUS_5_TX"},
		{"LSM4 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
		{"LSM4 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},
		{"LSM4 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},
		{"LSM4_UL_HL", NULL, "LSM4 Mixer"},

		{"LSM5 Mixer", "SLIMBUS_0_TX", "SLIMBUS_0_TX"},
		@@ -13092,6 +13133,7 @@ static const struct snd_soc_dapm_route intercon[] = {
		{"LSM5 Mixer", "SLIMBUS_5_TX", "SLIMBUS_5_TX"},
		{"LSM5 Mixer", "TERT_MI2S_TX", "TERT_MI2S_TX"},
		{"LSM5 Mixer", "QUAT_MI2S_TX", "QUAT_MI2S_TX"},
		{"LSM5 Mixer", "INT3_MI2S_TX", "INT3_MI2S_TX"},
		{"LSM5_UL_HL", NULL, "LSM5 Mixer"},

		{"LSM6 Mixer", "SLIMBUS_0_TX", "SLIMBUS_0_TX"},

sound/soc/msm/qdsp6v2/q6afe.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1983,7 +1983,8 @@ int afe_port_set_mad_type(u16 port_id, enum afe_mad_type mad_type)
		{
		int i;

		if (port_id == AFE_PORT_ID_TERTIARY_MI2S_TX) {
		if (port_id == AFE_PORT_ID_TERTIARY_MI2S_TX \|\|
		port_id == AFE_PORT_ID_INT3_MI2S_TX) {
		mad_type = MAD_SW_AUDIO;
		return 0;
		}
		@@ -2001,7 +2002,8 @@ enum afe_mad_type afe_port_get_mad_type(u16 port_id)
		{
		int i;

		if (port_id == AFE_PORT_ID_TERTIARY_MI2S_TX)
		if (port_id == AFE_PORT_ID_TERTIARY_MI2S_TX \|\|
		port_id == AFE_PORT_ID_INT3_MI2S_TX)
		return MAD_SW_AUDIO;

		i = port_id - SLIMBUS_0_RX;