Skip to contentSkip to conversation

arm64: dts: socfpga: Add clk-phase-sd-hs property to the sdmmc node

PATCH In review Dinh Nguyen 3 participants 9 messages Sep 19, 2022 – Sep 21, 2022

Subsystems (4)
lore
Share & tools
lore

Dinh Nguyen

author maintainer
#0 lore raw

PATCH 1/2 arm64: dts: socfpga: Add clk-phase-sd-hs property to the sdmmc node

The sdmmc controller's CIU(Card Interface Unit) clock's phase can be adjusted through the register in the system manager. Add the binding "altr,sysmgr-syscon" to the SDMMC node for the driver to access the system manager. Add the "clk-phase-sd-hs" property in the SDMMC node to designate the smpsel and drvsel properties for the CIU clock.

---
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi      | 1 +
 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts | 1 +
 arch/arm64/boot/dts/intel/socfpga_agilex.dtsi          | 1 +
 arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts     | 1 +
 arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts        | 1 +
 5 files changed, 5 insertions(+)
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +1 -0
index 14c220d87807..a5d08920ac81 100644
@@ -309,6 +309,7 @@ mmc: mmc@ff808000 {
 				 <&clkmgr STRATIX10_SDMMC_CLK>;
 			clock-names = "biu", "ciu";
 			iommus = <&smmu 5>;
+			altr,sysmgr-syscon = <&sysmgr 0x28 0>;
 			status = "disabled";
 		};
 
arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts +1 -0
index 48424e459f12..19e7284b4cd5 100644
@@ -105,6 +105,7 @@ &mmc {
 	cap-mmc-highspeed;
 	broken-cd;
 	bus-width = <4>;
+	clk-phase-sd-hs = <0>, <135>;
 };
 
 &osc1 {
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi +1 -0
index 7bbec8aafa62..6353f6a361f4 100644
@@ -313,6 +313,7 @@ mmc: mmc@ff808000 {
 				 <&clkmgr AGILEX_SDMMC_CLK>;
 			clock-names = "biu", "ciu";
 			iommus = <&smmu 5>;
+			altr,sysmgr-syscon = <&sysmgr 0x28 0>;
 			status = "disabled";
 		};
 
arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts +1 -0
index 26cd3c121757..07c3f8876613 100644
@@ -83,6 +83,7 @@ &mmc {
 	cap-sd-highspeed;
 	broken-cd;
 	bus-width = <4>;
+	clk-phase-sd-hs = <0>, <135>;
 };
 
 &osc1 {
arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts +1 -0
index 62c66e52b656..08c088571270 100644
@@ -74,6 +74,7 @@ &mmc {
 	cap-sd-highspeed;
 	broken-cd;
 	bus-width = <4>;
+	clk-phase-sd-hs = <0>, <135>;
 };
 
 &osc1 {
Signature · 1 line
2.25.1
author maintainer
#1 lore raw

PATCH 2/2 mmc: dw_mmc-pltfm: socfpga: add method to configure clk-phase

The clock-phase settings for the SDMMC controller in the SoCFPGA Strarix10/Agilex/N5X platforms reside in a register in the System Manager. Add a method to access that register through the syscon interface.

---
 drivers/mmc/host/dw_mmc-pltfm.c | 68 ++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)
drivers/mmc/host/dw_mmc-pltfm.c +67 -1
index 9901208be797..9e3237c18a9d 100644
@@ -17,10 +17,15 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/mmc.h>
 #include <linux/of.h>
+#include <linux/mfd/altera-sysmgr.h>
+#include <linux/regmap.h>
 
 #include "dw_mmc.h"
 #include "dw_mmc-pltfm.h"
 
+#define SYSMGR_SDMMC_CTRL_SET(smplsel, drvsel) \
+	((((smplsel) & 0x7) << 4) | (((drvsel) & 0x7) << 0))
+
 int dw_mci_pltfm_register(struct platform_device *pdev,
 			  const struct dw_mci_drv_data *drv_data)
 {
@@ -62,9 +67,70 @@ const struct dev_pm_ops dw_mci_pltfm_pmops = {
 };
 EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops);
 
+static int dw_mci_socfpga_priv_init(struct dw_mci *host)
+{
+	struct device_node *np = host->dev->of_node;
+	struct regmap *sys_mgr_base_addr;
+	u32 clk_phase[2] = {0}, reg_offset;
+	int i, rc, hs_timing;
+
+	rc = of_property_read_variable_u32_array(np, "clk-phase-sd-hs", &clk_phase[0], 2, 0);
+	if (rc) {
+		sys_mgr_base_addr =
+			altr_sysmgr_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");
+		if (IS_ERR(sys_mgr_base_addr)) {
+			pr_err("%s: failed to find altr,sys-mgr regmap!\n", __func__);
+			return 1;
+		}
+	} else
+		return 1;
+
+	of_property_read_u32_index(np, "altr,sysmgr-syscon", 1, &reg_offset);
+
+	for (i = 0; i < ARRAY_SIZE(clk_phase); i++) {
+		switch (clk_phase[i]) {
+		case 0:
+			clk_phase[i] = 0;
+			break;
+		case 45:
+			clk_phase[i] = 1;
+			break;
+		case 90:
+			clk_phase[i] = 2;
+			break;
+		case 135:
+			clk_phase[i] = 3;
+			break;
+		case 180:
+			clk_phase[i] = 4;
+			break;
+		case 225:
+			clk_phase[i] = 5;
+			break;
+		case 270:
+			clk_phase[i] = 6;
+			break;
+		case 315:
+			clk_phase[i] = 7;
+			break;
+		default:
+			clk_phase[i] = 0;
+			break;
+		}
+	}
+	hs_timing = SYSMGR_SDMMC_CTRL_SET(clk_phase[0], clk_phase[1]);
+	regmap_write(sys_mgr_base_addr, reg_offset, hs_timing);
+
+	return 0;
+}
+
+static const struct dw_mci_drv_data socfpga_drv_data = {
+	.init		= dw_mci_socfpga_priv_init,
+};
+
 static const struct of_device_id dw_mci_pltfm_match[] = {
 	{ .compatible = "snps,dw-mshc", },
-	{ .compatible = "altr,socfpga-dw-mshc", },
+	{ .compatible = "altr,socfpga-dw-mshc", .data = &socfpga_drv_data, },
 	{ .compatible = "img,pistachio-dw-mshc", },
 	{},
 };
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH 2/2] mmc: dw_mmc-pltfm: socfpga: add method to configure clk-phase

Quoted 33 lines · Dinh Nguyen

The clock-phase settings for the SDMMC controller in the SoCFPGA Strarix10/Agilex/N5X platforms reside in a register in the System Manager. Add a method to access that register through the syscon interface.

---
 drivers/mmc/host/dw_mmc-pltfm.c | 68 ++++++++++++++++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)
drivers/mmc/host/dw_mmc-pltfm.c +5 -0
index 9901208be797..9e3237c18a9d 100644
@@ -17,10 +17,15 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/mmc.h>
 #include <linux/of.h>
+#include <linux/mfd/altera-sysmgr.h>
+#include <linux/regmap.h>
 
 #include "dw_mmc.h"
 #include "dw_mmc-pltfm.h"
 
+#define SYSMGR_SDMMC_CTRL_SET(smplsel, drvsel) \
+       ((((smplsel) & 0x7) << 4) | (((drvsel) & 0x7) << 0))
+
 int dw_mci_pltfm_register(struct platform_device *pdev,
                          const struct dw_mci_drv_data *drv_data)
 {
@@ -62,9 +67,70 @@ const struct dev_pm_ops dw_mci_pltfm_pmops = {
 };

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 77

Quoted 10 lines
drivers/mmc/host/dw_mmc-pltfm.c +8 -0
 EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops);
 
