linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/4] ASoC: qdsp6: Add support for audio over DP
@ 2018-12-14 12:29 Rohit kumar
  2018-12-14 12:29 ` [PATCH 1/4] ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding Rohit kumar
                   ` (4 more replies)
  0 siblings, 5 replies; 10+ messages in thread
From: Rohit kumar @ 2018-12-14 12:29 UTC (permalink / raw)
  To: plai, bgoswami, lgirdwood, broonie, robh+dt, mark.rutland, perex,
	tiwai, alsa-devel, devicetree, linux-kernel, rohkumar,
	srinivas.kandagatla, asishb
  Cc: Rohit kumar

Add support for Audio over display port AFE port

Rohit kumar (4):
  ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding
  ASoC: qdsp6: qdafe: add support for display_port_rx
  ASoC: qdsp6: q6afe-dai: add support to Display port RX dais
  ASoC: qdsp6: q6routing: add display_port_rx port routing

 include/dt-bindings/sound/qcom,q6afe.h |  1 +
 sound/soc/qcom/qdsp6/q6afe-dai.c       | 22 ++++++++++++++++++++++
 sound/soc/qcom/qdsp6/q6afe.c           |  4 ++++
 sound/soc/qcom/qdsp6/q6routing.c       |  9 +++++++++
 4 files changed, 36 insertions(+)

-- 
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 1/4] ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding
  2018-12-14 12:29 [PATCH 0/4] ASoC: qdsp6: Add support for audio over DP Rohit kumar
@ 2018-12-14 12:29 ` Rohit kumar
  2018-12-14 12:49   ` Applied "ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding" to the asoc tree Mark Brown
  2018-12-14 12:29 ` [PATCH 2/4] ASoC: qdsp6: qdafe: add support for display_port_rx Rohit kumar
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 10+ messages in thread
From: Rohit kumar @ 2018-12-14 12:29 UTC (permalink / raw)
  To: plai, bgoswami, lgirdwood, broonie, robh+dt, mark.rutland, perex,
	tiwai, alsa-devel, devicetree, linux-kernel, rohkumar,
	srinivas.kandagatla, asishb
  Cc: Rohit kumar

This patch adds bindings required for DISPLAY_PORT_RX
port on AFE.

Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
---
 include/dt-bindings/sound/qcom,q6afe.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/dt-bindings/sound/qcom,q6afe.h b/include/dt-bindings/sound/qcom,q6afe.h
index e2d3892..1df06f8 100644
--- a/include/dt-bindings/sound/qcom,q6afe.h
+++ b/include/dt-bindings/sound/qcom,q6afe.h
@@ -106,6 +106,7 @@
 #define QUINARY_TDM_TX_6	101
 #define QUINARY_TDM_RX_7	102
 #define QUINARY_TDM_TX_7	103
+#define DISPLAY_PORT_RX		104
 
 #endif /* __DT_BINDINGS_Q6_AFE_H__ */
 
-- 
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH 2/4] ASoC: qdsp6: qdafe: add support for display_port_rx
  2018-12-14 12:29 [PATCH 0/4] ASoC: qdsp6: Add support for audio over DP Rohit kumar
  2018-12-14 12:29 ` [PATCH 1/4] ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding Rohit kumar
