Qualcomm's lpass device tree changes
Subsystems (4)
v3 cover Qualcomm's lpass device tree changes
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/
-- https://patchwork.kernel.org/patch/11785235/
-- https://patchwork.kernel.org/patch/11719511/
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(-)
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
PATCH v3 1/2 arm64: dts: qcom: sc7180: Update lpass cpu node for audio over dp
From: V Sujith Kumar Reddy <[email protected]>
Updaate lpass dts node with HDMI reg, interrupt and iommu for supporting audio over dp.
--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)
arch/arm64/boot/dts/qcom/sc7180.dtsi +10 -7
@@ -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 {
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v3 1/2] arm64: dts: qcom: sc7180: Update lpass cpu node for audio over dp
Quoted 7 lines · Srinivasa Rao Mandadapu
From: V Sujith Kumar Reddy <[email protected]>
Updaate lpass dts node with HDMI reg, interrupt and iommu for supporting audio over dp.
Signed-off-by Srinivasa Rao Mandadapu <[email protected]>Signed-off-by V Sujith Kumar Reddy <[email protected]>
Quoted 57 lines
--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)arch/arm64/boot/dts/qcom/sc7180.dtsi +10
-7@@ -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 {
PATCH v3 2/2 arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI
In reply to Srinivasa Rao MandadapuFrom: V Sujith Kumar Reddy <[email protected]>
Add dai link in sc7180-trogdor.dtsi for supporting audio over DP
--- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +15 -0
@@ -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 {
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI
Quoted 6 lines · Srinivasa Rao Mandadapu
From: V Sujith Kumar Reddy <[email protected]>
Add dai link in
sc7180-trogdor.dtsifor supporting audio over DPSigned-off-by V Sujith Kumar Reddy <[email protected]>Signed-off-by Srinivasa Rao Mandadapu <[email protected]>
Quoted 45 lines
--- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+)arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +15
-0@@ -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 {
Re: [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI
In reply to Srinivasa Rao MandadapuQuoting Srinivasa Rao Mandadapu (2020-09-29 23:42:48)
Quoted 13 lines
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +1
-0@@ -231,6 +231,7 @@ audio-jack = <&alc5682>; + #sound-dai-cells = <0>; #address-cells = <1>; #size-cells = <0>;
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi line 260
Quoted 3 lines
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +0
-0@@ -257,6 +258,17 @@ sound-dai = <&max98357a>; }; };
Can you please add a newline here?
Quoted 15 lines
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +11
-0+ dai-link@2 { + link-name = "MultiMedia2"; + reg = <2>; + cpu { + sound-dai = <&lpass_cpu 2>; + }; + + codec { + sound-dai = <&msm_dp>; + }; + }; }; };
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi hp_i2c: &i2c9 { · line 796
Quoted 3 lines
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +0
-0@@ -782,6 +794,9 @@ hp_i2c: &i2c9 { reg = <MI2S_SECONDARY>; qcom,playback-sd-lines = <0>; };
Can you please add a newline here?
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi hp_i2c: &i2c9 { · line 797
Quoted 1 line
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +1
-0+ hdmi-primary@0 {
This should be hdmi-primary@2 {
Or a more generic node name should be devised. dai@2 perhaps?
Quoted 4 lines
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +2
-0+ reg = <LPASS_DP_RX>; + }; };
Re: [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI
In reply to Srinivasa Rao MandadapuQuoting Srinivasa Rao Mandadapu (2020-09-29 23:42:48)
Quoted 25 lines
From: V Sujith Kumar Reddy <[email protected]>
Add dai link in
sc7180-trogdor.dtsifor supporting audio over DPSigned-off-by V Sujith Kumar Reddy <[email protected]>Signed-off-by Srinivasa Rao Mandadapu <[email protected]>--- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+)arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +1
-0@@ -231,6 +231,7 @@ audio-jack = <&alc5682>; + #sound-dai-cells = <0>; #address-cells = <1>; #size-cells = <0>;@@ -257,6 +258,17 @@ sound-dai = <&max98357a>; };
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi line 269
Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +9
-0}; + 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.
Re: [PATCH v3 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI
Hi Stephen!!
Thanks for reminder.
Quoted 23 lines · Stephen Boyd
Quoting Srinivasa Rao Mandadapu (2020-09-29 23:42:48)
Quoted 22 lines
From: V Sujith Kumar Reddy <[email protected]>
Add dai link in
sc7180-trogdor.dtsifor supporting audio over DPSigned-off-by V Sujith Kumar Reddy <[email protected]>Signed-off-by Srinivasa Rao Mandadapu <[email protected]>--- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+)arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +1
-0@@ -231,6 +231,7 @@ audio-jack = <&alc5682>; + #sound-dai-cells = <0>; #address-cells = <1>; #size-cells = <0>;
Quoted 16 lines
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi line 269
Quoted 13 lines
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +9
-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.
Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Quoted 6 lines · Srinivasa Rao Mandadapu
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.
Quoted 2 lines
-- 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
Quoted 19 lines
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 HDMIarch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 15 +++++++++++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 17 ++++++++++------- 2 files changed, 25 insertions(+), 7 deletions(-)Signature · 2 lines
Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.