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
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 <[email protected]>
Cc: Rob Herring <[email protected]>
Signed-off-by: Bhupesh Sharma <[email protected]>
---
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
Hi Bjorn,
On Fri, 6 May 2022 at 08:46, Bjorn Andersson <[email protected]> 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 <[email protected]>
> > Cc: Rob Herring <[email protected]>
> > Signed-off-by: Bhupesh Sharma <[email protected]>
> > ---
> > 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
> >
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 <[email protected]>
> Cc: Rob Herring <[email protected]>
> Signed-off-by: Bhupesh Sharma <[email protected]>
> ---
> 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
>