+static int dw_mci_socfpga_priv_init(struct dw_mci *host)
+{
+       struct device_node *np = host->dev->of_node;
+       struct regmap *sys_mgr_base_addr;
+       u32 clk_phase[2] = {0}, reg_offset;
+       int i, rc, hs_timing;
+
+       rc = of_property_read_variable_u32_array(np, "clk-phase-sd-hs", &clk_phase[0], 2, 0);

This needs to be documented through updated DT bindings.

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 80

Quoted 3 lines
drivers/mmc/host/dw_mmc-pltfm.c +3 -0
+       if (rc) {
+               sys_mgr_base_addr =
+                       altr_sysmgr_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");

DT bindings?

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 88

Quoted 8 lines
drivers/mmc/host/dw_mmc-pltfm.c +8 -0
+               if (IS_ERR(sys_mgr_base_addr)) {
+                       pr_err("%s: failed to find altr,sys-mgr regmap!\n", __func__);
+                       return 1;
+               }
+       } else
+               return 1;
+
+       of_property_read_u32_index(np, "altr,sysmgr-syscon", 1, &reg_offset);

DT bindings?

Quoted 22 lines
drivers/mmc/host/dw_mmc-pltfm.c +22 -0
+
+       for (i = 0; i < ARRAY_SIZE(clk_phase); i++) {
+               switch (clk_phase[i]) {
+               case 0:
+                       clk_phase[i] = 0;
+                       break;
+               case 45:
+                       clk_phase[i] = 1;
+                       break;
+               case 90:
+                       clk_phase[i] = 2;
+                       break;
+               case 135:
+                       clk_phase[i] = 3;
+                       break;
+               case 180:
+                       clk_phase[i] = 4;
+                       break;
+               case 225:
+                       clk_phase[i] = 5;
+                       break;
+               case 270:

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 120

Quoted 10 lines
drivers/mmc/host/dw_mmc-pltfm.c +10 -0
+                       clk_phase[i] = 6;
+                       break;
+               case 315:
+                       clk_phase[i] = 7;
+                       break;
+               default:
+                       clk_phase[i] = 0;
+                       break;
+               }
+       }

In my opinion, it looks like converting to use mmc_of_parse_clk_phase() should be able to avoid some of the open coding above.

If you need some inspiration of how to implement this, you may have a look at drivers/mmc/host/sdhci-of-aspeed.c

Quoted 18 lines
drivers/mmc/host/dw_mmc-pltfm.c +11 -2
+       hs_timing = SYSMGR_SDMMC_CTRL_SET(clk_phase[0], clk_phase[1]);
+       regmap_write(sys_mgr_base_addr, reg_offset, hs_timing);
+
+       return 0;
+}
+
+static const struct dw_mci_drv_data socfpga_drv_data = {
+       .init           = dw_mci_socfpga_priv_init,
+};
+
 static const struct of_device_id dw_mci_pltfm_match[] = {
        { .compatible = "snps,dw-mshc", },
-       { .compatible = "altr,socfpga-dw-mshc", },
+       { .compatible = "altr,socfpga-dw-mshc", .data = &socfpga_drv_data, },
        { .compatible = "img,pistachio-dw-mshc", },
        {},
 };
--
Quoted 2 lines

2.25.1

Kind regards
Uffe

author maintainer
#3 lore raw

Re: [PATCH 2/2] mmc: dw_mmc-pltfm: socfpga: add method to configure clk-phase

Hi Ulf,

Thanks for the review!

Quoted 36 lines · Ulf Hansson
Quoted 35 lines · Dinh Nguyen

The clock-phase settings for the SDMMC controller in the SoCFPGA Strarix10/Agilex/N5X platforms reside in a register in the System Manager. Add a method to access that register through the syscon interface.

---
  drivers/mmc/host/dw_mmc-pltfm.c | 68 ++++++++++++++++++++++++++++++++-
  1 file changed, 67 insertions(+), 1 deletion(-)
drivers/mmc/host/dw_mmc-pltfm.c +5 -0
index 9901208be797..9e3237c18a9d 100644
@@ -17,10 +17,15 @@
  #include <linux/mmc/host.h>
  #include <linux/mmc/mmc.h>
  #include <linux/of.h>
+#include <linux/mfd/altera-sysmgr.h>
+#include <linux/regmap.h>
 
  #include "dw_mmc.h"
  #include "dw_mmc-pltfm.h"
 
+#define SYSMGR_SDMMC_CTRL_SET(smplsel, drvsel) \
+       ((((smplsel) & 0x7) << 4) | (((drvsel) & 0x7) << 0))
+
  int dw_mci_pltfm_register(struct platform_device *pdev,
                           const struct dw_mci_drv_data *drv_data)
  {
@@ -62,9 +67,70 @@ const struct dev_pm_ops dw_mci_pltfm_pmops = {
  };
  EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops);
 
