* [PATCH v3 1/2] arm64: dts: qcom: sc7180: Update lpass cpu node for audio over dp
2020-09-30 6:42 [PATCH v3 0/2] Qualcomm's lpass device tree changes Srinivasa Rao Mandadapu
@ 2020-09-30 6:42 ` Srinivasa Rao Mandadapu
2020-11-30 11:02 ` Srinivas Kandagatla
2020-09-30 6:42 ` [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI Srinivasa Rao Mandadapu
2020-11-30 16:53 ` [PATCH v3 0/2] Qualcomm's lpass device tree changes Bjorn Andersson
2 siblings, 1 reply; 9+ messages in thread
From: Srinivasa Rao Mandadapu @ 2020-09-30 6:42 UTC (permalink / raw)
To: agross, bjorn.andersson, robh+dt, linux-arm-msm, devicetree,
linux-kernel, rohitkr, srinivas.kandagatla
Cc: V Sujith Kumar Reddy, Srinivasa Rao Mandadapu
From: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
Updaate lpass dts node with HDMI reg, interrupt and iommu
for supporting audio over dp.
Signed-off-by: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
Signed-off-by: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
---
arch/arm64/boot/dts/qcom/sc7180.dtsi | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 427a4bf..802ea0a 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -21,6 +21,7 @@
#include <dt-bindings/reset/qcom,sdm845-pdc.h>
#include <dt-bindings/soc/qcom,rpmh-rsc.h>
#include <dt-bindings/thermal/thermal.h>
+#include <dt-bindings/sound/sc7180-lpass.h>
/ {
interrupt-parent = <&intc>;
@@ -3428,16 +3429,18 @@
#power-domain-cells = <1>;
};
- lpass_cpu: lpass@62f00000 {
+ lpass_cpu: lpass@62d87000 {
compatible = "qcom,sc7180-lpass-cpu";
- reg = <0 0x62f00000 0 0x29000>;
- reg-names = "lpass-lpaif";
+ reg = <0 0x62d87000 0 0x68000>, <0 0x62f00000 0 0x29000>;
+ reg-names = "lpass-hdmiif", "lpass-lpaif";
- iommus = <&apps_smmu 0x1020 0>;
+ iommus = <&apps_smmu 0x1020 0>, <&apps_smmu 0x1032 0>;
power-domains = <&lpass_hm LPASS_CORE_HM_GDSCR>;
+ status = "disabled";
+
clocks = <&gcc GCC_LPASS_CFG_NOC_SWAY_CLK>,
<&lpasscc LPASS_AUDIO_CORE_CORE_CLK>,
<&lpasscc LPASS_AUDIO_CORE_EXT_MCLK0_CLK>,
@@ -3449,13 +3452,13 @@
"mclk0", "pcnoc-mport-clk",
"mi2s-bit-clk0", "mi2s-bit-clk1";
-
#sound-dai-cells = <1>;
#address-cells = <1>;
#size-cells = <0>;
- interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;
- interrupt-names = "lpass-irq-lpaif";
+ interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "lpass-irq-lpaif", "lpass-irq-hdmi";
};
lpass_hm: clock-controller@63000000 {
--
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] 9+ messages in thread* Re: [PATCH v3 1/2] arm64: dts: qcom: sc7180: Update lpass cpu node for audio over dp
2020-09-30 6:42 ` [PATCH v3 1/2] arm64: dts: qcom: sc7180: Update lpass cpu node for audio over dp Srinivasa Rao Mandadapu
@ 2020-11-30 11:02 ` Srinivas Kandagatla
0 siblings, 0 replies; 9+ messages in thread
From: Srinivas Kandagatla @ 2020-11-30 11:02 UTC (permalink / raw)
To: Srinivasa Rao Mandadapu, agross, bjorn.andersson, robh+dt,
linux-arm-msm, devicetree, linux-kernel, rohitkr
Cc: V Sujith Kumar Reddy
On 30/09/2020 07:42, Srinivasa Rao Mandadapu wrote:
> From: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
>
> Updaate lpass dts node with HDMI reg, interrupt and iommu
> for supporting audio over dp.
>
> Signed-off-by: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
> Signed-off-by: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> index 427a4bf..802ea0a 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -21,6 +21,7 @@
> #include <dt-bindings/reset/qcom,sdm845-pdc.h>
> #include <dt-bindings/soc/qcom,rpmh-rsc.h>
> #include <dt-bindings/thermal/thermal.h>
> +#include <dt-bindings/sound/sc7180-lpass.h>
>
> / {
> interrupt-parent = <&intc>;
> @@ -3428,16 +3429,18 @@
> #power-domain-cells = <1>;
> };
>
> - lpass_cpu: lpass@62f00000 {
> + lpass_cpu: lpass@62d87000 {
> compatible = "qcom,sc7180-lpass-cpu";
>
> - reg = <0 0x62f00000 0 0x29000>;
> - reg-names = "lpass-lpaif";
> + reg = <0 0x62d87000 0 0x68000>, <0 0x62f00000 0 0x29000>;
> + reg-names = "lpass-hdmiif", "lpass-lpaif";
>
> - iommus = <&apps_smmu 0x1020 0>;
> + iommus = <&apps_smmu 0x1020 0>, <&apps_smmu 0x1032 0>;
>
> power-domains = <&lpass_hm LPASS_CORE_HM_GDSCR>;
>
> + status = "disabled";
> +
> clocks = <&gcc GCC_LPASS_CFG_NOC_SWAY_CLK>,
> <&lpasscc LPASS_AUDIO_CORE_CORE_CLK>,
> <&lpasscc LPASS_AUDIO_CORE_EXT_MCLK0_CLK>,
> @@ -3449,13 +3452,13 @@
> "mclk0", "pcnoc-mport-clk",
> "mi2s-bit-clk0", "mi2s-bit-clk1";
>
> -
> #sound-dai-cells = <1>;
> #address-cells = <1>;
> #size-cells = <0>;
>
> - interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;
> - interrupt-names = "lpass-irq-lpaif";
> + interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
> + interrupt-names = "lpass-irq-lpaif", "lpass-irq-hdmi";
> };
>
> lpass_hm: clock-controller@63000000 {
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI
2020-09-30 6:42 [PATCH v3 0/2] Qualcomm's lpass device tree changes Srinivasa Rao Mandadapu
2020-09-30 6:42 ` [PATCH v3 1/2] arm64: dts: qcom: sc7180: Update lpass cpu node for audio over dp Srinivasa Rao Mandadapu
@ 2020-09-30 6:42 ` Srinivasa Rao Mandadapu
2020-11-30 11:02 ` Srinivas Kandagatla
` (2 more replies)
2020-11-30 16:53 ` [PATCH v3 0/2] Qualcomm's lpass device tree changes Bjorn Andersson
2 siblings, 3 replies; 9+ messages in thread
From: Srinivasa Rao Mandadapu @ 2020-09-30 6:42 UTC (permalink / raw)
To: agross, bjorn.andersson, robh+dt, linux-arm-msm, devicetree,
linux-kernel, rohitkr, srinivas.kandagatla
Cc: V Sujith Kumar Reddy, Srinivasa Rao Mandadapu
From: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
Add dai link in sc7180-trogdor.dtsi for supporting audio over DP
Signed-off-by: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
Signed-off-by: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
---
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 5724982..850b43e 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -231,6 +231,7 @@
audio-jack = <&alc5682>;
+ #sound-dai-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
@@ -257,6 +258,17 @@
sound-dai = <&max98357a>;
};
};
+ dai-link@2 {
+ link-name = "MultiMedia2";
+ reg = <2>;
+ cpu {
+ sound-dai = <&lpass_cpu 2>;
+ };
+
+ codec {
+ sound-dai = <&msm_dp>;
+ };
+ };
};
};
@@ -782,6 +794,9 @@ hp_i2c: &i2c9 {
reg = <MI2S_SECONDARY>;
qcom,playback-sd-lines = <0>;
};
+ hdmi-primary@0 {
+ reg = <LPASS_DP_RX>;
+ };
};
&mdp {
--
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] 9+ messages in thread* Re: [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI
2020-09-30 6:42 ` [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI Srinivasa Rao Mandadapu
@ 2020-11-30 11:02 ` Srinivas Kandagatla
2021-01-15 3:18 ` Stephen Boyd
2021-07-21 4:44 ` Stephen Boyd
2 siblings, 0 replies; 9+ messages in thread
From: Srinivas Kandagatla @ 2020-11-30 11:02 UTC (permalink / raw)
To: Srinivasa Rao Mandadapu, agross, bjorn.andersson, robh+dt,
linux-arm-msm, devicetree, linux-kernel, rohitkr
Cc: V Sujith Kumar Reddy
On 30/09/2020 07:42, Srinivasa Rao Mandadapu wrote:
> From: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
>
> Add dai link in sc7180-trogdor.dtsi for supporting audio over DP
>
> Signed-off-by: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
> Signed-off-by: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> index 5724982..850b43e 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> @@ -231,6 +231,7 @@
>
> audio-jack = <&alc5682>;
>
> + #sound-dai-cells = <0>;
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -257,6 +258,17 @@
> sound-dai = <&max98357a>;
> };
> };
> + dai-link@2 {
> + link-name = "MultiMedia2";
> + reg = <2>;
> + cpu {
> + sound-dai = <&lpass_cpu 2>;
> + };
> +
> + codec {
> + sound-dai = <&msm_dp>;
> + };
> + };
> };
> };
>
> @@ -782,6 +794,9 @@ hp_i2c: &i2c9 {
> reg = <MI2S_SECONDARY>;
> qcom,playback-sd-lines = <0>;
> };
> + hdmi-primary@0 {
> + reg = <LPASS_DP_RX>;
> + };
> };
>
> &mdp {
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI
2020-09-30 6:42 ` [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI Srinivasa Rao Mandadapu
2020-11-30 11:02 ` Srinivas Kandagatla
@ 2021-01-15 3:18 ` Stephen Boyd
2021-07-21 4:44 ` Stephen Boyd
2 siblings, 0 replies; 9+ messages in thread
From: Stephen Boyd @ 2021-01-15 3:18 UTC (permalink / raw)
To: Srinivasa Rao Mandadapu, agross, bjorn.andersson, devicetree,
linux-arm-msm, linux-kernel, robh+dt, rohitkr,
srinivas.kandagatla
Cc: V Sujith Kumar Reddy, Srinivasa Rao Mandadapu
Quoting Srinivasa Rao Mandadapu (2020-09-29 23:42:48)
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> index 5724982..850b43e 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> @@ -231,6 +231,7 @@
>
> audio-jack = <&alc5682>;
>
> + #sound-dai-cells = <0>;
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -257,6 +258,17 @@
> sound-dai = <&max98357a>;
> };
> };
Can you please add a newline here?
> + dai-link@2 {
> + link-name = "MultiMedia2";
> + reg = <2>;
> + cpu {
> + sound-dai = <&lpass_cpu 2>;
> + };
> +
> + codec {
> + sound-dai = <&msm_dp>;
> + };
> + };
> };
> };
>
> @@ -782,6 +794,9 @@ hp_i2c: &i2c9 {
> reg = <MI2S_SECONDARY>;
> qcom,playback-sd-lines = <0>;
> };
Can you please add a newline here?
> + hdmi-primary@0 {
This should be hdmi-primary@2 {
Or a more generic node name should be devised. dai@2 perhaps?
> + reg = <LPASS_DP_RX>;
> + };
> };
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI
2020-09-30 6:42 ` [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI Srinivasa Rao Mandadapu
2020-11-30 11:02 ` Srinivas Kandagatla
2021-01-15 3:18 ` Stephen Boyd
@ 2021-07-21 4:44 ` Stephen Boyd
2021-07-21 8:44 ` Srinivasa Rao Mandadapu
2 siblings, 1 reply; 9+ messages in thread
From: Stephen Boyd @ 2021-07-21 4:44 UTC (permalink / raw)
To: Srinivasa Rao Mandadapu, agross, bjorn.andersson, devicetree,
linux-arm-msm, linux-kernel, robh+dt, rohitkr,
srinivas.kandagatla
Cc: V Sujith Kumar Reddy
Quoting Srinivasa Rao Mandadapu (2020-09-29 23:42:48)
> From: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
>
> Add dai link in sc7180-trogdor.dtsi for supporting audio over DP
>
> Signed-off-by: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
> Signed-off-by: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
> ---
> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> index 5724982..850b43e 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> @@ -231,6 +231,7 @@
>
> audio-jack = <&alc5682>;
>
> + #sound-dai-cells = <0>;
> #address-cells = <1>;
> #size-cells = <0>;
>
> @@ -257,6 +258,17 @@
> sound-dai = <&max98357a>;
> };
> };
> + dai-link@2 {
> + link-name = "MultiMedia2";
> + reg = <2>;
> + cpu {
> + sound-dai = <&lpass_cpu 2>;
> + };
> +
> + codec {
> + sound-dai = <&msm_dp>;
I see qcom maintainers have picked up the dp node now. Can you resend?
This would need to change to mdss_dp. Also incorporate my comments from
January this year please.
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI
2021-07-21 4:44 ` Stephen Boyd
@ 2021-07-21 8:44 ` Srinivasa Rao Mandadapu
0 siblings, 0 replies; 9+ messages in thread
From: Srinivasa Rao Mandadapu @ 2021-07-21 8:44 UTC (permalink / raw)
To: Stephen Boyd, agross, bjorn.andersson, devicetree, linux-arm-msm,
linux-kernel, robh+dt, rohitkr, srinivas.kandagatla
Cc: V Sujith Kumar Reddy
Hi Stephen!!
Thanks for reminder.
On 7/21/2021 10:14 AM, Stephen Boyd wrote:
> Quoting Srinivasa Rao Mandadapu (2020-09-29 23:42:48)
>> From: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
>>
>> Add dai link in sc7180-trogdor.dtsi for supporting audio over DP
>>
>> Signed-off-by: V Sujith Kumar Reddy <vsujithk@codeaurora.org>
>> Signed-off-by: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
>> ---
>> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +++++++++++++++
>> 1 file changed, 15 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
>> index 5724982..850b43e 100644
>> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
>> @@ -231,6 +231,7 @@
>>
>> audio-jack = <&alc5682>;
>>
>> + #sound-dai-cells = <0>;
>> #address-cells = <1>;
>> #size-cells = <0>;
>>
>> @@ -257,6 +258,17 @@
>> sound-dai = <&max98357a>;
>> };
>> };
>> + dai-link@2 {
>> + link-name = "MultiMedia2";
>> + reg = <2>;
>> + cpu {
>> + sound-dai = <&lpass_cpu 2>;
>> + };
>> +
>> + codec {
>> + sound-dai = <&msm_dp>;
> I see qcom maintainers have picked up the dp node now. Can you resend?
> This would need to change to mdss_dp. Also incorporate my comments from
> January this year please.
Resent the patches. Please check V5 version of patches.
--
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] 9+ messages in thread
* Re: [PATCH v3 0/2] Qualcomm's lpass device tree changes
2020-09-30 6:42 [PATCH v3 0/2] Qualcomm's lpass device tree changes Srinivasa Rao Mandadapu
2020-09-30 6:42 ` [PATCH v3 1/2] arm64: dts: qcom: sc7180: Update lpass cpu node for audio over dp Srinivasa Rao Mandadapu
2020-09-30 6:42 ` [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI Srinivasa Rao Mandadapu
@ 2020-11-30 16:53 ` Bjorn Andersson
2 siblings, 0 replies; 9+ messages in thread
From: Bjorn Andersson @ 2020-11-30 16:53 UTC (permalink / raw)
To: Srinivasa Rao Mandadapu
Cc: agross, robh+dt, linux-arm-msm, devicetree, linux-kernel,
rohitkr, srinivas.kandagatla
On Wed 30 Sep 01:42 CDT 2020, Srinivasa Rao Mandadapu wrote:
> These patches are device tree changes to support audio over DP.
> It includes changes of HDMI reg, interrupt and iommu and
> hdmi dai link.
> These patches depends on the lpass I2S patch series
> and DP dts node patch series:
> -- https://patchwork.kernel.org/patch/11785073/
I've merged this one.
> -- https://patchwork.kernel.org/patch/11785235/
> -- https://patchwork.kernel.org/patch/11719511/
But please advice on what I should do with these two.
Regards,
Bjorn
>
> Changes Since v2:
> -- Removed obsolete hdmi-jack property.
> -- Updated sound dai cells property
> Changes Since v1:
> -- hdmi dai is added in lpass-cpu node.
>
> V Sujith Kumar Reddy (2):
> arm64: dts: qcom: sc7180: Update lpass cpu node for audio over dp
> arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI
>
> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +++++++++++++++
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 17 ++++++++++-------
> 2 files changed, 25 insertions(+), 7 deletions(-)
>
> --
> 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] 9+ messages in thread