Message ID | 20221230153554.105856-9-robert.foss@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Enable Display for SM8350 | expand |
On 30/12/2022 16:35, Robert Foss wrote: > Use two interconnect cells in order to optionally > support a path tag. > > Signed-off-by: Robert Foss <robert.foss@linaro.org> > Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> > --- > arch/arm64/boot/dts/qcom/sm8350.dtsi | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > I think you need to rebase to include: https://lore.kernel.org/all/167233461761.1099840.5517525898039031248.b4-ty@kernel.org/ On which tree/revision did you base this? Best regards, Krzysztof
On Fri, 30 Dec 2022 at 17:12, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > On 30/12/2022 16:35, Robert Foss wrote: > > Use two interconnect cells in order to optionally > > support a path tag. > > > > Signed-off-by: Robert Foss <robert.foss@linaro.org> > > Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> > > --- > > arch/arm64/boot/dts/qcom/sm8350.dtsi | 28 ++++++++++++++-------------- > > 1 file changed, 14 insertions(+), 14 deletions(-) > > > > I think you need to rebase to include: > https://lore.kernel.org/all/167233461761.1099840.5517525898039031248.b4-ty@kernel.org/ Ah, I see. Functionally I seemed to do fine without those commits. > > On which tree/revision did you base this? msm/drm-msm-display-for-6.2 > > Best regards, > Krzysztof >
On 02/01/2023 18:10, Robert Foss wrote: > On Fri, 30 Dec 2022 at 17:12, Krzysztof Kozlowski > <krzysztof.kozlowski@linaro.org> wrote: >> >> On 30/12/2022 16:35, Robert Foss wrote: >>> Use two interconnect cells in order to optionally >>> support a path tag. >>> >>> Signed-off-by: Robert Foss <robert.foss@linaro.org> >>> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> >>> --- >>> arch/arm64/boot/dts/qcom/sm8350.dtsi | 28 ++++++++++++++-------------- >>> 1 file changed, 14 insertions(+), 14 deletions(-) >>> >> >> I think you need to rebase to include: >> https://lore.kernel.org/all/167233461761.1099840.5517525898039031248.b4-ty@kernel.org/ > > Ah, I see. Functionally I seemed to do fine without those commits. > >> >> On which tree/revision did you base this? > > msm/drm-msm-display-for-6.2 Then it is not a proper base for DTS changes - you will miss quite some commits. The DTS patches should be based on Bjorn's SoC tree or linux-next (although the latter sometimes can lead to conflicts). Best regards, Krzysztof
On Tue, 3 Jan 2023 at 08:59, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > On 02/01/2023 18:10, Robert Foss wrote: > > On Fri, 30 Dec 2022 at 17:12, Krzysztof Kozlowski > > <krzysztof.kozlowski@linaro.org> wrote: > >> > >> On 30/12/2022 16:35, Robert Foss wrote: > >>> Use two interconnect cells in order to optionally > >>> support a path tag. > >>> > >>> Signed-off-by: Robert Foss <robert.foss@linaro.org> > >>> Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> > >>> --- > >>> arch/arm64/boot/dts/qcom/sm8350.dtsi | 28 ++++++++++++++-------------- > >>> 1 file changed, 14 insertions(+), 14 deletions(-) > >>> > >> > >> I think you need to rebase to include: > >> https://lore.kernel.org/all/167233461761.1099840.5517525898039031248.b4-ty@kernel.org/ > > > > Ah, I see. Functionally I seemed to do fine without those commits. > > > >> > >> On which tree/revision did you base this? > > > > msm/drm-msm-display-for-6.2 > > Then it is not a proper base for DTS changes - you will miss quite some > commits. The DTS patches should be based on Bjorn's SoC tree or > linux-next (although the latter sometimes can lead to conflicts). Alright, then in that case this series needs to be split into 3 parts. The dts fixes, remaining dts changes & the remainder of code. Is this what you'd like to see? > > > Best regards, > Krzysztof >
On 03/01/2023 10:24, Robert Foss wrote: >>>> On which tree/revision did you base this? >>> >>> msm/drm-msm-display-for-6.2 >> >> Then it is not a proper base for DTS changes - you will miss quite some >> commits. The DTS patches should be based on Bjorn's SoC tree or >> linux-next (although the latter sometimes can lead to conflicts). > > Alright, then in that case this series needs to be split into 3 parts. > > The dts fixes, remaining dts changes & the remainder of code. The split of any fixes (or unrelated cleanups) is good idea anyway. However code can go with DTS - just base on linux-next. If you do not want to base on linux-next then splitting code from DTS is indeed one more good way to send it. > > Is this what you'd like to see? Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi index 770ea105a565..bdefbbb2e38f 100644 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi @@ -1543,56 +1543,56 @@ apps_smmu: iommu@15000000 { config_noc: interconnect@1500000 { compatible = "qcom,sm8350-config-noc"; reg = <0 0x01500000 0 0xa580>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; }; mc_virt: interconnect@1580000 { compatible = "qcom,sm8350-mc-virt"; reg = <0 0x01580000 0 0x1000>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; }; system_noc: interconnect@1680000 { compatible = "qcom,sm8350-system-noc"; reg = <0 0x01680000 0 0x1c200>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; }; aggre1_noc: interconnect@16e0000 { compatible = "qcom,sm8350-aggre1-noc"; reg = <0 0x016e0000 0 0x1f180>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; }; aggre2_noc: interconnect@1700000 { compatible = "qcom,sm8350-aggre2-noc"; reg = <0 0x01700000 0 0x33000>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; }; mmss_noc: interconnect@1740000 { compatible = "qcom,sm8350-mmss-noc"; reg = <0 0x01740000 0 0x1f080>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; }; lpass_ag_noc: interconnect@3c40000 { compatible = "qcom,sm8350-lpass-ag-noc"; reg = <0 0x03c40000 0 0xf080>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; }; compute_noc: interconnect@a0c0000{ compatible = "qcom,sm8350-compute-noc"; reg = <0 0x0a0c0000 0 0xa180>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; }; @@ -1620,8 +1620,8 @@ ipa: ipa@1e40000 { clocks = <&rpmhcc RPMH_IPA_CLK>; clock-names = "core"; - interconnects = <&aggre2_noc MASTER_IPA &mc_virt SLAVE_EBI1>, - <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_IPA_CFG>; + interconnects = <&aggre2_noc MASTER_IPA 0 &mc_virt SLAVE_EBI1 0>, + <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_IPA_CFG 0>; interconnect-names = "memory", "config"; @@ -1661,7 +1661,7 @@ mpss: remoteproc@4080000 { <&rpmhpd SM8350_MSS>; power-domain-names = "cx", "mss"; - interconnects = <&mc_virt MASTER_LLCC &mc_virt SLAVE_EBI1>; + interconnects = <&mc_virt MASTER_LLCC 0 &mc_virt SLAVE_EBI1 0>; memory-region = <&pil_modem_mem>; @@ -2238,7 +2238,7 @@ cdsp: remoteproc@98900000 { <&rpmhpd SM8350_MXC>; power-domain-names = "cx", "mxc"; - interconnects = <&compute_noc MASTER_CDSP_PROC &mc_virt SLAVE_EBI1>; + interconnects = <&compute_noc MASTER_CDSP_PROC 0 &mc_virt SLAVE_EBI1 0>; memory-region = <&pil_cdsp_mem>; @@ -2420,14 +2420,14 @@ usb_2_ssphy: phy@88ebe00 { dc_noc: interconnect@90c0000 { compatible = "qcom,sm8350-dc-noc"; reg = <0 0x090c0000 0 0x4200>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; }; gem_noc: interconnect@9100000 { compatible = "qcom,sm8350-gem-noc"; reg = <0 0x09100000 0 0xb4000>; - #interconnect-cells = <1>; + #interconnect-cells = <2>; qcom,bcm-voters = <&apps_bcm_voter>; };