Quoted 10 lines

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 77

Quoted 8 lines
drivers/mmc/host/dw_mmc-pltfm.c +8 -0
+static int dw_mci_socfpga_priv_init(struct dw_mci *host)
+{
+       struct device_node *np = host->dev->of_node;
+       struct regmap *sys_mgr_base_addr;
+       u32 clk_phase[2] = {0}, reg_offset;
+       int i, rc, hs_timing;
+
+       rc = of_property_read_variable_u32_array(np, "clk-phase-sd-hs", &clk_phase[0], 2, 0);

This needs to be documented through updated DT bindings.

Ok, but it looks like clk-phase-sd-hs is already documented in Documentation/devicetree/bindings/mmc/mmc-controller.yaml

Should I create a specific documentation just for "altr,socfpga-dw-mshc" and document "clk-phase-sd-hs"?

Quoted 6 lines

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 80

Quoted 4 lines
drivers/mmc/host/dw_mmc-pltfm.c +3 -0
+       if (rc) {
+               sys_mgr_base_addr =
+                       altr_sysmgr_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");

DT bindings?

"altr,sysmgr-syscon" has already been documented in Documentation/devicetree/bindings/net/socfpga-dwmac.txt

Quoted 10 lines

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 88

Quoted 8 lines
drivers/mmc/host/dw_mmc-pltfm.c +8 -0
+               if (IS_ERR(sys_mgr_base_addr)) {
+                       pr_err("%s: failed to find altr,sys-mgr regmap!\n", __func__);
+                       return 1;
+               }
+       } else
+               return 1;
+
+       of_property_read_u32_index(np, "altr,sysmgr-syscon", 1, &reg_offset);

DT bindings?

Same...

Quoted 34 lines
Quoted 23 lines
drivers/mmc/host/dw_mmc-pltfm.c +22 -0
+
+       for (i = 0; i < ARRAY_SIZE(clk_phase); i++) {
+               switch (clk_phase[i]) {
+               case 0:
+                       clk_phase[i] = 0;
+                       break;
+               case 45:
+                       clk_phase[i] = 1;
+                       break;
+               case 90:
+                       clk_phase[i] = 2;
+                       break;
+               case 135:
+                       clk_phase[i] = 3;
+                       break;
+               case 180:
+                       clk_phase[i] = 4;
+                       break;
+               case 225:
+                       clk_phase[i] = 5;
+                       break;
+               case 270:

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 120

Quoted 10 lines
drivers/mmc/host/dw_mmc-pltfm.c +10 -0
+                       clk_phase[i] = 6;
+                       break;
+               case 315:
+                       clk_phase[i] = 7;
+                       break;
+               default:
+                       clk_phase[i] = 0;
+                       break;
+               }
+       }
Quoted 7 lines

In my opinion, it looks like converting to use mmc_of_parse_clk_phase() should be able to avoid some of the open coding above.

If you need some inspiration of how to implement this, you may have a look at drivers/mmc/host/sdhci-of-aspeed.c

Got it.

Quoted 15 lines
Quoted 15 lines
drivers/mmc/host/dw_mmc-pltfm.c +11 -1
+       hs_timing = SYSMGR_SDMMC_CTRL_SET(clk_phase[0], clk_phase[1]);
+       regmap_write(sys_mgr_base_addr, reg_offset, hs_timing);
+
+       return 0;
+}
+
+static const struct dw_mci_drv_data socfpga_drv_data = {
+       .init           = dw_mci_socfpga_priv_init,
+};
+
  static const struct of_device_id dw_mci_pltfm_match[] = {
         { .compatible = "snps,dw-mshc", },
-       { .compatible = "altr,socfpga-dw-mshc", },
+       { .compatible = "altr,socfpga-dw-mshc", .data = &socfpga_drv_data, },
         { .compatible = "img,pistachio-dw-mshc", },
Quoted 8 lines
Quoted 5 lines
drivers/mmc/host/dw_mmc-pltfm.c +0 -1
         {},
  };
