[PATCH v2 1/9] mmc: msm_sdhci: Match clocks through "clocks" property

Konrad Dybcio konrad.dybcio at linaro.org
Mon Mar 27 12:44:59 CEST 2023


"clocks" is the standard property used in Linux, "clock" seems to be
an U-Boot invention. Use the one that's more standardized.

Signed-off-by: Konrad Dybcio <konrad.dybcio at linaro.org>
---
 arch/arm/dts/dragonboard410c.dts | 4 ++--
 arch/arm/dts/dragonboard820c.dts | 2 +-
 arch/arm/dts/qcs404-evb.dts      | 4 ++--
 drivers/mmc/msm_sdhci.c          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/dts/dragonboard410c.dts b/arch/arm/dts/dragonboard410c.dts
index 9230dd3fd96c..99391df13080 100644
--- a/arch/arm/dts/dragonboard410c.dts
+++ b/arch/arm/dts/dragonboard410c.dts
@@ -107,7 +107,7 @@
 			bus-width = <0x8>;
 			index = <0x0>;
 			non-removable;
-			clock = <&clkc 0>;
+			clocks = <&clkc 0>;
 			clock-frequency = <100000000>;
 		};
 
@@ -116,7 +116,7 @@
 			reg = <0x7864900 0x11c 0x7864000 0x800>;
 			index = <0x1>;
 			bus-width = <0x4>;
-			clock = <&clkc 1>;
+			clocks = <&clkc 1>;
 			clock-frequency = <200000000>;
 			cd-gpios = <&soc_gpios 38 GPIO_ACTIVE_LOW>;
 		};
diff --git a/arch/arm/dts/dragonboard820c.dts b/arch/arm/dts/dragonboard820c.dts
index ad201d48749c..9c234d81c1ee 100644
--- a/arch/arm/dts/dragonboard820c.dts
+++ b/arch/arm/dts/dragonboard820c.dts
@@ -88,7 +88,7 @@
 			reg = <0x74a4900 0x314>, <0x74a4000 0x800>;
 			index = <0x0>;
 			bus-width = <4>;
-			clock = <&gcc 0>;
+			clocks = <&gcc 0>;
 			clock-frequency = <200000000>;
 		 };
 
diff --git a/arch/arm/dts/qcs404-evb.dts b/arch/arm/dts/qcs404-evb.dts
index 8d7893c11695..d973aa13169c 100644
--- a/arch/arm/dts/qcs404-evb.dts
+++ b/arch/arm/dts/qcs404-evb.dts
@@ -229,8 +229,8 @@
 		sdhci at 7804000 {
 			compatible = "qcom,sdhci-msm-v5";
 			reg = <0x7804000 0x1000 0x7805000 0x1000>;
-			clock = <&gcc GCC_SDCC1_APPS_CLK>,
-				<&gcc GCC_SDCC1_AHB_CLK>;
+			clocks = <&gcc GCC_SDCC1_APPS_CLK>,
+				 <&gcc GCC_SDCC1_AHB_CLK>;
 			bus-width = <0x8>;
 			index = <0x0>;
 			non-removable;
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 604f9c3ff99c..174435f01f68 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -63,7 +63,7 @@ static int msm_sdc_clk_init(struct udevice *dev)
 	struct clk clk;
 	int ret;
 
-	ret = fdtdec_get_int_array(gd->fdt_blob, node, "clock", clkd, 2);
+	ret = fdtdec_get_int_array(gd->fdt_blob, node, "clocks", clkd, 2);
 	if (ret)
 		return ret;
 

-- 
2.40.0



More information about the U-Boot mailing list