@ 2018-12-14 12:29 ` Rohit kumar
  2018-12-14 12:49   ` Applied "ASoC: qdsp6: qdafe: add support for display_port_rx" to the asoc tree Mark Brown
  2018-12-14 12:29 ` [PATCH 3/4] ASoC: qdsp6: q6afe-dai: add support to Display port RX dais Rohit kumar
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 10+ messages in thread
From: Rohit kumar @ 2018-12-14 12:29 UTC (permalink / raw)
  To: plai, bgoswami, lgirdwood, broonie, robh+dt, mark.rutland, perex,
	tiwai, alsa-devel, devicetree, linux-kernel, rohkumar,
	srinivas.kandagatla, asishb
  Cc: Rohit kumar

This patch adds support for Display_Port_Rx
port in AFE.

Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
---
 sound/soc/qcom/qdsp6/q6afe.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
index 829b5e987..e0945f7a 100644
--- a/sound/soc/qcom/qdsp6/q6afe.c
+++ b/sound/soc/qcom/qdsp6/q6afe.c
@@ -71,6 +71,7 @@
 /* Port IDs */
 #define AFE_API_VERSION_HDMI_CONFIG	0x1
 #define AFE_PORT_ID_MULTICHAN_HDMI_RX	0x100E
+#define AFE_PORT_ID_HDMI_OVER_DP_RX	0x6020
 
 #define AFE_API_VERSION_SLIMBUS_CONFIG 0x1
 /* Clock set API version */
@@ -704,6 +705,8 @@ struct afe_port_map {
 				QUINARY_TDM_RX_7, 1, 1},
 	[QUINARY_TDM_TX_7] =  { AFE_PORT_ID_QUINARY_TDM_TX_7,
 				QUINARY_TDM_TX_7, 0, 1},
+	[DISPLAY_PORT_RX] = { AFE_PORT_ID_HDMI_OVER_DP_RX,
+				DISPLAY_PORT_RX, 1, 1},
 };
 
 static void q6afe_port_free(struct kref *ref)
@@ -1384,6 +1387,7 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id)
 
 	switch (port_id) {
 	case AFE_PORT_ID_MULTICHAN_HDMI_RX:
+	case AFE_PORT_ID_HDMI_OVER_DP_RX:
 		cfg_type = AFE_PARAM_ID_HDMI_CONFIG;
 		break;
 	case AFE_PORT_ID_SLIMBUS_MULTI_CHAN_0_TX:
-- 
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH 3/4] ASoC: qdsp6: q6afe-dai: add support to Display port RX dais
  2018-12-14 12:29 [PATCH 0/4] ASoC: qdsp6: Add support for audio over DP Rohit kumar
  2018-12-14 12:29 ` [PATCH 1/4] ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding Rohit kumar
  2018-12-14 12:29 ` [PATCH 2/4] ASoC: qdsp6: qdafe: add support for display_port_rx Rohit kumar
@ 2018-12-14 12:29 ` Rohit kumar
  2018-12-14 12:49   ` Applied "ASoC: qdsp6: q6afe-dai: add support to Display port RX dais" to the asoc tree Mark Brown
  2018-12-14 12:29 ` [PATCH 4/4] ASoC: qdsp6: q6routing: add display_port_rx port routing Rohit kumar
  2018-12-14 12:44 ` [PATCH 0/4] ASoC: qdsp6: Add support for audio over DP Srinivas Kandagatla
  4 siblings, 1 reply; 10+ messages in thread
From: Rohit kumar @ 2018-12-14 12:29 UTC (permalink / raw)
  To: plai, bgoswami, lgirdwood, broonie, robh+dt, mark.rutland, perex,
	tiwai, alsa-devel, devicetree, linux-kernel, rohkumar,
	srinivas.kandagatla, asishb
  Cc: Rohit kumar

This patch adds support of AFE DAI for Display_port_rx port.

Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
---
 sound/soc/qcom/qdsp6/q6afe-dai.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c
index bfc3bbf..dc645ba 100644
--- a/sound/soc/qcom/qdsp6/q6afe-dai.c
+++ b/sound/soc/qcom/qdsp6/q6afe-dai.c
@@ -341,6 +341,7 @@ static int q6afe_dai_prepare(struct snd_pcm_substream *substream,
 
 	switch (dai->id) {
 	case HDMI_RX:
+	case DISPLAY_PORT_RX:
 		q6afe_hdmi_port_prepare(dai_data->port[dai->id],
 					&dai_data->port_config[dai->id].hdmi);
 		break;
@@ -445,6 +446,7 @@ static int q6afe_mi2s_set_sysclk(struct snd_soc_dai *dai,
 
 static const struct snd_soc_dapm_route q6afe_dapm_routes[] = {
 	{"HDMI Playback", NULL, "HDMI_RX"},
+	{"Display Port Playback", NULL, "DISPLAY_PORT_RX"},
 	{"Slimbus1 Playback", NULL, "SLIMBUS_1_RX"},
 	{"Slimbus2 Playback", NULL, "SLIMBUS_2_RX"},
 	{"Slimbus3 Playback", NULL, "SLIMBUS_3_RX"},
@@ -1090,6 +1092,25 @@ static int msm_dai_q6_dai_remove(struct snd_soc_dai *dai)
 	Q6AFE_TDM_CAP_DAI("Quinary", 5, QUINARY_TDM_TX_5),
 	Q6AFE_TDM_CAP_DAI("Quinary", 6, QUINARY_TDM_TX_6),
 	Q6AFE_TDM_CAP_DAI("Quinary", 7, QUINARY_TDM_TX_7),
+	{
+		.playback = {
+			.stream_name = "Display Port Playback",
+			.rates = SNDRV_PCM_RATE_48000 |
+				 SNDRV_PCM_RATE_96000 |
+				 SNDRV_PCM_RATE_192000,
+			.formats = SNDRV_PCM_FMTBIT_S16_LE |
+				   SNDRV_PCM_FMTBIT_S24_LE,
+			.channels_min = 2,
+			.channels_max = 8,
+			.rate_max =     192000,
+			.rate_min =	48000,
+		},
+		.ops = &q6hdmi_ops,
+		.id = DISPLAY_PORT_RX,
+		.name = "DISPLAY_PORT",
+		.probe = msm_dai_q6_dai_probe,
+		.remove = msm_dai_q6_dai_remove,
+	},
 };
 
 static int q6afe_of_xlate_dai_name(struct snd_soc_component *component,
@@ -1311,6 +1332,7 @@ static int q6afe_of_xlate_dai_name(struct snd_soc_component *component,
 						0, 0, 0, 0),
 	SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_7", NULL,
 						0, 0, 0, 0),
+	SND_SOC_DAPM_AIF_OUT("DISPLAY_PORT_RX", "NULL", 0, 0, 0, 0),
 };
 
 static const struct snd_soc_component_driver q6afe_dai_component = {
-- 
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH 4/4] ASoC: qdsp6: q6routing: add display_port_rx port routing
  2018-12-14 12:29 [PATCH 0/4] ASoC: qdsp6: Add support for audio over DP Rohit kumar
                   ` (2 preceding siblings ...)
  2018-12-14 12:29 ` [PATCH 3/4] ASoC: qdsp6: q6afe-dai: add support to Display port RX dais Rohit kumar
@ 2018-12-14 12:29 ` Rohit kumar
  2018-12-14 12:49   ` Applied "ASoC: qdsp6: q6routing: add display_port_rx port routing" to the asoc tree Mark Brown
  2018-12-14 12:44 ` [PATCH 0/4] ASoC: qdsp6: Add support for audio over DP Srinivas Kandagatla
  4 siblings, 1 reply; 10+ messages in thread