--

2.25.1

Kind regards
Uffe

Dinh

#4 lore raw

Re: [PATCH 2/2] mmc: dw_mmc-pltfm: socfpga: add method to configure clk-phase

Quoted 53 lines · Dinh Nguyen

Hi Ulf,

Thanks for the review!

Quoted 36 lines · Ulf Hansson
Quoted 35 lines · Dinh Nguyen

The clock-phase settings for the SDMMC controller in the SoCFPGA Strarix10/Agilex/N5X platforms reside in a register in the System Manager. Add a method to access that register through the syscon interface.

---
  drivers/mmc/host/dw_mmc-pltfm.c | 68 ++++++++++++++++++++++++++++++++-
  1 file changed, 67 insertions(+), 1 deletion(-)
drivers/mmc/host/dw_mmc-pltfm.c +5 -0
index 9901208be797..9e3237c18a9d 100644
@@ -17,10 +17,15 @@
  #include <linux/mmc/host.h>
  #include <linux/mmc/mmc.h>
  #include <linux/of.h>
+#include <linux/mfd/altera-sysmgr.h>
+#include <linux/regmap.h>
 
  #include "dw_mmc.h"
  #include "dw_mmc-pltfm.h"
 
+#define SYSMGR_SDMMC_CTRL_SET(smplsel, drvsel) \
+       ((((smplsel) & 0x7) << 4) | (((drvsel) & 0x7) << 0))
+
  int dw_mci_pltfm_register(struct platform_device *pdev,
                           const struct dw_mci_drv_data *drv_data)
  {
@@ -62,9 +67,70 @@ const struct dev_pm_ops dw_mci_pltfm_pmops = {
  };
  EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops);
 
Quoted 10 lines

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 77

