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

Commit 5d67c58c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: msm_stub: increase the max ch to 32"

parents 5ce28d78 a4140262

asoc/codecs/msm_stub.c

+3 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2011-2014, 2017-2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 */

#include <linux/platform_device.h>

#include <linux/slab.h>
@@ -18,7 +19,7 @@ static struct snd_soc_dai_driver msm_stub_dais[] = { 
		.playback = { /* Support maximum range */

			.stream_name = "Playback",

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 32,

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

		},
@@ -28,7 +29,7 @@ static struct snd_soc_dai_driver msm_stub_dais[] = { 
		.capture = { /* Support maximum range */

			.stream_name = "Record",

			.channels_min = 1,

			.channels_max = 8,

			.channels_max = 32,

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

asoc/gvm_auto_spf_dummy.c

+120 −80
Original line number Diff line number Diff line
@@ -258,6 +258,26 @@ static struct snd_soc_dai_link msm_common_dai_links[] = { 
		.ignore_pmdown_time = 1,

		SND_SOC_DAILINK_REG(lpass_be_auxpcm_tx_dummy),

	},

	{

		.name = "QUAT_TDM_RX_0_DUMMY",

		.stream_name = "TDM-LPAIF-RX-QUATERNARY",

		.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(quat_tdm_rx_0_dummy),

	},

	{

		.name = "QUAT_TDM_TX_0_DUMMY",

		.stream_name = "TDM-LPAIF-TX-QUATERNARY",

		.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(quat_tdm_tx_0_dummy),

	},

};



static struct snd_soc_dai_link msm_talos_dai_links[] = {
@@ -302,6 +322,26 @@ static struct snd_soc_dai_link msm_talos_dai_links[] = { 
		.ignore_pmdown_time = 1,

		SND_SOC_DAILINK_REG(lpass_be_auxpcm_tx_dummy),

	},

	{

		.name = "QUAT_TDM_RX_0_DUMMY",

		.stream_name = "TDM-LPAIF-RX-QUATERNARY",

		.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(quat_tdm_rx_0_dummy),

	},

	{

		.name = "QUAT_TDM_TX_0_DUMMY",

		.stream_name = "TDM-LPAIF-TX-QUATERNARY",

		.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(quat_tdm_tx_0_dummy),

	},

};



struct snd_soc_card snd_soc_card_auto_hana_dummy_msm = {

asoc/msm_dailink.h

+11 −1
Original line number Diff line number Diff line
@@ -1315,6 +1315,16 @@ SND_SOC_DAILINK_DEFS(tert_tdm_tx_0_dummy, 
    DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-tx")),

    DAILINK_COMP_ARRAY(COMP_PLATFORM("snd-soc-dummy")));



SND_SOC_DAILINK_DEFS(quat_tdm_rx_0_dummy,

    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_PLATFORM("snd-soc-dummy")));



SND_SOC_DAILINK_DEFS(quat_tdm_tx_0_dummy,

    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_PLATFORM("snd-soc-dummy")));



SND_SOC_DAILINK_DEFS(lpass_be_auxpcm_rx_dummy,

    DAILINK_COMP_ARRAY(COMP_CPU("snd-soc-dummy-dai")),

    DAILINK_COMP_ARRAY(COMP_CODEC("msm-stub-codec.1", "msm-stub-rx")),