From: Rohit kumar @ 2018-12-14 12:29 UTC (permalink / raw)
  To: plai, bgoswami, lgirdwood, broonie, robh+dt, mark.rutland, perex,
	tiwai, alsa-devel, devicetree, linux-kernel, rohkumar,
	srinivas.kandagatla, asishb
  Cc: Rohit kumar

This patch add support to Display_port_rx mixers required to
select path between ASM stream and AFE ports.

Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
---
 sound/soc/qcom/qdsp6/q6routing.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c
index d61b840..ddcd997 100644
--- a/sound/soc/qcom/qdsp6/q6routing.c
+++ b/sound/soc/qcom/qdsp6/q6routing.c
@@ -453,6 +453,9 @@ static int msm_routing_put_audio_mixer(struct snd_kcontrol *kcontrol,
 static const struct snd_kcontrol_new hdmi_mixer_controls[] = {
 	Q6ROUTING_RX_MIXERS(HDMI_RX) };
 
+static const struct snd_kcontrol_new display_port_mixer_controls[] = {
+	Q6ROUTING_RX_MIXERS(DISPLAY_PORT_RX) };
+
 static const struct snd_kcontrol_new primary_mi2s_rx_mixer_controls[] = {
 	Q6ROUTING_RX_MIXERS(PRIMARY_MI2S_RX) };
 
@@ -655,6 +658,10 @@ static int msm_routing_put_audio_mixer(struct snd_kcontrol *kcontrol,
 			   hdmi_mixer_controls,
 			   ARRAY_SIZE(hdmi_mixer_controls)),
 
+	SND_SOC_DAPM_MIXER("DISPLAY_PORT_RX Audio Mixer", SND_SOC_NOPM, 0, 0,
+			   display_port_mixer_controls,
+			   ARRAY_SIZE(display_port_mixer_controls)),
+
 	SND_SOC_DAPM_MIXER("SLIMBUS_0_RX Audio Mixer", SND_SOC_NOPM, 0, 0,
 			   slimbus_rx_mixer_controls,
 			   ARRAY_SIZE(slimbus_rx_mixer_controls)),
@@ -833,6 +840,8 @@ static int msm_routing_put_audio_mixer(struct snd_kcontrol *kcontrol,
 
 static const struct snd_soc_dapm_route intercon[] = {
 	Q6ROUTING_RX_DAPM_ROUTE("HDMI Mixer", "HDMI_RX"),
+	Q6ROUTING_RX_DAPM_ROUTE("DISPLAY_PORT_RX Audio Mixer",
+				"DISPLAY_PORT_RX"),
 	Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_0_RX Audio Mixer", "SLIMBUS_0_RX"),
 	Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_1_RX Audio Mixer", "SLIMBUS_1_RX"),
 	Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_2_RX Audio Mixer", "SLIMBUS_2_RX"),
-- 
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc.,
is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH 0/4] ASoC: qdsp6: Add support for audio over DP
  2018-12-14 12:29 [PATCH 0/4] ASoC: qdsp6: Add support for audio over DP Rohit kumar
                   ` (3 preceding siblings ...)
  2018-12-14 12:29 ` [PATCH 4/4] ASoC: qdsp6: q6routing: add display_port_rx port routing Rohit kumar
@ 2018-12-14 12:44 ` Srinivas Kandagatla
  4 siblings, 0 replies; 10+ messages in thread
From: Srinivas Kandagatla @ 2018-12-14 12:44 UTC (permalink / raw)
  To: Rohit kumar, plai, bgoswami, lgirdwood, broonie, robh+dt,
	mark.rutland, perex, tiwai, alsa-devel, devicetree, linux-kernel,
	rohkumar, asishb



On 14/12/2018 12:29, Rohit kumar wrote:
> Add support for Audio over display port AFE port
> 
> Rohit kumar (4):
>    ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding
>    ASoC: qdsp6: qdafe: add support for display_port_rx
>    ASoC: qdsp6: q6afe-dai: add support to Display port RX dais
>    ASoC: qdsp6: q6routing: add display_port_rx port routing
> 
Nice work Rohit, All the patches look good to me!

Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Applied "ASoC: qdsp6: q6routing: add display_port_rx port routing" to the asoc tree
  2018-12-14 12:29 ` [PATCH 4/4] ASoC: qdsp6: q6routing: add display_port_rx port routing Rohit kumar
@ 2018-12-14 12:49   ` Mark Brown
  0 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2018-12-14 12:49 UTC (permalink / raw)
  To: Rohit kumar
  Cc: Srinivas Kandagatla, Mark Brown, plai, bgoswami, lgirdwood,
	broonie, robh+dt, mark.rutland, perex, tiwai, alsa-devel,
	devicetree, linux-kernel, rohkumar, srinivas.kandagatla, asishb,
	alsa-devel

The patch

   ASoC: qdsp6: q6routing: add display_port_rx port routing

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 0718f87b0df49570cdcb96179997bd372cac1742 Mon Sep 17 00:00:00 2001
From: Rohit kumar <rohitkr@codeaurora.org>
Date: Fri, 14 Dec 2018 17:59:29 +0530
Subject: [PATCH] ASoC: qdsp6: q6routing: add display_port_rx port routing

This patch add support to Display_port_rx mixers required to
select path between ASM stream and AFE ports.

Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/qcom/qdsp6/q6routing.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sound/soc/qcom/qdsp6/q6routing.c b/sound/soc/qcom/qdsp6/q6routing.c
index d61b8404f7da..ddcd9978cf57 100644
--- a/sound/soc/qcom/qdsp6/q6routing.c
+++ b/sound/soc/qcom/qdsp6/q6routing.c
@@ -453,6 +453,9 @@ static int msm_routing_put_audio_mixer(struct snd_kcontrol *kcontrol,
 static const struct snd_kcontrol_new hdmi_mixer_controls[] = {
 	Q6ROUTING_RX_MIXERS(HDMI_RX) };
 
+static const struct snd_kcontrol_new display_port_mixer_controls[] = {
+	Q6ROUTING_RX_MIXERS(DISPLAY_PORT_RX) };
+
 static const struct snd_kcontrol_new primary_mi2s_rx_mixer_controls[] = {
 	Q6ROUTING_RX_MIXERS(PRIMARY_MI2S_RX) };
 
@@ -655,6 +658,10 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
 			   hdmi_mixer_controls,
 			   ARRAY_SIZE(hdmi_mixer_controls)),
 
+	SND_SOC_DAPM_MIXER("DISPLAY_PORT_RX Audio Mixer", SND_SOC_NOPM, 0, 0,
+			   display_port_mixer_controls,
+			   ARRAY_SIZE(display_port_mixer_controls)),
+
 	SND_SOC_DAPM_MIXER("SLIMBUS_0_RX Audio Mixer", SND_SOC_NOPM, 0, 0,
 			   slimbus_rx_mixer_controls,
 			   ARRAY_SIZE(slimbus_rx_mixer_controls)),
@@ -833,6 +840,8 @@ static const struct snd_soc_dapm_widget msm_qdsp6_widgets[] = {
 
 static const struct snd_soc_dapm_route intercon[] = {
 	Q6ROUTING_RX_DAPM_ROUTE("HDMI Mixer", "HDMI_RX"),
+	Q6ROUTING_RX_DAPM_ROUTE("DISPLAY_PORT_RX Audio Mixer",
+				"DISPLAY_PORT_RX"),
 	Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_0_RX Audio Mixer", "SLIMBUS_0_RX"),
 	Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_1_RX Audio Mixer", "SLIMBUS_1_RX"),
 	Q6ROUTING_RX_DAPM_ROUTE("SLIMBUS_2_RX Audio Mixer", "SLIMBUS_2_RX"),
-- 
2.19.0.rc2


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Applied "ASoC: qdsp6: q6afe-dai: add support to Display port RX dais" to the asoc tree
  2018-12-14 12:29 ` [PATCH 3/4] ASoC: qdsp6: q6afe-dai: add support to Display port RX dais Rohit kumar
@ 2018-12-14 12:49   ` Mark Brown
  0 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2018-12-14 12:49 UTC (permalink / raw)
  To: Rohit kumar
  Cc: Srinivas Kandagatla, Mark Brown, plai, bgoswami, lgirdwood,
	broonie, robh+dt, mark.rutland, perex, tiwai, alsa-devel,
	devicetree, linux-kernel, rohkumar, srinivas.kandagatla, asishb,
	alsa-devel

The patch

   ASoC: qdsp6: q6afe-dai: add support to Display port RX dais

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 32d2c61ba05944aa1e61d186611310dd911e1703 Mon Sep 17 00:00:00 2001
From: Rohit kumar <rohitkr@codeaurora.org>
Date: Fri, 14 Dec 2018 17:59:28 +0530
Subject: [PATCH] ASoC: qdsp6: q6afe-dai: add support to Display port RX dais

This patch adds support of AFE DAI for Display_port_rx port.

Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/qcom/qdsp6/q6afe-dai.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c
index bfc3bbf1d4de..dc645ba4d8d0 100644
--- a/sound/soc/qcom/qdsp6/q6afe-dai.c
+++ b/sound/soc/qcom/qdsp6/q6afe-dai.c
@@ -341,6 +341,7 @@ static int q6afe_dai_prepare(struct snd_pcm_substream *substream,
 
 	switch (dai->id) {
 	case HDMI_RX:
+	case DISPLAY_PORT_RX:
 		q6afe_hdmi_port_prepare(dai_data->port[dai->id],
 					&dai_data->port_config[dai->id].hdmi);
 		break;
@@ -445,6 +446,7 @@ static int q6afe_mi2s_set_sysclk(struct snd_soc_dai *dai,
 
 static const struct snd_soc_dapm_route q6afe_dapm_routes[] = {
 	{"HDMI Playback", NULL, "HDMI_RX"},
+	{"Display Port Playback", NULL, "DISPLAY_PORT_RX"},
 	{"Slimbus1 Playback", NULL, "SLIMBUS_1_RX"},
 	{"Slimbus2 Playback", NULL, "SLIMBUS_2_RX"},
 	{"Slimbus3 Playback", NULL, "SLIMBUS_3_RX"},
@@ -1090,6 +1092,25 @@ static struct snd_soc_dai_driver q6afe_dais[] = {
 	Q6AFE_TDM_CAP_DAI("Quinary", 5, QUINARY_TDM_TX_5),
 	Q6AFE_TDM_CAP_DAI("Quinary", 6, QUINARY_TDM_TX_6),
 	Q6AFE_TDM_CAP_DAI("Quinary", 7, QUINARY_TDM_TX_7),
+	{
+		.playback = {
+			.stream_name = "Display Port Playback",
+			.rates = SNDRV_PCM_RATE_48000 |
+				 SNDRV_PCM_RATE_96000 |
+				 SNDRV_PCM_RATE_192000,
+			.formats = SNDRV_PCM_FMTBIT_S16_LE |
+				   SNDRV_PCM_FMTBIT_S24_LE,
+			.channels_min = 2,
+			.channels_max = 8,
+			.rate_max =     192000,
+			.rate_min =	48000,
+		},
+		.ops = &q6hdmi_ops,
+		.id = DISPLAY_PORT_RX,
+		.name = "DISPLAY_PORT",
+		.probe = msm_dai_q6_dai_probe,
+		.remove = msm_dai_q6_dai_remove,
+	},
 };
 
 static int q6afe_of_xlate_dai_name(struct snd_soc_component *component,
@@ -1311,6 +1332,7 @@ static const struct snd_soc_dapm_widget q6afe_dai_widgets[] = {
 						0, 0, 0, 0),
 	SND_SOC_DAPM_AIF_OUT("QUIN_TDM_TX_7", NULL,
 						0, 0, 0, 0),
+	SND_SOC_DAPM_AIF_OUT("DISPLAY_PORT_RX", "NULL", 0, 0, 0, 0),
 };
 
 static const struct snd_soc_component_driver q6afe_dai_component = {
-- 
2.19.0.rc2


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Applied "ASoC: qdsp6: qdafe: add support for display_port_rx" to the asoc tree
  2018-12-14 12:29 ` [PATCH 2/4] ASoC: qdsp6: qdafe: add support for display_port_rx Rohit kumar
@ 2018-12-14 12:49   ` Mark Brown
  0 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2018-12-14 12:49 UTC (permalink / raw)
  To: Rohit kumar
  Cc: Srinivas Kandagatla, Mark Brown, plai, bgoswami, lgirdwood,
	broonie, robh+dt, mark.rutland, perex, tiwai, alsa-devel,
	devicetree, linux-kernel, rohkumar, srinivas.kandagatla, asishb,
	alsa-devel

The patch

   ASoC: qdsp6: qdafe: add support for display_port_rx

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 3f6856a28f5eeb4fcaeb3ae25118171747354e51 Mon Sep 17 00:00:00 2001
From: Rohit kumar <rohitkr@codeaurora.org>
Date: Fri, 14 Dec 2018 17:59:27 +0530
Subject: [PATCH] ASoC: qdsp6: qdafe: add support for display_port_rx

This patch adds support for Display_Port_Rx
port in AFE.

Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/qcom/qdsp6/q6afe.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
index 829b5e987b2a..e0945f7a58c8 100644
--- a/sound/soc/qcom/qdsp6/q6afe.c
+++ b/sound/soc/qcom/qdsp6/q6afe.c
@@ -71,6 +71,7 @@
 /* Port IDs */
 #define AFE_API_VERSION_HDMI_CONFIG	0x1
 #define AFE_PORT_ID_MULTICHAN_HDMI_RX	0x100E
+#define AFE_PORT_ID_HDMI_OVER_DP_RX	0x6020
 
 #define AFE_API_VERSION_SLIMBUS_CONFIG 0x1
 /* Clock set API version */
@@ -704,6 +705,8 @@ static struct afe_port_map port_maps[AFE_PORT_MAX] = {
 				QUINARY_TDM_RX_7, 1, 1},
 	[QUINARY_TDM_TX_7] =  { AFE_PORT_ID_QUINARY_TDM_TX_7,
 				QUINARY_TDM_TX_7, 0, 1},
+	[DISPLAY_PORT_RX] = { AFE_PORT_ID_HDMI_OVER_DP_RX,
+				DISPLAY_PORT_RX, 1, 1},
 };
 
 static void q6afe_port_free(struct kref *ref)
@@ -1384,6 +1387,7 @@ struct q6afe_port *q6afe_port_get_from_id(struct device *dev, int id)
 
 	switch (port_id) {
 	case AFE_PORT_ID_MULTICHAN_HDMI_RX:
+	case AFE_PORT_ID_HDMI_OVER_DP_RX:
 		cfg_type = AFE_PARAM_ID_HDMI_CONFIG;
 		break;
 	case AFE_PORT_ID_SLIMBUS_MULTI_CHAN_0_TX:
-- 
2.19.0.rc2


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Applied "ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding" to the asoc tree
  2018-12-14 12:29 ` [PATCH 1/4] ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding Rohit kumar
@ 2018-12-14 12:49   ` Mark Brown
  0 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2018-12-14 12:49 UTC (permalink / raw)
  To: Rohit kumar
  Cc: Srinivas Kandagatla, Mark Brown, plai, bgoswami, lgirdwood,
	broonie, robh+dt, mark.rutland, perex, tiwai, alsa-devel,
	devicetree, linux-kernel, rohkumar, srinivas.kandagatla, asishb,
	alsa-devel

The patch

   ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 76119509d23cdd9fbc71585042b27b6511b44b4d Mon Sep 17 00:00:00 2001
From: Rohit kumar <rohitkr@codeaurora.org>
Date: Fri, 14 Dec 2018 17:59:26 +0530
Subject: [PATCH] ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding

This patch adds bindings required for DISPLAY_PORT_RX
port on AFE.

Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 include/dt-bindings/sound/qcom,q6afe.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/dt-bindings/sound/qcom,q6afe.h b/include/dt-bindings/sound/qcom,q6afe.h
index e2d3892240b8..1df06f8ad5c3 100644
--- a/include/dt-bindings/sound/qcom,q6afe.h
+++ b/include/dt-bindings/sound/qcom,q6afe.h
@@ -106,6 +106,7 @@
 #define QUINARY_TDM_TX_6	101
 #define QUINARY_TDM_RX_7	102
 #define QUINARY_TDM_TX_7	103
+#define DISPLAY_PORT_RX		104
 
 #endif /* __DT_BINDINGS_Q6_AFE_H__ */
 
-- 
2.19.0.rc2


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2018-12-14 12:49 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-14 12:29 [PATCH 0/4] ASoC: qdsp6: Add support for audio over DP Rohit kumar
2018-12-14 12:29 ` [PATCH 1/4] ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding Rohit kumar
2018-12-14 12:49   ` Applied "ASoC: qdsp6: dt-bindings: Add q6afe display_port dt binding" to the asoc tree Mark Brown
2018-12-14 12:29 ` [PATCH 2/4] ASoC: qdsp6: qdafe: add support for display_port_rx Rohit kumar
2018-12-14 12:49   ` Applied "ASoC: qdsp6: qdafe: add support for display_port_rx" to the asoc tree Mark Brown
2018-12-14 12:29 ` [PATCH 3/4] ASoC: qdsp6: q6afe-dai: add support to Display port RX dais Rohit kumar
2018-12-14 12:49   ` Applied "ASoC: qdsp6: q6afe-dai: add support to Display port RX dais" to the asoc tree Mark Brown
2018-12-14 12:29 ` [PATCH 4/4] ASoC: qdsp6: q6routing: add display_port_rx port routing Rohit kumar
2018-12-14 12:49   ` Applied "ASoC: qdsp6: q6routing: add display_port_rx port routing" to the asoc tree Mark Brown
2018-12-14 12:44 ` [PATCH 0/4] ASoC: qdsp6: Add support for audio over DP Srinivas Kandagatla

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).