Changes since v1:
----------------
- v1 can be seen here: https://lore.kernel.org/linux-arm-msm/[email protected]/
- Fixed Bjorn's comments received on v1.
- Added 3 more dts fix-up patches [PATCH 1/6], [PATCH 5/6]
and [PATCH 6/6] in v2.
Since the change to convert the Qualcomm 'sdhci-msm' device-tree binding
to yaml format has been accepted in linux-next and a fix for the same
was sent as per Rob's review comments, 'make dtbs_check' now
reports several issues with sdhci nodes used across qcom dts files.
This patchset fixes the same.
Cc: Bjorn Andersson <[email protected]>
Cc: Rob Herring <[email protected]>
Bhupesh Sharma (6):
arm64: dts: qcom: Fix sdhci node names - use 'mmc@'
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
arm64: dts: qcom: Fix 'reg-names' for sdhci nodes
arm64: dts: qcom: ipq8074: Fix 'max-frequency' value for sdhci node
arch/arm/boot/dts/qcom-apq8084.dtsi | 4 ++--
arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +-
arch/arm/boot/dts/qcom-msm8226.dtsi | 6 +++---
arch/arm/boot/dts/qcom-msm8974.dtsi | 6 +++---
arch/arm/boot/dts/qcom-sdx55.dtsi | 2 +-
arch/arm/boot/dts/qcom-sdx65.dtsi | 2 +-
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 12 ++++++------
arch/arm64/boot/dts/qcom/msm8916.dtsi | 16 ++++++++--------
arch/arm64/boot/dts/qcom/msm8953.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/msm8994.dtsi | 18 +++++++++---------
arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +-
arch/arm64/boot/dts/qcom/qcs404.dtsi | 10 +++++-----
arch/arm64/boot/dts/qcom/sc7180.dtsi | 22 +++++++++++-----------
arch/arm64/boot/dts/qcom/sc7280.dtsi | 18 +++++++++---------
arch/arm64/boot/dts/qcom/sdm630.dtsi | 25 ++++++++++++++-----------
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sm6125.dtsi | 8 ++++----
arch/arm64/boot/dts/qcom/sm6350.dtsi | 10 +++++-----
arch/arm64/boot/dts/qcom/sm8150.dtsi | 4 ++--
arch/arm64/boot/dts/qcom/sm8250.dtsi | 4 ++--
21 files changed, 92 insertions(+), 89 deletions(-)
--
2.35.3
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 4a316c50484d..df0006d4a560 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -725,7 +725,7 @@ sdhc_1: mmc@7c4000 {
status = "disabled";
- sdhc1_opp_table: sdhc1-opp-table {
+ sdhc1_opp_table: opp-table {
compatible = "operating-points-v2";
opp-100000000 {
@@ -2602,7 +2602,7 @@ sdhc_2: mmc@8804000 {
status = "disabled";
- sdhc2_opp_table: sdhc2-opp-table {
+ sdhc2_opp_table: opp-table {
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 13c7ae2e379e..1b1eb884136b 100644
--- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
@@ -497,7 +497,7 @@ sdhc_1: mmc@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: mmc@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 a2a1c77c0428..e6b309e9c05b 100644
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -3563,7 +3563,7 @@ sdhc_2: mmc@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 6c06e3b2ad2d..9b6dea34cd69 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -2937,7 +2937,7 @@ sdhc_2: mmc@8804000 {
status = "disabled";
- sdhc2_opp_table: sdhc2-opp-table {
+ sdhc2_opp_table: opp-table {
compatible = "operating-points-v2";
opp-19200000 {
--
2.35.3
On Sun, 15 May 2022 03:24:18 +0530, Bhupesh Sharma wrote:
> Changes since v1:
> ----------------
> - v1 can be seen here: https://lore.kernel.org/linux-arm-msm/[email protected]/
> - Fixed Bjorn's comments received on v1.
> - Added 3 more dts fix-up patches [PATCH 1/6], [PATCH 5/6]
> and [PATCH 6/6] in v2.
>
> [...]
Applied, thanks!
[1/6] arm64: dts: qcom: Fix sdhci node names - use 'mmc@'
commit: 2477d81901a23ad80045798edbeb7f91b5ff6143
[2/6] arm64: dts: qcom: sdm630: Fix 'interconnect-names' for sdhci nodes
commit: 40940823cb582acc13f5fda5688a5287893b3281
[3/6] arm64: dts: qcom: Fix node names for sdhci 'opp-table' nodes (across dts files)
(no commit info)
[4/6] arm64: dts: qcom: Fix ordering of 'clocks' & 'clock-names' for sdhci nodes
commit: 4ff12270dbbe245cf92c0247bcc1a2bfbc03639c
[5/6] arm64: dts: qcom: Fix 'reg-names' for sdhci nodes
commit: afcbe252e9c19161e4d4c95f33faaf592f1de086
Best regards,
--
Bjorn Andersson <[email protected]>