Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 982354ba authored by Kuirong Wang's avatar Kuirong Wang Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: wcd9335: Add codec rx4 dai 



Add codec rx4 dai to support independent backend for different
devices.

CRs-fixed: 940415
Change-Id: I48b24d81e2047d4d4c299ca60cdbd299e172393e
Signed-off-by: default avatarKuirong Wang <kuirongw@codeaurora.org>
parent 32680667

sound/soc/codecs/wcd9335.c

+41 −1
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ enum { 
	AIF2_CAP,

	AIF3_PB,

	AIF3_CAP,

	AIF4_PB,

	AIF_MIX1_PB,

	AIF4_MAD_TX,

	AIF4_VIFEED,
@@ -471,6 +472,7 @@ static const u32 vport_slim_check_table[NUM_CODEC_DAIS] = { 
	BIT(AIF1_CAP) | BIT(AIF3_CAP) | BIT(AIF4_MAD_TX),	/* AIF2_CAP */

	0,							/* AIF3_PB */

	BIT(AIF1_CAP) | BIT(AIF2_CAP) | BIT(AIF4_MAD_TX),	/* AIF3_CAP */

	0,						     /* AIF4_PB */

	0,						     /* AIF_MIX1_PB */

	BIT(AIF1_CAP) | BIT(AIF2_CAP) | BIT(AIF3_CAP),	     /* AIF4_MAD_TX */

};
@@ -2334,7 +2336,7 @@ static int slim_rx_mux_get(struct snd_kcontrol *kcontrol, 
}



static const char *const slim_rx_mux_text[] = {

	"ZERO", "AIF1_PB", "AIF2_PB", "AIF3_PB", "AIF_MIX1_PB"

	"ZERO", "AIF1_PB", "AIF2_PB", "AIF3_PB", "AIF4_PB", "AIF_MIX1_PB"

};



static int slim_rx_mux_put(struct snd_kcontrol *kcontrol,
@@ -2404,6 +2406,17 @@ static int slim_rx_mux_put(struct snd_kcontrol *kcontrol, 
			      &tasha_p->dai[AIF3_PB].wcd9xxx_ch_list);

		break;

	case 4:

		if (wcd9xxx_rx_vport_validation(port_id +

			TASHA_RX_PORT_START_NUMBER,

			&tasha_p->dai[AIF4_PB].wcd9xxx_ch_list)) {

			dev_dbg(codec->dev, "%s: RX%u is used by current requesting AIF_PB itself\n",

				__func__, port_id);

			goto rtn;

		}

		list_add_tail(&core->rx_chs[port_id].list,

			      &tasha_p->dai[AIF4_PB].wcd9xxx_ch_list);

		break;

	case 5:

		if (wcd9xxx_rx_vport_validation(port_id +

			TASHA_RX_PORT_START_NUMBER,

			&tasha_p->dai[AIF_MIX1_PB].wcd9xxx_ch_list)) {
@@ -6475,6 +6488,15 @@ static const struct snd_soc_dapm_route audio_map[] = { 
	{"SLIM RX5 MUX", "AIF3_PB", "AIF3 PB"},

	{"SLIM RX6 MUX", "AIF3_PB", "AIF3 PB"},

	{"SLIM RX7 MUX", "AIF3_PB", "AIF3 PB"},

	/* SLIM_MUX("AIF4_PB", "AIF4 PB"),*/

	{"SLIM RX0 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX1 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX2 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX3 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX4 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX5 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX6 MUX", "AIF4_PB", "AIF4 PB"},

	{"SLIM RX7 MUX", "AIF4_PB", "AIF4 PB"},



	/* SLIM_MUX("AIF_MIX1_PB", "AIF MIX1 PB"),*/

	{"SLIM RX0 MUX", "AIF_MIX1_PB", "AIF MIX1 PB"},
@@ -9521,6 +9543,9 @@ static const struct snd_soc_dapm_widget tasha_dapm_widgets[] = { 
	SND_SOC_DAPM_AIF_IN_E("AIF3 PB", "AIF3 Playback", 0, SND_SOC_NOPM,

				AIF3_PB, 0, tasha_codec_enable_slimrx,

				SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_AIF_IN_E("AIF4 PB", "AIF4 Playback", 0, SND_SOC_NOPM,

				AIF4_PB, 0, tasha_codec_enable_slimrx,

				SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),

	SND_SOC_DAPM_AIF_IN_E("AIF MIX1 PB", "AIF Mix Playback", 0,

			       SND_SOC_NOPM, AIF_MIX1_PB, 0,

			       tasha_codec_enable_slimrx,
@@ -10270,6 +10295,7 @@ static int tasha_get_channel_map(struct snd_soc_dai *dai, 
	case AIF1_PB:

	case AIF2_PB:

	case AIF3_PB:

	case AIF4_PB:

	case AIF_MIX1_PB:

		if (!rx_slot || !rx_num) {

			pr_err("%s: Invalid rx_slot %p or rx_num %p\n",
@@ -10918,6 +10944,20 @@ static struct snd_soc_dai_driver tasha_dai[] = { 
		},

		.ops = &tasha_dai_ops,

	},

	{

		.name = "tasha_rx4",

		.id = AIF4_PB,

		.playback = {

			.stream_name = "AIF4 Playback",

			.rates = WCD9335_RATES_MASK | WCD9335_FRAC_RATES_MASK,

			.formats = TASHA_FORMATS_S16_S24_LE,

			.rate_min = 8000,

			.rate_max = 192000,

			.channels_min = 1,

			.channels_max = 2,

		},

		.ops = &tasha_dai_ops,

	},

	{

		.name = "tasha_mix_rx1",

		.id = AIF_MIX1_PB,