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

Commit 1a970af7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: Add missing routing for MI2S interfaces"

parents 3d4be6a2 ab420042

include/sound/apr_audio-v2.h

+2 −0
Original line number Diff line number Diff line
@@ -8036,8 +8036,10 @@ struct afe_param_id_clip_bank_sel { 
#define Q6AFE_LPASS_IBIT_CLK_6_P144_MHZ		0x5DC000

#define Q6AFE_LPASS_IBIT_CLK_4_P096_MHZ		0x3E8000

#define Q6AFE_LPASS_IBIT_CLK_3_P072_MHZ		0x2EE000

#define Q6AFE_LPASS_IBIT_CLK_2_P8224_MHZ		0x2b1100

#define Q6AFE_LPASS_IBIT_CLK_2_P048_MHZ		0x1F4000

#define Q6AFE_LPASS_IBIT_CLK_1_P536_MHZ		0x177000

#define Q6AFE_LPASS_IBIT_CLK_1_P4112_MHZ		0x158880

#define Q6AFE_LPASS_IBIT_CLK_1_P024_MHZ		 0xFA000

#define Q6AFE_LPASS_IBIT_CLK_768_KHZ		 0xBB800

#define Q6AFE_LPASS_IBIT_CLK_512_KHZ		 0x7D000

sound/soc/msm/msm-dai-fe.c

+48 −13
Original line number Diff line number Diff line
@@ -705,12 +705,13 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.playback = {

			.stream_name = "Primary MI2S_RX Hostless Playback",

			.aif_name = "PRI_MI2S_DL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rates = SNDRV_PCM_RATE_8000_192000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

			.channels_min = 1,

			.channels_max = 2,

			.rate_min =     8000,

			.rate_max =    48000,

			.rate_max =    192000,

		},

		.ops = &msm_fe_dai_ops,

		.name = "PRI_MI2S_RX_HOSTLESS",
@@ -718,8 +719,8 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
	},

	{

		.capture = {

			.stream_name = "Tertiary MI2S_TX Hostless Capture",

			.aif_name = "TERT_MI2S_UL_HL",

			.stream_name = "Secondary MI2S_TX Hostless Capture",

			.aif_name = "SEC_MI2S_UL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),
@@ -729,22 +730,55 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.rate_max = 48000,

		},

		.ops = &msm_fe_dai_ops,

		.name = "TERT_MI2S_TX_HOSTLESS",

		.name = "SEC_MI2S_TX_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "Secondary MI2S_RX Hostless Playback",

			.aif_name = "SEC_MI2S_DL_HL",

			.rates = SNDRV_PCM_RATE_8000_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE,

			.channels_min = 1,

			.channels_max = 2,

			.rate_min = 8000,

			.rate_max = 192000,

		},

		.ops = &msm_fe_dai_ops,

		.name = "SEC_MI2S_RX_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.capture = {

			.stream_name = "Tertiary MI2S_TX Hostless Capture",

			.aif_name = "TERT_MI2S_UL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE),

			.channels_min = 1,

			.channels_max = 2,

			.rate_min = 8000,

			.rate_max = 48000,

		},

		.ops = &msm_fe_dai_ops,

		.name = "SEC_MI2S_RX_HOSTLESS",

		.name = "TERT_MI2S_TX_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{

		.playback = {

			.stream_name = "Tertiary MI2S_RX Hostless Playback",

			.aif_name = "TERT_MI2S_DL_HL",

			.rates = SNDRV_PCM_RATE_8000_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE,

			.channels_min = 1,

			.channels_max = 2,

			.rate_min =	8000,

			.rate_max =    192000,

		},

		.ops = &msm_fe_dai_ops,

		.name = "TERT_MI2S_RX_HOSTLESS",

		.probe = fe_dai_probe,

	},

	{
@@ -767,12 +801,13 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
		.playback = {

			.stream_name = "Quaternary MI2S_RX Hostless Playback",

			.aif_name = "QUAT_MI2S_DL_HL",

			.rates = SNDRV_PCM_RATE_8000_48000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rates = SNDRV_PCM_RATE_8000_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE,

			.channels_min = 1,

			.channels_max = 2,

			.channels_max = 8,

			.rate_min = 8000,

			.rate_max =    48000,

			.rate_max = 192000,

		},

		.ops = &msm_fe_dai_ops,

		.name = "QUAT_MI2S_RX_HOSTLESS",

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

+287 −6

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/msm/qdsp6v2/msm-qti-pp-config.c

+33 −4

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/msm/qdsp6v2/q6afe.c

+3 −1
Original line number Diff line number Diff line
@@ -3177,7 +3177,7 @@ int afe_loopback(u16 enable, u16 rx_port, u16 tx_port) 
				  sizeof(struct afe_port_param_data_v2);



	lb_cmd.dst_port_id = rx_port;

	lb_cmd.routing_mode = LB_MODE_DEFAULT;

	lb_cmd.routing_mode = LB_MODE_EC_REF_VOICE_AUDIO;

	lb_cmd.enable = (enable ? 1 : 0);

	lb_cmd.loopback_cfg_minor_version = AFE_API_VERSION_LOOPBACK_CONFIG;
@@ -4539,8 +4539,10 @@ int afe_validate_port(u16 port_id) 
	case AFE_PORT_ID_PRIMARY_MI2S_RX:

	case AFE_PORT_ID_PRIMARY_MI2S_TX:

	case AFE_PORT_ID_SECONDARY_MI2S_RX:

	case AFE_PORT_ID_SECONDARY_MI2S_TX:

	case AFE_PORT_ID_QUATERNARY_MI2S_RX:

	case AFE_PORT_ID_QUATERNARY_MI2S_TX:

	case AFE_PORT_ID_TERTIARY_MI2S_RX:

	case AFE_PORT_ID_TERTIARY_MI2S_TX:

	case AFE_PORT_ID_QUINARY_MI2S_RX:

	case AFE_PORT_ID_QUINARY_MI2S_TX: