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

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

Merge "ASoC: msmcobalt: add support for MI2S and AUX PCM"

parents 54870049 6ec83114

Documentation/devicetree/bindings/sound/qcom-audio-dev.txt

100755 → 100644
+23 −0
Original line number Diff line number Diff line
@@ -1646,6 +1646,18 @@ Optional Properties: 
  secondary -> Secondary MI2S interface

  tertiary -> Tertiary MI2S interface

  quaternary -> Quaternary MI2S interface

- qcom,mi2s-audio-intf: This property is used to inform machine driver

  if mi2s backend dailink has to be added as part of the sound card dai-links.

- qcom,auxpcm-audio-intf: This property is used to inform machine driver

  if auxpcm backend dailink has to be added as part of the sound card dai-links.

- qcom,msm-mi2s-master: This property is used to inform machine driver

  if MSM is the clock master of mi2s. 1 means master and 0 means slave. The

  first entry is primary mi2s; the second entry is secondary mi2s, and so on.

- reg: This property provides the AUX PCM/MI2S mux select register addresses

  and size.

- reg_names: This property provides the name of the AUX PCM/MI2S mux select

  registers so the machine driver can retrieve the addresses. The order of the

  names has to match the order of the registers in "reg" property.

- asoc-platform: This is phandle list containing the references to platform device

		 nodes that are used as part of the sound card dai-links.

- asoc-platform-names: This property contains list of platform names. The order of
@@ -1678,6 +1690,17 @@ Example: 
			    "csr_gp_io_mux_spkr_ctl",

			    "csr_gp_io_lpaif_pri_pcm_pri_mode_muxsel";

		qcom,msm-ext-pa = "primary";

		qcom,mi2s-audio-intf;

		qcom,auxpcm-audio-intf;

		qcom,msm-mi2s-master = <1>, <0>, <1>, <1>;

		reg = <0x1711a000 0x4>,

		      <0x1711b000 0x4>,

		      <0x1711c000 0x4>,

		      <0x1711d000 0x4>;

		reg-names = "lpaif_pri_mode_muxsel",

			    "lpaif_sec_mode_muxsel",

			    "lpaif_tert_mode_muxsel",

			    "lpaif_quat_mode_muxsel";

		qcom,msm-mclk-freq = <9600000>;

		qcom,msm-mbhc-hphl-swh = <0>;

		qcom,msm-mbhc-gnd-swh = <0>;

include/sound/apr_audio-v2.h

+10 −6
Original line number Diff line number Diff line
@@ -904,6 +904,10 @@ struct adm_cmd_connect_afe_port_v5 { 
#define AFE_PORT_ID_SECONDARY_PCM_TX        0x100D

#define AFE_PORT_ID_MULTICHAN_HDMI_RX       0x100E

#define AFE_PORT_ID_SECONDARY_MI2S_RX_SD1   0x1010

#define AFE_PORT_ID_TERTIARY_PCM_RX         0x1012

#define AFE_PORT_ID_TERTIARY_PCM_TX         0x1013

#define AFE_PORT_ID_QUATERNARY_PCM_RX       0x1014

#define AFE_PORT_ID_QUATERNARY_PCM_TX       0x1015

#define AFE_PORT_ID_QUINARY_MI2S_RX         0x1016

#define AFE_PORT_ID_QUINARY_MI2S_TX         0x1017

/* ID of the senary MI2S Rx port. */

include/sound/q6afe-v2.h

+4 −0
Original line number Diff line number Diff line
@@ -183,6 +183,10 @@ enum { 
	IDX_AFE_PORT_ID_USB_TX,

	/* IDX 124 */

	IDX_DISPLAY_PORT_RX,

	IDX_AFE_PORT_ID_TERTIARY_PCM_RX,

	IDX_AFE_PORT_ID_TERTIARY_PCM_TX,

	IDX_AFE_PORT_ID_QUATERNARY_PCM_RX,

	IDX_AFE_PORT_ID_QUATERNARY_PCM_TX,

	AFE_MAX_PORTS

};

sound/soc/msm/msmcobalt.c

+1355 −50

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c

+130 −27
Original line number Diff line number Diff line
@@ -30,6 +30,9 @@ 


#define MSM_DAI_PRI_AUXPCM_DT_DEV_ID 1

#define MSM_DAI_SEC_AUXPCM_DT_DEV_ID 2

#define MSM_DAI_TERT_AUXPCM_DT_DEV_ID 3

#define MSM_DAI_QUAT_AUXPCM_DT_DEV_ID 4





#define spdif_clock_value(rate) (2*rate*32*2)

#define CHANNEL_STATUS_SIZE 24
@@ -873,6 +876,22 @@ static int msm_dai_q6_auxpcm_prepare(struct snd_pcm_substream *substream, 
				aux_dai_data->clk_set.clk_id =

					Q6AFE_LPASS_CLK_ID_SEC_PCM_EBIT;

			break;

		case MSM_DAI_TERT_AUXPCM_DT_DEV_ID:

			if (pcm_clk_rate)

				aux_dai_data->clk_set.clk_id =

					Q6AFE_LPASS_CLK_ID_TER_PCM_IBIT;

			else

				aux_dai_data->clk_set.clk_id =

					Q6AFE_LPASS_CLK_ID_TER_PCM_EBIT;

			break;

		case MSM_DAI_QUAT_AUXPCM_DT_DEV_ID:

			if (pcm_clk_rate)

				aux_dai_data->clk_set.clk_id =

					Q6AFE_LPASS_CLK_ID_QUAD_PCM_IBIT;

			else

				aux_dai_data->clk_set.clk_id =

					Q6AFE_LPASS_CLK_ID_QUAD_PCM_EBIT;

			break;

		default:

			dev_err(dai->dev, "%s: AUXPCM id: %d not supported\n",

				__func__, dai->id);
@@ -1058,7 +1077,59 @@ static struct snd_soc_dai_driver msm_dai_q6_aux_pcm_dai[] = { 
		.ops = &msm_dai_q6_auxpcm_ops,

		.probe = msm_dai_q6_aux_pcm_probe,

		.remove = msm_dai_q6_dai_auxpcm_remove,

	}

	},

	{

		.playback = {

			.stream_name = "Tert AUX PCM Playback",

			.aif_name = "TERT_AUX_PCM_RX",

			.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000),

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 1,

			.rate_max = 16000,

			.rate_min = 8000,

		},

		.capture = {

			.stream_name = "Tert AUX PCM Capture",

			.aif_name = "TERT_AUX_PCM_TX",

			.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000),

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 1,

			.rate_max = 16000,

			.rate_min = 8000,

		},

		.id = MSM_DAI_TERT_AUXPCM_DT_DEV_ID,

		.ops = &msm_dai_q6_auxpcm_ops,

		.probe = msm_dai_q6_aux_pcm_probe,

		.remove = msm_dai_q6_dai_auxpcm_remove,

	},

	{

		.playback = {

			.stream_name = "Quat AUX PCM Playback",

			.aif_name = "QUAT_AUX_PCM_RX",

			.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000),

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 1,

			.rate_max = 16000,

			.rate_min = 8000,

		},

		.capture = {

			.stream_name = "Quat AUX PCM Capture",

			.aif_name = "QUAT_AUX_PCM_TX",

			.rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000),

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.channels_min = 1,

			.channels_max = 1,

			.rate_max = 16000,

			.rate_min = 8000,

		},

		.id = MSM_DAI_QUAT_AUXPCM_DT_DEV_ID,

		.ops = &msm_dai_q6_auxpcm_ops,

		.probe = msm_dai_q6_aux_pcm_probe,

		.remove = msm_dai_q6_dai_auxpcm_remove,

	},

};



