Merge "asoc: refine dummy machine driver for gen3" (f9c63284) · Commits · e / devices / android_kernel_fairphone_FP5

asoc/gvm_auto_spf_dummy.c

+107 −27

Original line number	Original line	Diff line number	Diff line
	@@ -219,44 +219,64 @@ static const struct snd_soc_dapm_widget msm_dapm_widgets[] = {
	static struct snd_soc_dai_link msm_common_dai_links[] = {		static struct snd_soc_dai_link msm_common_dai_links[] = {
	/* BackEnd DAI Links */		/* BackEnd DAI Links */
	{		{
	.name = "TERT_TDM_RX_0_DUMMY",		.name = "LPASS_BE_AUXPCM_RX_DUMMY",
	.stream_name = "TDM-LPAIF-RX-TERTIARY",		.stream_name = "AUXPCM-LPAIF-RX-PRIMARY",
	.dpcm_playback = 1,		.dpcm_playback = 1,
	.trigger = {SND_SOC_DPCM_TRIGGER_POST,		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
	SND_SOC_DPCM_TRIGGER_POST},		SND_SOC_DPCM_TRIGGER_POST},
	.ignore_suspend = 1,		.ignore_suspend = 1,
	.ignore_pmdown_time = 1,		.ignore_pmdown_time = 1,
	SND_SOC_DAILINK_REG(tert_tdm_rx_0_dummy),		SND_SOC_DAILINK_REG(lpass_be_auxpcm_rx_dummy),
	},		},
	{		{
	.name = "TERT_TDM_TX_0_DUMMY",		.name = "LPASS_BE_AUXPCM_TX_DUMMY",
	.stream_name = "TDM-LPAIF-TX-TERTIARY",		.stream_name = "AUXPCM-LPAIF-TX-PRIMARY",
	.dpcm_capture = 1,		.dpcm_capture = 1,
	.trigger = {SND_SOC_DPCM_TRIGGER_POST,		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
	SND_SOC_DPCM_TRIGGER_POST},		SND_SOC_DPCM_TRIGGER_POST},
	.ignore_suspend = 1,		.ignore_suspend = 1,
	.ignore_pmdown_time = 1,		.ignore_pmdown_time = 1,
	SND_SOC_DAILINK_REG(tert_tdm_tx_0_dummy),		SND_SOC_DAILINK_REG(lpass_be_auxpcm_tx_dummy),
	},		},
	{		{
	.name = "LPASS_BE_AUXPCM_RX_DUMMY",		.name = "SEC_TDM_RX_0_DUMMY",
	.stream_name = "AUXPCM-LPAIF-RX-PRIMARY",		.stream_name = "TDM-LPAIF-RX-SECONDARY",
	.dpcm_playback = 1,		.dpcm_playback = 1,
	.trigger = {SND_SOC_DPCM_TRIGGER_POST,		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
	SND_SOC_DPCM_TRIGGER_POST},		SND_SOC_DPCM_TRIGGER_POST},
	.ignore_suspend = 1,		.ignore_suspend = 1,
	.ignore_pmdown_time = 1,		.ignore_pmdown_time = 1,
	SND_SOC_DAILINK_REG(lpass_be_auxpcm_rx_dummy),		SND_SOC_DAILINK_REG(secondary_tdm_rx_0_dummy),
	},		},
	{		{
	.name = "LPASS_BE_AUXPCM_TX_DUMMY",		.name = "SEC_TDM_TX_0_DUMMY",
	.stream_name = "AUXPCM-LPAIF-TX-PRIMARY",		.stream_name = "TDM-LPAIF-TX-SECONDARY",
	.dpcm_capture = 1,		.dpcm_capture = 1,
	.trigger = {SND_SOC_DPCM_TRIGGER_POST,		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
	SND_SOC_DPCM_TRIGGER_POST},		SND_SOC_DPCM_TRIGGER_POST},
	.ignore_suspend = 1,		.ignore_suspend = 1,
	.ignore_pmdown_time = 1,		.ignore_pmdown_time = 1,
	SND_SOC_DAILINK_REG(lpass_be_auxpcm_tx_dummy),		SND_SOC_DAILINK_REG(secondary_tdm_tx_0_dummy),
			},
			{
			.name = "TERT_TDM_RX_0_DUMMY",
			.stream_name = "TDM-LPAIF-RX-TERTIARY",
			.dpcm_playback = 1,
			.trigger = {SND_SOC_DPCM_TRIGGER_POST,
			SND_SOC_DPCM_TRIGGER_POST},
			.ignore_suspend = 1,
			.ignore_pmdown_time = 1,
			SND_SOC_DAILINK_REG(tert_tdm_rx_0_dummy),
			},
			{
			.name = "TERT_TDM_TX_0_DUMMY",
			.stream_name = "TDM-LPAIF-TX-TERTIARY",
			.dpcm_capture = 1,
			.trigger = {SND_SOC_DPCM_TRIGGER_POST,
			SND_SOC_DPCM_TRIGGER_POST},
			.ignore_suspend = 1,
			.ignore_pmdown_time = 1,
			SND_SOC_DAILINK_REG(tert_tdm_tx_0_dummy),
	},		},
	{		{
	.name = "QUAT_TDM_RX_0_DUMMY",		.name = "QUAT_TDM_RX_0_DUMMY",
	@@ -278,6 +298,26 @@ static struct snd_soc_dai_link msm_common_dai_links[] = {
	.ignore_pmdown_time = 1,		.ignore_pmdown_time = 1,
	SND_SOC_DAILINK_REG(quat_tdm_tx_0_dummy),		SND_SOC_DAILINK_REG(quat_tdm_tx_0_dummy),
	},		},
			{
			.name = "QUIN_TDM_RX_0_DUMMY",
			.stream_name = "TDM-LPAIF-RX-QUINARY",
			.dpcm_playback = 1,
			.trigger = {SND_SOC_DPCM_TRIGGER_POST,
			SND_SOC_DPCM_TRIGGER_POST},
			.ignore_suspend = 1,
			.ignore_pmdown_time = 1,
			SND_SOC_DAILINK_REG(quin_tdm_rx_0_dummy),
			},
			{
			.name = "QUIN_TDM_TX_0_DUMMY",
			.stream_name = "TDM-LPAIF-TX-QUINARY",
			.dpcm_capture = 1,
			.trigger = {SND_SOC_DPCM_TRIGGER_POST,
			SND_SOC_DPCM_TRIGGER_POST},
			.ignore_suspend = 1,
			.ignore_pmdown_time = 1,
			SND_SOC_DAILINK_REG(quin_tdm_tx_0_dummy),
			},
	};		};

	static struct snd_soc_dai_link msm_gvm8295_dai_links[] = {		static struct snd_soc_dai_link msm_gvm8295_dai_links[] = {
	@@ -427,48 +467,68 @@ static struct snd_soc_dai_link msm_gvm8295_dai_links[] = {
	static struct snd_soc_dai_link msm_talos_dai_links[] = {		static struct snd_soc_dai_link msm_talos_dai_links[] = {
	/* BackEnd DAI Links */		/* BackEnd DAI Links */
	{		{
	.name = "PRIMARY_TDM_RX_0_DUMMY",		.name = "LPASS_BE_AUXPCM_RX_DUMMY",
	.stream_name = "TDM-LPAIF_WSA-RX-PRIMARY",		.stream_name = "AUXPCM-LPAIF-RX-PRIMARY",
	.dpcm_playback = 1,		.dpcm_playback = 1,
	.trigger = {SND_SOC_DPCM_TRIGGER_POST,		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
	SND_SOC_DPCM_TRIGGER_POST},		SND_SOC_DPCM_TRIGGER_POST},
	.ignore_suspend = 1,		.ignore_suspend = 1,
	.ignore_pmdown_time = 1,		.ignore_pmdown_time = 1,
	SND_SOC_DAILINK_REG(primary_tdm_rx_0_dummy),		SND_SOC_DAILINK_REG(lpass_be_auxpcm_rx_dummy),
	},		},
	{		{
	.name = "PRIMARY_TDM_TX_0_DUMMY",		.name = "LPASS_BE_AUXPCM_TX_DUMMY",
	.stream_name = "TDM-LPAIF_WSA-TX-PRIMARY",		.stream_name = "AUXPCM-LPAIF-TX-PRIMARY",
	.dpcm_capture = 1,		.dpcm_capture = 1,
	.trigger = {SND_SOC_DPCM_TRIGGER_POST,		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
	SND_SOC_DPCM_TRIGGER_POST},		SND_SOC_DPCM_TRIGGER_POST},
	.ignore_suspend = 1,		.ignore_suspend = 1,
	.ignore_pmdown_time = 1,		.ignore_pmdown_time = 1,
	SND_SOC_DAILINK_REG(primary_tdm_tx_0_dummy),		SND_SOC_DAILINK_REG(lpass_be_auxpcm_tx_dummy),
	},		},
	{		{
	.name = "LPASS_BE_AUXPCM_RX_DUMMY",		.name = "SEC_TDM_RX_0_DUMMY",
	.stream_name = "AUXPCM-LPAIF-RX-PRIMARY",		.stream_name = "TDM-LPAIF-RX-SECONDARY",
	.dpcm_playback = 1,		.dpcm_playback = 1,
	.trigger = {SND_SOC_DPCM_TRIGGER_POST,		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
	SND_SOC_DPCM_TRIGGER_POST},		SND_SOC_DPCM_TRIGGER_POST},
	.ignore_suspend = 1,		.ignore_suspend = 1,
	.ignore_pmdown_time = 1,		.ignore_pmdown_time = 1,
	SND_SOC_DAILINK_REG(lpass_be_auxpcm_rx_dummy),		SND_SOC_DAILINK_REG(secondary_tdm_rx_0_dummy),
	},		},
	{		{
	.name = "LPASS_BE_AUXPCM_TX_DUMMY",		.name = "SEC_TDM_TX_0_DUMMY",
	.stream_name = "AUXPCM-LPAIF-TX-PRIMARY",		.stream_name = "TDM-LPAIF-TX-SECONDARY",
	.dpcm_capture = 1,		.dpcm_capture = 1,
	.trigger = {SND_SOC_DPCM_TRIGGER_POST,		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
	SND_SOC_DPCM_TRIGGER_POST},		SND_SOC_DPCM_TRIGGER_POST},
	.ignore_suspend = 1,		.ignore_suspend = 1,
	.ignore_pmdown_time = 1,		.ignore_pmdown_time = 1,
	SND_SOC_DAILINK_REG(lpass_be_auxpcm_tx_dummy),		SND_SOC_DAILINK_REG(secondary_tdm_tx_0_dummy),
			},
			{
			.name = "TERT_TDM_RX_0_DUMMY",
			.stream_name = "TDM-LPAIF_WSA-RX-PRIMARY",
			.dpcm_playback = 1,
			.trigger = {SND_SOC_DPCM_TRIGGER_POST,
			SND_SOC_DPCM_TRIGGER_POST},
			.ignore_suspend = 1,
			.ignore_pmdown_time = 1,
			SND_SOC_DAILINK_REG(tert_tdm_rx_0_dummy),
			},
			{
			.name = "TERT_TDM_TX_0_DUMMY",
			.stream_name = "TDM-LPAIF_WSA-TX-PRIMARY",
			.dpcm_capture = 1,
			.trigger = {SND_SOC_DPCM_TRIGGER_POST,
			SND_SOC_DPCM_TRIGGER_POST},
			.ignore_suspend = 1,
			.ignore_pmdown_time = 1,
			SND_SOC_DAILINK_REG(tert_tdm_tx_0_dummy),
	},		},
	{		{
	.name = "QUAT_TDM_RX_0_DUMMY",		.name = "QUAT_TDM_RX_0_DUMMY",
	.stream_name = "TDM-LPAIF-RX-QUATERNARY",		.stream_name = "TDM-LPAIF_RXTX-RX-PRIMARY",
	.dpcm_playback = 1,		.dpcm_playback = 1,
	.trigger = {SND_SOC_DPCM_TRIGGER_POST,		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
	SND_SOC_DPCM_TRIGGER_POST},		SND_SOC_DPCM_TRIGGER_POST},
	@@ -478,7 +538,7 @@ static struct snd_soc_dai_link msm_talos_dai_links[] = {
	},		},
	{		{
	.name = "QUAT_TDM_TX_0_DUMMY",		.name = "QUAT_TDM_TX_0_DUMMY",
	.stream_name = "TDM-LPAIF-TX-QUATERNARY",		.stream_name = "TDM-LPAIF_RXTX-TX-PRIMARY",
	.dpcm_capture = 1,		.dpcm_capture = 1,
	.trigger = {SND_SOC_DPCM_TRIGGER_POST,		.trigger = {SND_SOC_DPCM_TRIGGER_POST,
	SND_SOC_DPCM_TRIGGER_POST},		SND_SOC_DPCM_TRIGGER_POST},
	@@ -486,6 +546,26 @@ static struct snd_soc_dai_link msm_talos_dai_links[] = {
	.ignore_pmdown_time = 1,		.ignore_pmdown_time = 1,
	SND_SOC_DAILINK_REG(quat_tdm_tx_0_dummy),		SND_SOC_DAILINK_REG(quat_tdm_tx_0_dummy),
	},		},
			{
			.name = "QUIN_TDM_RX_0_DUMMY",
			.stream_name = "TDM-LPAIF-RX-TERTIARY",
			.dpcm_playback = 1,
			.trigger = {SND_SOC_DPCM_TRIGGER_POST,
			SND_SOC_DPCM_TRIGGER_POST},
			.ignore_suspend = 1,
			.ignore_pmdown_time = 1,
			SND_SOC_DAILINK_REG(quin_tdm_rx_0_dummy),
			},
			{
			.name = "QUIN_TDM_TX_0_DUMMY",
			.stream_name = "TDM-LPAIF-TX-TERTIARY",
			.dpcm_capture = 1,
			.trigger = {SND_SOC_DPCM_TRIGGER_POST,
			SND_SOC_DPCM_TRIGGER_POST},
			.ignore_suspend = 1,
			.ignore_pmdown_time = 1,
			SND_SOC_DAILINK_REG(quin_tdm_tx_0_dummy),
			},
	};		};

	struct snd_soc_card snd_soc_card_auto_hana_dummy_msm = {		struct snd_soc_card snd_soc_card_auto_hana_dummy_msm = {

asoc/msm_dailink.h

+56 −56

Original line number	Original line	Diff line number	Diff line
	@@ -1305,52 +1305,52 @@ SND_SOC_DAILINK_DEFS(ext_display_port,
	"msm_dp_audio_codec_rx_dai")),		"msm_dp_audio_codec_rx_dai")),
	DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-routing")));		DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-routing")));

	SND_SOC_DAILINK_DEFS(tert_tdm_rx_0_dummy,		SND_SOC_DAILINK_DEFS(lpass_be_auxpcm_rx_dummy,
	DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),		DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
	DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-rx")),		DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-rx")),
	DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));		DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));

	SND_SOC_DAILINK_DEFS(tert_tdm_tx_0_dummy,		SND_SOC_DAILINK_DEFS(lpass_be_auxpcm_tx_dummy,
	DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),		DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
	DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-tx")),		DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-tx")),
	DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));		DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));

	SND_SOC_DAILINK_DEFS(quat_tdm_rx_0_dummy,		SND_SOC_DAILINK_DEFS(primary_tdm_rx_0_dummy,
	DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),		DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
	DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-rx")),		DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-rx")),
	DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));		DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));

	SND_SOC_DAILINK_DEFS(quat_tdm_tx_0_dummy,		SND_SOC_DAILINK_DEFS(primary_tdm_tx_0_dummy,
	DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),		DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
	DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-tx")),		DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-tx")),
	DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));		DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));

	SND_SOC_DAILINK_DEFS(lpass_be_auxpcm_rx_dummy,		SND_SOC_DAILINK_DEFS(secondary_tdm_rx_0_dummy,
	DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),		DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
	DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-rx")),		DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-rx")),
	DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));		DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));

	SND_SOC_DAILINK_DEFS(lpass_be_auxpcm_tx_dummy,		SND_SOC_DAILINK_DEFS(secondary_tdm_tx_0_dummy,
	DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),		DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
	DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-tx")),		DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-tx")),
	DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));		DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));

	SND_SOC_DAILINK_DEFS(primary_tdm_rx_0_dummy,		SND_SOC_DAILINK_DEFS(tert_tdm_rx_0_dummy,
	DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),		DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),
	DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-rx")),		DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-rx")),
	DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));		DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));

	SND_SOC_DAILINK_DEFS(primary_tdm_tx_0_dummy,		SND_SOC_DAILINK_DEFS(tert_tdm_tx_0_dummy,