* [PATCH v5 0/2] Qualcomm's lpass device tree changes @ 2021-07-21 8:41 Srinivasa Rao Mandadapu 2021-07-21 8:41 ` [PATCH v5 1/2] arm64: dts: qcom: sc7180: Update lpass cpu node for audio over dp Srinivasa Rao Mandadapu 2021-07-21 8:41 ` [PATCH v5 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI Srinivasa Rao Mandadapu 0 siblings, 2 replies; 6+ messages in thread From: Srinivasa Rao Mandadapu @ 2021-07-21 8:41 UTC (permalink / raw) To: agross, bjorn.andersson, robh+dt, linux-arm-msm, devicetree, linux-kernel, rohitkr, srinivas.kandagatla, dianders, swboyd, judyhsiao Cc: Srinivasa Rao Mandadapu Changes Since v4: -- Signed off address change. Changes Since v3: -- Changed DP node name. 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 | 17 +++++++++++++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 16 ++++++++++------ 2 files changed, 27 insertions(+), 6 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] 6+ messages in thread
* [PATCH v5 1/2] arm64: dts: qcom: sc7180: Update lpass cpu node for audio over dp 2021-07-21 8:41 [PATCH v5 0/2] Qualcomm's lpass device tree changes Srinivasa Rao Mandadapu @ 2021-07-21 8:41 ` Srinivasa Rao Mandadapu 2021-07-21 8:41 ` [PATCH v5 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI Srinivasa Rao Mandadapu 1 sibling, 0 replies; 6+ messages in thread From: Srinivasa Rao Mandadapu @ 2021-07-21 8:41 UTC (permalink / raw) To: agross, bjorn.andersson, robh+dt, linux-arm-msm, devicetree, linux-kernel, rohitkr, srinivas.kandagatla, dianders, swboyd, judyhsiao 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: 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.dtsi | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index ad21a872be85..e6f6ebb2a9ac 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -3534,17 +3534,20 @@ lpasscc: clock-controller@62d00000 { #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>, - <&apps_smmu 0x1021 0>; + <&apps_smmu 0x1021 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>, @@ -3561,8 +3564,9 @@ lpass_cpu: lpass@62f00000 { #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] 6+ messages in thread
* [PATCH v5 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI 2021-07-21 8:41 [PATCH v5 0/2] Qualcomm's lpass device tree changes Srinivasa Rao Mandadapu 2021-07-21 8:41 ` [PATCH v5 1/2] arm64: dts: qcom: sc7180: Update lpass cpu node for audio over dp Srinivasa Rao Mandadapu @ 2021-07-21 8:41 ` Srinivasa Rao Mandadapu 2021-07-21 16:20 ` Doug Anderson 1 sibling, 1 reply; 6+ messages in thread From: Srinivasa Rao Mandadapu @ 2021-07-21 8:41 UTC (permalink / raw) To: agross, bjorn.andersson, robh+dt, linux-arm-msm, devicetree, linux-kernel, rohitkr, srinivas.kandagatla, dianders, swboyd, judyhsiao 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> Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 31bf7c698b8f..a4cb9ee567ff 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -288,6 +288,7 @@ sound: sound { "Headphone Jack", "HPOL", "Headphone Jack", "HPOR"; + #sound-dai-cells = <0>; #address-cells = <1>; #size-cells = <0>; @@ -314,6 +315,18 @@ sound_multimedia1_codec: codec { sound-dai = <&max98357a>; }; }; + + dai-link@2 { + link-name = "MultiMedia2"; + reg = <2>; + cpu { + sound-dai = <&lpass_cpu 2>; + }; + + codec { + sound-dai = <&mdss_dp>; + }; + }; }; }; @@ -768,6 +781,10 @@ secondary_mi2s: mi2s@1 { 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] 6+ messages in thread
* Re: [PATCH v5 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI 2021-07-21 8:41 ` [PATCH v5 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI Srinivasa Rao Mandadapu @ 2021-07-21 16:20 ` Doug Anderson 2021-07-22 14:49 ` Srinivasa Rao Mandadapu 0 siblings, 1 reply; 6+ messages in thread From: Doug Anderson @ 2021-07-21 16:20 UTC (permalink / raw) To: Srinivasa Rao Mandadapu Cc: Andy Gross, Bjorn Andersson, Rob Herring, linux-arm-msm, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, LKML, Rohit kumar, Srinivas Kandagatla, Stephen Boyd, Judy Hsiao, V Sujith Kumar Reddy Hi, On Wed, Jul 21, 2021 at 1:42 AM Srinivasa Rao Mandadapu <srivasam@codeaurora.org> 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 | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi > index 31bf7c698b8f..a4cb9ee567ff 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi > @@ -288,6 +288,7 @@ sound: sound { > "Headphone Jack", "HPOL", > "Headphone Jack", "HPOR"; > > + #sound-dai-cells = <0>; The `#sound-dai-cells` is not in the bindings. The bindings also say `additionalProperties: false`. So either your patch is wrong for including this or the bindings are wrong for omitting it. Which is it? I notice that downstream we don't have this. > @@ -314,6 +315,18 @@ sound_multimedia1_codec: codec { > sound-dai = <&max98357a>; Ideally you'll want to rebase to make context clean since the above got changed from `max98357a` to `max98360a`. > }; > }; > + > + dai-link@2 { > + link-name = "MultiMedia2"; > + reg = <2>; I am certainly not an expert, but I notice that downstream we have reg as <LPASS_DP_RX>, which makes the node name dai-link@5 instead of @2. Does that matter? > @@ -768,6 +781,10 @@ secondary_mi2s: mi2s@1 { > reg = <MI2S_SECONDARY>; > qcom,playback-sd-lines = <0>; > }; > + > + hdmi-primary@0 { > + reg = <LPASS_DP_RX>; Your node name and `reg` don't match. `LPASS_DP_RX` is 5 so the node name should include @5, not @0. I also notice that downstream the node name is called `hdmi`, not `hdmi-primary`. The downstream `hdmi` seems more parallel to the sibling nodes, like `mi2s@0` and `mi2s@1`. ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v5 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI 2021-07-21 16:20 ` Doug Anderson @ 2021-07-22 14:49 ` Srinivasa Rao Mandadapu 2021-07-22 14:52 ` Doug Anderson 0 siblings, 1 reply; 6+ messages in thread From: Srinivasa Rao Mandadapu @ 2021-07-22 14:49 UTC (permalink / raw) To: Doug Anderson Cc: Andy Gross, Bjorn Andersson, Rob Herring, linux-arm-msm, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, LKML, Rohit kumar, Srinivas Kandagatla, Stephen Boyd, Judy Hsiao, V Sujith Kumar Reddy Thanks for your time Doug!! On 7/21/2021 9:50 PM, Doug Anderson wrote: > Hi, > > On Wed, Jul 21, 2021 at 1:42 AM Srinivasa Rao Mandadapu > <srivasam@codeaurora.org> 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 | 17 +++++++++++++++++ >> 1 file changed, 17 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi >> index 31bf7c698b8f..a4cb9ee567ff 100644 >> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi >> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi >> @@ -288,6 +288,7 @@ sound: sound { >> "Headphone Jack", "HPOL", >> "Headphone Jack", "HPOR"; >> >> + #sound-dai-cells = <0>; > The `#sound-dai-cells` is not in the bindings. The bindings also say > `additionalProperties: false`. So either your patch is wrong for > including this or the bindings are wrong for omitting it. Which is it? > I notice that downstream we don't have this. > Yes it's wrongly placed Here. Will remove it. >> @@ -314,6 +315,18 @@ sound_multimedia1_codec: codec { >> sound-dai = <&max98357a>; > Ideally you'll want to rebase to make context clean since the above > got changed from `max98357a` to `max98360a`. > > >> }; >> }; >> + >> + dai-link@2 { >> + link-name = "MultiMedia2"; >> + reg = <2>; > I am certainly not an expert, but I notice that downstream we have reg > as <LPASS_DP_RX>, which makes the node name dai-link@5 instead of @2. > Does that matter? > Yes,Here reg as <LPASS_DP_RX> is correct option. Will change accordingly. But It seems dai-link@2 is appropriate as in this platform we are using only 3 nodes. i.e. I2S primary, I2S secondary and DP node. >> @@ -768,6 +781,10 @@ secondary_mi2s: mi2s@1 { >> reg = <MI2S_SECONDARY>; >> qcom,playback-sd-lines = <0>; >> }; >> + >> + hdmi-primary@0 { >> + reg = <LPASS_DP_RX>; > Your node name and `reg` don't match. `LPASS_DP_RX` is 5 so the node > name should include @5, not @0. I also notice that downstream the node > name is called `hdmi`, not `hdmi-primary`. The downstream `hdmi` seems > more parallel to the sibling nodes, like `mi2s@0` and `mi2s@1`. Yes hdmi@2 is appropriate. will change accordingly. -- 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] 6+ messages in thread
* Re: [PATCH v5 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI 2021-07-22 14:49 ` Srinivasa Rao Mandadapu @ 2021-07-22 14:52 ` Doug Anderson 0 siblings, 0 replies; 6+ messages in thread From: Doug Anderson @ 2021-07-22 14:52 UTC (permalink / raw) To: Srinivasa Rao Mandadapu Cc: Andy Gross, Bjorn Andersson, Rob Herring, linux-arm-msm, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, LKML, Rohit kumar, Srinivas Kandagatla, Stephen Boyd, Judy Hsiao, V Sujith Kumar Reddy Hi, On Thu, Jul 22, 2021 at 7:49 AM Srinivasa Rao Mandadapu <srivasam@codeaurora.org> wrote: > > Thanks for your time Doug!! > > On 7/21/2021 9:50 PM, Doug Anderson wrote: > > Hi, > > > > On Wed, Jul 21, 2021 at 1:42 AM Srinivasa Rao Mandadapu > > <srivasam@codeaurora.org> 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 | 17 +++++++++++++++++ > >> 1 file changed, 17 insertions(+) > >> > >> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi > >> index 31bf7c698b8f..a4cb9ee567ff 100644 > >> --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi > >> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi > >> @@ -288,6 +288,7 @@ sound: sound { > >> "Headphone Jack", "HPOL", > >> "Headphone Jack", "HPOR"; > >> > >> + #sound-dai-cells = <0>; > > The `#sound-dai-cells` is not in the bindings. The bindings also say > > `additionalProperties: false`. So either your patch is wrong for > > including this or the bindings are wrong for omitting it. Which is it? > > I notice that downstream we don't have this. > > > Yes it's wrongly placed Here. Will remove it. > >> @@ -314,6 +315,18 @@ sound_multimedia1_codec: codec { > >> sound-dai = <&max98357a>; > > Ideally you'll want to rebase to make context clean since the above > > got changed from `max98357a` to `max98360a`. > > > > > >> }; > >> }; > >> + > >> + dai-link@2 { > >> + link-name = "MultiMedia2"; > >> + reg = <2>; > > I am certainly not an expert, but I notice that downstream we have reg > > as <LPASS_DP_RX>, which makes the node name dai-link@5 instead of @2. > > Does that matter? > > > Yes,Here reg as <LPASS_DP_RX> is correct option. Will change > accordingly. But It seems dai-link@2 is appropriate as in this platform I think you misunderstand. The "@num" is _required_ to match the value for "reg". So if reg is 5 then you need "@5", not "@2" > we are using only 3 nodes. i.e. I2S primary, I2S secondary and DP node. > > >> @@ -768,6 +781,10 @@ secondary_mi2s: mi2s@1 { > >> reg = <MI2S_SECONDARY>; > >> qcom,playback-sd-lines = <0>; > >> }; > >> + > >> + hdmi-primary@0 { > >> + reg = <LPASS_DP_RX>; > > Your node name and `reg` don't match. `LPASS_DP_RX` is 5 so the node > > name should include @5, not @0. I also notice that downstream the node > > name is called `hdmi`, not `hdmi-primary`. The downstream `hdmi` seems > > more parallel to the sibling nodes, like `mi2s@0` and `mi2s@1`. > Yes hdmi@2 is appropriate. will change accordingly. Same here. Since LPASS_DP_RX is actually the number 5 then you need @5. I think there was discussion about allowing it to be @LPASS_DP_RX but last I remember the decision was to keep it as a number. -Doug ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-07-22 14:53 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-07-21 8:41 [PATCH v5 0/2] Qualcomm's lpass device tree changes Srinivasa Rao Mandadapu 2021-07-21 8:41 ` [PATCH v5 1/2] arm64: dts: qcom: sc7180: Update lpass cpu node for audio over dp Srinivasa Rao Mandadapu 2021-07-21 8:41 ` [PATCH v5 2/2] arm64: dts: qcom: sc7180-trogdor: Add lpass dai link for HDMI Srinivasa Rao Mandadapu 2021-07-21 16:20 ` Doug Anderson 2021-07-22 14:49 ` Srinivasa Rao Mandadapu 2021-07-22 14:52 ` Doug Anderson
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).