* [PATCH 0/3] arm64: dts: qcom: Fix 'sdhci' nodes for 'make dtbs_check'
@ 2022-04-29 21:44 Bhupesh Sharma
2022-04-29 21:44 ` [PATCH 1/3] arm64: dts: qcom: sdm630: Fix 'interconnect-names' for sdhci nodes Bhupesh Sharma
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Bhupesh Sharma @ 2022-04-29 21:44 UTC (permalink / raw)
To: linux-arm-msm
Cc: bhupesh.sharma, bhupesh.linux, linux-kernel, bjorn.andersson
Since I sent a separate patchset to convert the Qualcomm 'sdhci-msm'
device-tree binding to yaml format, 'make dtbs_check' now reports several
issues with sdhci nodes used across qcom dts files.
This patchset fixes the same.
Bhupesh Sharma (3):
arm64: dts: qcom: sdm630: Fix 'interconnect-names' for sdhci nodes
arm64: dts: qcom: Fix node names for sdhci 'opp-table' nodes (across
dts files)
arm64: dts: qcom: Fix ordering of 'clocks' & 'clock-names' for sdhci
nodes
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 ++++----
arch/arm64/boot/dts/qcom/msm8916.dtsi | 12 ++++++------
arch/arm64/boot/dts/qcom/msm8994.dtsi | 14 +++++++-------
arch/arm64/boot/dts/qcom/qcs404.dtsi | 6 +++---
arch/arm64/boot/dts/qcom/sc7180.dtsi | 16 ++++++++--------
arch/arm64/boot/dts/qcom/sc7280.dtsi | 12 ++++++------
arch/arm64/boot/dts/qcom/sdm630.dtsi | 17 ++++++++++-------
arch/arm64/boot/dts/qcom/sm6350.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +-
10 files changed, 48 insertions(+), 45 deletions(-)
--
2.35.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/3] arm64: dts: qcom: sdm630: Fix 'interconnect-names' for sdhci nodes 2022-04-29 21:44 [PATCH 0/3] arm64: dts: qcom: Fix 'sdhci' nodes for 'make dtbs_check' Bhupesh Sharma @ 2022-04-29 21:44 ` Bhupesh Sharma 2022-04-29 21:44 ` [PATCH 2/3] arm64: dts: qcom: Fix node names for sdhci 'opp-table' nodes (across dts files) Bhupesh Sharma 2022-04-29 21:44 ` [PATCH 3/3] arm64: dts: qcom: Fix ordering of 'clocks' & 'clock-names' for sdhci nodes Bhupesh Sharma 2 siblings, 0 replies; 6+ messages in thread From: Bhupesh Sharma @ 2022-04-29 21:44 UTC (permalink / raw) To: linux-arm-msm Cc: bhupesh.sharma, bhupesh.linux, linux-kernel, bjorn.andersson, Rob Herring Since the Qualcomm sdhci-msm device-tree binding has been converted to yaml format, 'make dtbs_check' reports issues with inconsistent 'interconnect-names' used for sdhci nodes. Fix the same. Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Rob Herring <robh@kernel.org> Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> --- arch/arm64/boot/dts/qcom/sdm630.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index 7f875bf9390a..db18b35d4a7d 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -1285,6 +1285,7 @@ sdhc_2: sdhci@c084000 { interconnects = <&a2noc 3 &a2noc 10>, <&gnoc 0 &cnoc 28>; + interconnect-names = "sdhc-ddr","cpu-sdhc"; operating-points-v2 = <&sdhc2_opp_table>; pinctrl-names = "default", "sleep"; @@ -1337,7 +1338,7 @@ sdhc_1: sdhci@c0c4000 { interconnects = <&a2noc 2 &a2noc 10>, <&gnoc 0 &cnoc 27>; - interconnect-names = "sdhc1-ddr", "cpu-sdhc1"; + interconnect-names = "sdhc-ddr", "cpu-sdhc"; operating-points-v2 = <&sdhc1_opp_table>; pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_state_on>; -- 2.35.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] arm64: dts: qcom: Fix node names for sdhci 'opp-table' nodes (across dts files) 2022-04-29 21:44 [PATCH 0/3] arm64: dts: qcom: Fix 'sdhci' nodes for 'make dtbs_check' Bhupesh Sharma 2022-04-29 21:44 ` [PATCH 1/3] arm64: dts: qcom: sdm630: Fix 'interconnect-names' for sdhci nodes Bhupesh Sharma @ 2022-04-29 21:44 ` Bhupesh Sharma 2022-05-06 3:16 ` Bjorn Andersson 2022-04-29 21:44 ` [PATCH 3/3] arm64: dts: qcom: Fix ordering of 'clocks' & 'clock-names' for sdhci nodes Bhupesh Sharma 2 siblings, 1 reply; 6+ messages in thread From: Bhupesh Sharma @ 2022-04-29 21:44 UTC (permalink / raw) To: linux-arm-msm Cc: bhupesh.sharma, bhupesh.linux, linux-kernel, bjorn.andersson, Rob Herring Since the Qualcomm sdhci-msm device-tree binding has been converted to yaml format, 'make dtbs_check' reports a number of issues with node names for sdhci 'opp-table' nodes, as it doesn't seem to like any 'preceding text or numbers' before 'opp-table' pattern in the node names. Fix the same. Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Rob Herring <robh@kernel.org> Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> --- arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/sm6350.dtsi | 4 ++-- arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 86175d257b1e..b6df3186e94c 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -725,7 +725,7 @@ sdhc_1: sdhci@7c4000 { status = "disabled"; - sdhc1_opp_table: sdhc1-opp-table { + sdhc1_opp_table: opp-table-sdhc1 { compatible = "operating-points-v2"; opp-100000000 { @@ -2609,7 +2609,7 @@ sdhc_2: sdhci@8804000 { status = "disabled"; - sdhc2_opp_table: sdhc2-opp-table { + sdhc2_opp_table: opp-table-sdhc2 { compatible = "operating-points-v2"; opp-100000000 { diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi index fb1a0f662575..87a5d72b2ca0 100644 --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi @@ -497,7 +497,7 @@ sdhc_1: sdhci@7c4000 { status = "disabled"; - sdhc1_opp_table: sdhc1-opp-table { + sdhc1_opp_table: opp-table-sdhc1 { compatible = "operating-points-v2"; opp-19200000 { @@ -941,7 +941,7 @@ sdhc_2: sdhci@8804000 { status = "disabled"; - sdhc2_opp_table: sdhc2-opp-table { + sdhc2_opp_table: opp-table-sdhc2 { compatible = "operating-points-v2"; opp-100000000 { diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 2700a8145cb9..e265d61f7c05 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -3563,7 +3563,7 @@ sdhc_2: sdhci@8804000 { status = "disabled"; - sdhc2_opp_table: sdhc2-opp-table { + sdhc2_opp_table: opp-table { compatible = "operating-points-v2"; opp-19200000 { diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi index dc2562070336..5ca16f76ddeb 100644 --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi @@ -2937,7 +2937,7 @@ sdhc_2: sdhci@8804000 { status = "disabled"; - sdhc2_opp_table: sdhc2-opp-table { + sdhc2_opp_table: opp-table { compatible = "operating-points-v2"; opp-19200000 { -- 2.35.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] arm64: dts: qcom: Fix node names for sdhci 'opp-table' nodes (across dts files) 2022-04-29 21:44 ` [PATCH 2/3] arm64: dts: qcom: Fix node names for sdhci 'opp-table' nodes (across dts files) Bhupesh Sharma @ 2022-05-06 3:16 ` Bjorn Andersson 2022-05-06 4:49 ` Bhupesh Sharma 0 siblings, 1 reply; 6+ messages in thread From: Bjorn Andersson @ 2022-05-06 3:16 UTC (permalink / raw) To: Bhupesh Sharma; +Cc: linux-arm-msm, bhupesh.linux, linux-kernel, Rob Herring On Fri 29 Apr 16:44 CDT 2022, Bhupesh Sharma wrote: > Since the Qualcomm sdhci-msm device-tree binding has been converted > to yaml format, 'make dtbs_check' reports a number of issues with > node names for sdhci 'opp-table' nodes, as it doesn't seem to like > any 'preceding text or numbers' before 'opp-table' pattern in the > node names. > > Fix the same. > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > Cc: Rob Herring <robh@kernel.org> > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> > --- > arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ++-- > arch/arm64/boot/dts/qcom/sm6350.dtsi | 4 ++-- > arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- > arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi > index 86175d257b1e..b6df3186e94c 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > @@ -725,7 +725,7 @@ sdhc_1: sdhci@7c4000 { > > status = "disabled"; > > - sdhc1_opp_table: sdhc1-opp-table { > + sdhc1_opp_table: opp-table-sdhc1 { There's only a single opp-table child node of &sdhc_1, so I would prefer that these would just be: sdhc1_opp_table: opp-table { Like what you did in the sm8150 and sm8250 case below. Can you please update this accordingly? Thanks, Bjorn > compatible = "operating-points-v2"; > > opp-100000000 { > @@ -2609,7 +2609,7 @@ sdhc_2: sdhci@8804000 { > > status = "disabled"; > > - sdhc2_opp_table: sdhc2-opp-table { > + sdhc2_opp_table: opp-table-sdhc2 { > compatible = "operating-points-v2"; > > opp-100000000 { > diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi > index fb1a0f662575..87a5d72b2ca0 100644 > --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi > @@ -497,7 +497,7 @@ sdhc_1: sdhci@7c4000 { > > status = "disabled"; > > - sdhc1_opp_table: sdhc1-opp-table { > + sdhc1_opp_table: opp-table-sdhc1 { > compatible = "operating-points-v2"; > > opp-19200000 { > @@ -941,7 +941,7 @@ sdhc_2: sdhci@8804000 { > > status = "disabled"; > > - sdhc2_opp_table: sdhc2-opp-table { > + sdhc2_opp_table: opp-table-sdhc2 { > compatible = "operating-points-v2"; > > opp-100000000 { > diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi > index 2700a8145cb9..e265d61f7c05 100644 > --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi > @@ -3563,7 +3563,7 @@ sdhc_2: sdhci@8804000 { > > status = "disabled"; > > - sdhc2_opp_table: sdhc2-opp-table { > + sdhc2_opp_table: opp-table { > compatible = "operating-points-v2"; > > opp-19200000 { > diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi > index dc2562070336..5ca16f76ddeb 100644 > --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi > @@ -2937,7 +2937,7 @@ sdhc_2: sdhci@8804000 { > > status = "disabled"; > > - sdhc2_opp_table: sdhc2-opp-table { > + sdhc2_opp_table: opp-table { > compatible = "operating-points-v2"; > > opp-19200000 { > -- > 2.35.1 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] arm64: dts: qcom: Fix node names for sdhci 'opp-table' nodes (across dts files) 2022-05-06 3:16 ` Bjorn Andersson @ 2022-05-06 4:49 ` Bhupesh Sharma 0 siblings, 0 replies; 6+ messages in thread From: Bhupesh Sharma @ 2022-05-06 4:49 UTC (permalink / raw) To: Bjorn Andersson; +Cc: linux-arm-msm, bhupesh.linux, linux-kernel, Rob Herring Hi Bjorn, On Fri, 6 May 2022 at 08:46, Bjorn Andersson <bjorn.andersson@linaro.org> wrote: > > On Fri 29 Apr 16:44 CDT 2022, Bhupesh Sharma wrote: > > > Since the Qualcomm sdhci-msm device-tree binding has been converted > > to yaml format, 'make dtbs_check' reports a number of issues with > > node names for sdhci 'opp-table' nodes, as it doesn't seem to like > > any 'preceding text or numbers' before 'opp-table' pattern in the > > node names. > > > > Fix the same. > > > > Cc: Bjorn Andersson <bjorn.andersson@linaro.org> > > Cc: Rob Herring <robh@kernel.org> > > Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> > > --- > > arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ++-- > > arch/arm64/boot/dts/qcom/sm6350.dtsi | 4 ++-- > > arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- > > arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- > > 4 files changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi > > index 86175d257b1e..b6df3186e94c 100644 > > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > > @@ -725,7 +725,7 @@ sdhc_1: sdhci@7c4000 { > > > > status = "disabled"; > > > > - sdhc1_opp_table: sdhc1-opp-table { > > + sdhc1_opp_table: opp-table-sdhc1 { > > There's only a single opp-table child node of &sdhc_1, so I would prefer > that these would just be: > > sdhc1_opp_table: opp-table { > > Like what you did in the sm8150 and sm8250 case below. > > Can you please update this accordingly? Sure, let me fix these in v2. Thanks, Bhupesh > > > compatible = "operating-points-v2"; > > > > opp-100000000 { > > @@ -2609,7 +2609,7 @@ sdhc_2: sdhci@8804000 { > > > > status = "disabled"; > > > > - sdhc2_opp_table: sdhc2-opp-table { > > + sdhc2_opp_table: opp-table-sdhc2 { > > compatible = "operating-points-v2"; > > > > opp-100000000 { > > diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi > > index fb1a0f662575..87a5d72b2ca0 100644 > > --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi > > @@ -497,7 +497,7 @@ sdhc_1: sdhci@7c4000 { > > > > status = "disabled"; > > > > - sdhc1_opp_table: sdhc1-opp-table { > > + sdhc1_opp_table: opp-table-sdhc1 { > > compatible = "operating-points-v2"; > > > > opp-19200000 { > > @@ -941,7 +941,7 @@ sdhc_2: sdhci@8804000 { > > > > status = "disabled"; > > > > - sdhc2_opp_table: sdhc2-opp-table { > > + sdhc2_opp_table: opp-table-sdhc2 { > > compatible = "operating-points-v2"; > > > > opp-100000000 { > > diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi > > index 2700a8145cb9..e265d61f7c05 100644 > > --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi > > @@ -3563,7 +3563,7 @@ sdhc_2: sdhci@8804000 { > > > > status = "disabled"; > > > > - sdhc2_opp_table: sdhc2-opp-table { > > + sdhc2_opp_table: opp-table { > > compatible = "operating-points-v2"; > > > > opp-19200000 { > > diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi > > index dc2562070336..5ca16f76ddeb 100644 > > --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi > > @@ -2937,7 +2937,7 @@ sdhc_2: sdhci@8804000 { > > > > status = "disabled"; > > > > - sdhc2_opp_table: sdhc2-opp-table { > > + sdhc2_opp_table: opp-table { > > compatible = "operating-points-v2"; > > > > opp-19200000 { > > -- > > 2.35.1 > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] arm64: dts: qcom: Fix ordering of 'clocks' & 'clock-names' for sdhci nodes 2022-04-29 21:44 [PATCH 0/3] arm64: dts: qcom: Fix 'sdhci' nodes for 'make dtbs_check' Bhupesh Sharma 2022-04-29 21:44 ` [PATCH 1/3] arm64: dts: qcom: sdm630: Fix 'interconnect-names' for sdhci nodes Bhupesh Sharma 2022-04-29 21:44 ` [PATCH 2/3] arm64: dts: qcom: Fix node names for sdhci 'opp-table' nodes (across dts files) Bhupesh Sharma @ 2022-04-29 21:44 ` Bhupesh Sharma 2 siblings, 0 replies; 6+ messages in thread From: Bhupesh Sharma @ 2022-04-29 21:44 UTC (permalink / raw) To: linux-arm-msm Cc: bhupesh.sharma, bhupesh.linux, linux-kernel, bjorn.andersson, Rob Herring Since the Qualcomm sdhci-msm device-tree binding has been converted to yaml format, 'make dtbs_check' reports a number of issues with ordering of 'clocks' & 'clock-names' for sdhci nodes: arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dtb: sdhci@7824900: clock-names:0: 'iface' was expected arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dtb: sdhci@7824900: clock-names:1: 'core' was expected arch/arm64/boot/dts/qcom/ipq8074-hk10-c2.dtb: sdhci@7824900: clock-names:2: 'xo' was expected Fix the same by updating the offending 'dts' files. Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Rob Herring <robh@kernel.org> Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org> --- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 ++++---- arch/arm64/boot/dts/qcom/msm8916.dtsi | 12 ++++++------ arch/arm64/boot/dts/qcom/msm8994.dtsi | 14 +++++++------- arch/arm64/boot/dts/qcom/qcs404.dtsi | 6 +++--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 12 ++++++------ arch/arm64/boot/dts/qcom/sc7280.dtsi | 12 ++++++------ arch/arm64/boot/dts/qcom/sdm630.dtsi | 14 ++++++++------ 7 files changed, 40 insertions(+), 38 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi index 943243d5515b..8cd4c1fbca17 100644 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi @@ -384,10 +384,10 @@ sdhc_1: sdhci@7824900 { <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&xo>, - <&gcc GCC_SDCC1_AHB_CLK>, - <&gcc GCC_SDCC1_APPS_CLK>; - clock-names = "xo", "iface", "core"; + clocks = <&gcc GCC_SDCC1_AHB_CLK>, + <&gcc GCC_SDCC1_APPS_CLK>, + <&xo>; + clock-names = "iface", "core", "xo"; max-frequency = <384000000>; mmc-ddr-1_8v; mmc-hs200-1_8v; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 05472510e29d..76bbf7984a62 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -1472,10 +1472,10 @@ sdhc_1: sdhci@7824000 { interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>, + clocks = <&gcc GCC_SDCC1_AHB_CLK>, + <&gcc GCC_SDCC1_APPS_CLK>, <&xo_board>; - clock-names = "core", "iface", "xo"; + clock-names = "iface", "core", "xo"; mmc-ddr-1_8v; bus-width = <8>; non-removable; @@ -1490,10 +1490,10 @@ sdhc_2: sdhci@7864000 { interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC2_APPS_CLK>, - <&gcc GCC_SDCC2_AHB_CLK>, + clocks = <&gcc GCC_SDCC2_AHB_CLK>, + <&gcc GCC_SDCC2_APPS_CLK>, <&xo_board>; - clock-names = "core", "iface", "xo"; + clock-names = "iface", "core", "xo"; bus-width = <4>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi index 367ed913902c..3c0df737fa92 100644 --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi @@ -467,10 +467,10 @@ sdhc1: sdhci@f9824900 { <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>, + clocks = <&gcc GCC_SDCC1_AHB_CLK>, + <&gcc GCC_SDCC1_APPS_CLK>, <&xo_board>; - clock-names = "core", "iface", "xo"; + clock-names = "iface", "core", "xo"; pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on &sdc1_rclk_on>; @@ -490,10 +490,10 @@ sdhc2: sdhci@f98a4900 { <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC2_APPS_CLK>, - <&gcc GCC_SDCC2_AHB_CLK>, - <&xo_board>; - clock-names = "core", "iface", "xo"; + clocks = <&gcc GCC_SDCC2_AHB_CLK>, + <&gcc GCC_SDCC2_APPS_CLK>, + <&xo_board>; + clock-names = "iface", "core", "xo"; pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on>; diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi index bc446c6002d0..3d6b88aedff2 100644 --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi @@ -798,10 +798,10 @@ sdcc1: sdcc@7804000 { <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>, + clocks = <&gcc GCC_SDCC1_AHB_CLK>, + <&gcc GCC_SDCC1_APPS_CLK>, <&xo_board>; - clock-names = "core", "iface", "xo"; + clock-names = "iface", "core", "xo"; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index b6df3186e94c..8b4d7d83e582 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -704,10 +704,10 @@ sdhc_1: sdhci@7c4000 { <GIC_SPI 644 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>, + clocks = <&gcc GCC_SDCC1_AHB_CLK>, + <&gcc GCC_SDCC1_APPS_CLK>, <&rpmhcc RPMH_CXO_CLK>; - clock-names = "core", "iface", "xo"; + clock-names = "iface", "core", "xo"; interconnects = <&aggre1_noc MASTER_EMMC 0 &mc_virt SLAVE_EBI1 0>, <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_EMMC_CFG 0>; interconnect-names = "sdhc-ddr","cpu-sdhc"; @@ -2594,10 +2594,10 @@ sdhc_2: sdhci@8804000 { <GIC_SPI 222 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC2_APPS_CLK>, - <&gcc GCC_SDCC2_AHB_CLK>, + clocks = <&gcc GCC_SDCC2_AHB_CLK>, + <&gcc GCC_SDCC2_APPS_CLK>, <&rpmhcc RPMH_CXO_CLK>; - clock-names = "core", "iface", "xo"; + clock-names = "iface", "core", "xo"; interconnects = <&aggre1_noc MASTER_SDCC_2 0 &mc_virt SLAVE_EBI1 0>, <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_SDCC_2 0>; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index ccf5e95071f9..11270d90e1cc 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -873,10 +873,10 @@ sdhc_1: sdhci@7c4000 { <GIC_SPI 656 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>, + clocks = <&gcc GCC_SDCC1_AHB_CLK>, + <&gcc GCC_SDCC1_APPS_CLK>, <&rpmhcc RPMH_CXO_CLK>; - clock-names = "core", "iface", "xo"; + clock-names = "iface", "core", "xo"; interconnects = <&aggre1_noc MASTER_SDCC_1 0 &mc_virt SLAVE_EBI1 0>, <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_SDCC_1 0>; interconnect-names = "sdhc-ddr","cpu-sdhc"; @@ -2950,10 +2950,10 @@ sdhc_2: sdhci@8804000 { <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC2_APPS_CLK>, - <&gcc GCC_SDCC2_AHB_CLK>, + clocks = <&gcc GCC_SDCC2_AHB_CLK>, + <&gcc GCC_SDCC2_APPS_CLK>, <&rpmhcc RPMH_CXO_CLK>; - clock-names = "core", "iface", "xo"; + clock-names = "iface", "core", "xo"; interconnects = <&aggre1_noc MASTER_SDCC_2 0 &mc_virt SLAVE_EBI1 0>, <&gem_noc MASTER_APPSS_PROC 0 &cnoc2 SLAVE_SDCC_2 0>; interconnect-names = "sdhc-ddr","cpu-sdhc"; diff --git a/arch/arm64/boot/dts/qcom/sdm630.dtsi b/arch/arm64/boot/dts/qcom/sdm630.dtsi index db18b35d4a7d..65c4e955893b 100644 --- a/arch/arm64/boot/dts/qcom/sdm630.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm630.dtsi @@ -1278,10 +1278,12 @@ sdhc_2: sdhci@c084000 { interrupt-names = "hc_irq", "pwr_irq"; bus-width = <4>; - clocks = <&gcc GCC_SDCC2_APPS_CLK>, - <&gcc GCC_SDCC2_AHB_CLK>, + + clocks = <&gcc GCC_SDCC2_AHB_CLK>, + <&gcc GCC_SDCC2_APPS_CLK>, <&xo_board>; - clock-names = "core", "iface", "xo"; + clock-names = "iface", "core", "xo"; + interconnects = <&a2noc 3 &a2noc 10>, <&gnoc 0 &cnoc 28>; @@ -1330,11 +1332,11 @@ sdhc_1: sdhci@c0c4000 { <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>, + clocks = <&gcc GCC_SDCC1_AHB_CLK>, + <&gcc GCC_SDCC1_APPS_CLK>, <&xo_board>, <&gcc GCC_SDCC1_ICE_CORE_CLK>; - clock-names = "core", "iface", "xo", "ice"; + clock-names = "iface", "core", "xo", "ice"; interconnects = <&a2noc 2 &a2noc 10>, <&gnoc 0 &cnoc 27>; -- 2.35.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-05-06 4:50 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-04-29 21:44 [PATCH 0/3] arm64: dts: qcom: Fix 'sdhci' nodes for 'make dtbs_check' Bhupesh Sharma 2022-04-29 21:44 ` [PATCH 1/3] arm64: dts: qcom: sdm630: Fix 'interconnect-names' for sdhci nodes Bhupesh Sharma 2022-04-29 21:44 ` [PATCH 2/3] arm64: dts: qcom: Fix node names for sdhci 'opp-table' nodes (across dts files) Bhupesh Sharma 2022-05-06 3:16 ` Bjorn Andersson 2022-05-06 4:49 ` Bhupesh Sharma 2022-04-29 21:44 ` [PATCH 3/3] arm64: dts: qcom: Fix ordering of 'clocks' & 'clock-names' for sdhci nodes Bhupesh Sharma
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.