static int msm_dai_q6_spdif_format_put(struct snd_kcontrol *kcontrol,
@@ -2723,16 +2794,26 @@ static int msm_auxpcm_dev_probe(struct platform_device *pdev) 
		goto fail_nodev_intf;

	}



	if (!strncmp(intf_name, "primary", sizeof("primary"))) {

	if (!strcmp(intf_name, "primary")) {

		dai_data->rx_pid = AFE_PORT_ID_PRIMARY_PCM_RX;

		dai_data->tx_pid = AFE_PORT_ID_PRIMARY_PCM_TX;

		pdev->id = MSM_DAI_PRI_AUXPCM_DT_DEV_ID;

		i = 0;

	} else if (!strncmp(intf_name, "secondary", sizeof("secondary"))) {

	} else if (!strcmp(intf_name, "secondary")) {

		dai_data->rx_pid = AFE_PORT_ID_SECONDARY_PCM_RX;

		dai_data->tx_pid = AFE_PORT_ID_SECONDARY_PCM_TX;

		pdev->id = MSM_DAI_SEC_AUXPCM_DT_DEV_ID;

		i = 1;

	} else if (!strcmp(intf_name, "tertiary")) {

		dai_data->rx_pid = AFE_PORT_ID_TERTIARY_PCM_RX;

		dai_data->tx_pid = AFE_PORT_ID_TERTIARY_PCM_TX;

		pdev->id = MSM_DAI_TERT_AUXPCM_DT_DEV_ID;

		i = 2;

	} else if (!strcmp(intf_name, "quaternary")) {

		dai_data->rx_pid = AFE_PORT_ID_QUATERNARY_PCM_RX;

		dai_data->tx_pid = AFE_PORT_ID_QUATERNARY_PCM_TX;

		pdev->id = MSM_DAI_QUAT_AUXPCM_DT_DEV_ID;

		i = 3;

	} else {

		dev_err(&pdev->dev, "%s: invalid DT intf name %s\n",

			__func__, intf_name);
@@ -3639,22 +3720,28 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
		.playback = {

			.stream_name = "Primary MI2S Playback",

			.aif_name = "PRI_MI2S_RX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE |

				SNDRV_PCM_FMTBIT_S24_LE |

				SNDRV_PCM_FMTBIT_S24_3LE,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.capture = {

			.stream_name = "Primary MI2S Capture",

			.aif_name = "PRI_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_PRIM_MI2S,
@@ -3665,8 +3752,10 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
		.playback = {

			.stream_name = "Secondary MI2S Playback",

			.aif_name = "SEC_MI2S_RX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,
@@ -3675,11 +3764,14 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
		.capture = {

			.stream_name = "Secondary MI2S Capture",

			.aif_name = "SEC_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_SEC_MI2S,
@@ -3690,20 +3782,26 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
		.playback = {

			.stream_name = "Tertiary MI2S Playback",

			.aif_name = "TERT_MI2S_RX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.capture = {

			.stream_name = "Tertiary MI2S Capture",

			.aif_name = "TERT_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_TERT_MI2S,
@@ -3714,8 +3812,10 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
		.playback = {

			.stream_name = "Quaternary MI2S Playback",

			.aif_name = "QUAT_MI2S_RX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_96000 |

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,
@@ -3724,11 +3824,14 @@ static struct snd_soc_dai_driver msm_dai_q6_mi2s_dai[] = { 
		.capture = {

			.stream_name = "Quaternary MI2S Capture",

			.aif_name = "QUAT_MI2S_TX",

			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |

			SNDRV_PCM_RATE_16000,

			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |

				 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |

				 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |

				 SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |

				 SNDRV_PCM_RATE_192000,

			.formats = SNDRV_PCM_FMTBIT_S16_LE,

			.rate_min =     8000,

			.rate_max =     48000,

			.rate_max =     192000,

		},

		.ops = &msm_dai_q6_mi2s_ops,

		.id = MSM_QUAT_MI2S,