Quoted 8 lines
drivers/mmc/host/dw_mmc-pltfm.c +8 -0
+static int dw_mci_socfpga_priv_init(struct dw_mci *host)
+{
+       struct device_node *np = host->dev->of_node;
+       struct regmap *sys_mgr_base_addr;
+       u32 clk_phase[2] = {0}, reg_offset;
+       int i, rc, hs_timing;
+
+       rc = of_property_read_variable_u32_array(np, "clk-phase-sd-hs", &clk_phase[0], 2, 0);

This needs to be documented through updated DT bindings.

Quoted 2 lines

Ok, but it looks like clk-phase-sd-hs is already documented in Documentation/devicetree/bindings/mmc/mmc-controller.yaml

Not in next-20220919.

Quoted 3 lines

Should I create a specific documentation just for "altr,socfpga-dw-mshc" and document "clk-phase-sd-hs"?

All properties must be documented.

Quoted 10 lines
Quoted 7 lines

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 80

Quoted 5 lines
drivers/mmc/host/dw_mmc-pltfm.c +3 -0
+       if (rc) {
+               sys_mgr_base_addr =
+                       altr_sysmgr_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");

DT bindings?

"altr,sysmgr-syscon" has already been documented in Documentation/devicetree/bindings/net/socfpga-dwmac.txt

This is not documentation of nodes you are changing here and in patch 1.

You linked altr,socfpga-stmmac and here you have altr,socfpga-dw-mshc...

Best regards,
Krzysztof

#5 lore raw

Re: [PATCH 2/2] mmc: dw_mmc-pltfm: socfpga: add method to configure clk-phase

Quoted 55 lines · Krzysztof Kozlowski
Quoted 53 lines · Dinh Nguyen

Hi Ulf,

Thanks for the review!

Quoted 46 lines · Ulf Hansson
Quoted 33 lines · Dinh Nguyen

The clock-phase settings for the SDMMC controller in the SoCFPGA Strarix10/Agilex/N5X platforms reside in a register in the System Manager. Add a method to access that register through the syscon interface.

---
  drivers/mmc/host/dw_mmc-pltfm.c | 68 ++++++++++++++++++++++++++++++++-
  1 file changed, 67 insertions(+), 1 deletion(-)
drivers/mmc/host/dw_mmc-pltfm.c +5 -0
index 9901208be797..9e3237c18a9d 100644
@@ -17,10 +17,15 @@
  #include <linux/mmc/host.h>
  #include <linux/mmc/mmc.h>
  #include <linux/of.h>
+#include <linux/mfd/altera-sysmgr.h>
+#include <linux/regmap.h>
 
  #include "dw_mmc.h"
  #include "dw_mmc-pltfm.h"
 
+#define SYSMGR_SDMMC_CTRL_SET(smplsel, drvsel) \
+       ((((smplsel) & 0x7) << 4) | (((drvsel) & 0x7) << 0))
+
  int dw_mci_pltfm_register(struct platform_device *pdev,
                           const struct dw_mci_drv_data *drv_data)
  {
@@ -62,9 +67,70 @@ const struct dev_pm_ops dw_mci_pltfm_pmops = {
  };

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 77

Quoted 10 lines
drivers/mmc/host/dw_mmc-pltfm.c +8 -0
  EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops);
 
+static int dw_mci_socfpga_priv_init(struct dw_mci *host)
+{
+       struct device_node *np = host->dev->of_node;
+       struct regmap *sys_mgr_base_addr;
+       u32 clk_phase[2] = {0}, reg_offset;
+       int i, rc, hs_timing;
+
+       rc = of_property_read_variable_u32_array(np, "clk-phase-sd-hs", &clk_phase[0], 2, 0);

This needs to be documented through updated DT bindings.

Quoted 4 lines
Quoted 2 lines

Ok, but it looks like clk-phase-sd-hs is already documented in Documentation/devicetree/bindings/mmc/mmc-controller.yaml

Not in next-20220919.

Dinh is right!

It seems like both me and Krzysztof missed the already documented binding. Probably because the property is named like below and that I did "git grep clk-phase-sd" :-)

"^clk-phase-(legacy|sd-hs|mmc-(hs|hs[24]00|ddr52)|uhs-(sdr(12|25|50|104)|ddr50))$":

Quoted 6 lines
Quoted 4 lines

Should I create a specific documentation just for "altr,socfpga-dw-mshc" and document "clk-phase-sd-hs"?

All properties must be documented.

Yes, but as stated above, we should be okay in this case.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 6 lines
drivers/mmc/host/dw_mmc-pltfm.c +3 -0
+       if (rc) {
+               sys_mgr_base_addr =
+                       altr_sysmgr_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");
Quoted 8 lines
Quoted 4 lines
Quoted 1 line

DT bindings?

"altr,sysmgr-syscon" has already been documented in Documentation/devicetree/bindings/net/socfpga-dwmac.txt

This is not documentation of nodes you are changing here and in patch 1.

You linked altr,socfpga-stmmac and here you have altr,socfpga-dw-mshc...

Right.

I guess an option is to convert Documentation/devicetree/bindings/net/socfpga-dwmac.txt into the yaml based format and then reference that binding from synopsys-dw-mshc-common.yaml?

Quoted 3 lines

Best regards,
Krzysztof

Kind regards
Uffe

#6 lore raw

Re: [PATCH 2/2] mmc: dw_mmc-pltfm: socfpga: add method to configure clk-phase

Quoted 9 lines · Ulf Hansson
Quoted 1 line

Not in next-20220919.

Dinh is right!

It seems like both me and Krzysztof missed the already documented binding. Probably because the property is named like below and that I did "git grep clk-phase-sd" :-)

"^clk-phase-(legacy|sd-hs|mmc-(hs|hs[24]00|ddr52)|uhs-(sdr(12|25|50|104)|ddr50))$":

Too much trust in git grep. Thanks for finding it.

Quoted 24 lines
Quoted 7 lines
Quoted 5 lines

Should I create a specific documentation just for "altr,socfpga-dw-mshc" and document "clk-phase-sd-hs"?

All properties must be documented.

Yes, but as stated above, we should be okay in this case.

Quoted 14 lines
Quoted 11 lines
Quoted 8 lines

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 80

Quoted 6 lines
drivers/mmc/host/dw_mmc-pltfm.c +3 -0
+       if (rc) {
+               sys_mgr_base_addr =
+                       altr_sysmgr_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");

DT bindings?

"altr,sysmgr-syscon" has already been documented in Documentation/devicetree/bindings/net/socfpga-dwmac.txt

This is not documentation of nodes you are changing here and in patch 1.

Quoted 8 lines
Quoted 1 line

You linked altr,socfpga-stmmac and here you have altr,socfpga-dw-mshc...

Right.

I guess an option is to convert Documentation/devicetree/bindings/net/socfpga-dwmac.txt into the yaml based format and then reference that binding from synopsys-dw-mshc-common.yaml?

I did not look much inside, but isn't them entirely different devices (net vs mmc)? If they are different, then such vendor-custom property needs to appear in each bindings. The same as we have for other syscon-like properties.

Best regards,
Krzysztof

#7 lore raw

Re: [PATCH 2/2] mmc: dw_mmc-pltfm: socfpga: add method to configure clk-phase

Quoted 47 lines · Krzysztof Kozlowski
Quoted 9 lines · Ulf Hansson
Quoted 1 line

Not in next-20220919.

Dinh is right!

It seems like both me and Krzysztof missed the already documented binding. Probably because the property is named like below and that I did "git grep clk-phase-sd" :-)

"^clk-phase-(legacy|sd-hs|mmc-(hs|hs[24]00|ddr52)|uhs-(sdr(12|25|50|104)|ddr50))$":

Too much trust in git grep. Thanks for finding it.

Quoted 24 lines
Quoted 7 lines
Quoted 5 lines

Should I create a specific documentation just for "altr,socfpga-dw-mshc" and document "clk-phase-sd-hs"?

All properties must be documented.

Yes, but as stated above, we should be okay in this case.

Quoted 14 lines
Quoted 11 lines
Quoted 8 lines

drivers/mmc/host/dw_mmc-pltfm.c const struct dev_pm_ops dw_mci_pltfm_pmops = { · line 80

Quoted 6 lines
drivers/mmc/host/dw_mmc-pltfm.c +3 -0
+       if (rc) {
+               sys_mgr_base_addr =
+                       altr_sysmgr_regmap_lookup_by_phandle(np, "altr,sysmgr-syscon");

DT bindings?

"altr,sysmgr-syscon" has already been documented in Documentation/devicetree/bindings/net/socfpga-dwmac.txt

This is not documentation of nodes you are changing here and in patch 1.

Quoted 8 lines
Quoted 1 line

You linked altr,socfpga-stmmac and here you have altr,socfpga-dw-mshc...

Right.

I guess an option is to convert Documentation/devicetree/bindings/net/socfpga-dwmac.txt into the yaml based format and then reference that binding from synopsys-dw-mshc-common.yaml?

Quoted 4 lines

I did not look much inside, but isn't them entirely different devices (net vs mmc)? If they are different, then such vendor-custom property needs to appear in each bindings. The same as we have for other syscon-like properties.

I was thinking that it was a specific binding for the syscon device that could be shared among its consumers. But it isn't.

So, you are definitely right, it seems better to have a vendor-custom property defined in the mmc bindings for this. Thanks for your feedback!

Quoted 4 lines

Best regards,
Krzysztof

Kind regards
Uffe

#8 lore raw
In reply to Dinh Nguyen
Quoted 20 lines · Dinh Nguyen

The sdmmc controller's CIU(Card Interface Unit) clock's phase can be adjusted through the register in the system manager. Add the binding "altr,sysmgr-syscon" to the SDMMC node for the driver to access the system manager. Add the "clk-phase-sd-hs" property in the SDMMC node to designate the smpsel and drvsel properties for the CIU clock.

---
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi      | 1 +
 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts | 1 +
 arch/arm64/boot/dts/intel/socfpga_agilex.dtsi          | 1 +
 arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts     | 1 +
 arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts        | 1 +
 5 files changed, 5 insertions(+)
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +0 -0
index 14c220d87807..a5d08920ac81 100644

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi mmc: mmc@ff808000 { · line 312

Quoted 4 lines
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +1 -0
@@ -309,6 +309,7 @@ mmc: mmc@ff808000 {
 				 <&clkmgr STRATIX10_SDMMC_CLK>;
 			clock-names = "biu", "ciu";
 			iommus = <&smmu 5>;
+			altr,sysmgr-syscon = <&sysmgr 0x28 0>;

Missing bindings change.

Best regards,
Krzysztof