Skip to contentSkip to conversation

mmc: dw_mmc: add dw_mmc-k3

PATCH Superseded Zhangfei Gao 5 participants 13 messages Dec 28, 2013 – Jan 2, 2014

Subsystems (4)

v6 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v6 cover mmc: dw_mmc: add dw_mmc-k3

v6:
0002:
Jaehoon pointed HIGHSPEED cap can be omitted if supports-highspeed is defined. Seungwon mentioned clk operation should be called after suspend. Remove k3_dwmmc_caps

V5:
0002:
Follow advice from Arnd,
Update dt descirption and use of_property_for_each_u32 to get table number.

v4:
Follow Arnd's suggestion abstracting specific tuning to clock,
also because new version ip use different method and not use same tuning registers.

0001 acked by Jaehoon

v3:
0001:
Put set/clear_bit DW_MMC_CARD_PRESENT in dw_mci_get_cd, Since dw_mci_request will check DW_MMC_CARD_PRESENT before sending cmd

0002:
Follow suggestion from Chris, Kumar and Seungwon
Sync to latest mmc-next, which is 3.12-rc2
Remove enum dw_mci_k3_type etc

v2:
Follow Jaehoon's suggestion
Use slot-gpio.c handle cd pin
Move table out to dts
other suggestion

Zhangfei Gao (3):
mmc: dw_mmc: use slot-gpio to handle cd pin
mmc: dw_mmc: add dw_mmc-k3 for k3 platform
clk: hisilicon: add hi3620_mmc_clks

 .../bindings/arm/hisilicon/hisilicon.txt           |   14 ++
 .../devicetree/bindings/clock/hi3620-clock.txt     |    1 +
 .../devicetree/bindings/mmc/k3-dw-mshc.txt         |   60 +++++
 drivers/clk/hisilicon/clk-hi3620.c                 |  262 ++++++++++++++++++++
 drivers/mmc/host/Kconfig                           |   10 +
 drivers/mmc/host/Makefile                          |    1 +
 drivers/mmc/host/dw_mmc-k3.c                       |  126 ++++++++++
 drivers/mmc/host/dw_mmc.c                          |   48 +++-
 include/dt-bindings/clock/hi3620-clock.h           |    5 +
 9 files changed, 514 insertions(+), 13 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
 create mode 100644 drivers/mmc/host/dw_mmc-k3.c
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v6 1/3 mmc: dw_mmc: use slot-gpio to handle cd pin

Suggested by Jaehoon: Use slot-gpio to handle cd-gpio Add function dw_mci_of_get_cd_gpio to check "cd-gpios" from dts. mmc_gpio_request_cd and mmc_gpio_get_cd are used to handle cd pin

---
 drivers/mmc/host/dw_mmc.c |   48 +++++++++++++++++++++++++++++++++------------
 1 file changed, 35 insertions(+), 13 deletions(-)
drivers/mmc/host/dw_mmc.c +35 -13
index 4bce0deec362..a776f24f4311 100644
@@ -36,6 +36,7 @@
 #include <linux/workqueue.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/mmc/slot-gpio.h>
 
 #include "dw_mmc.h"
 
@@ -1032,20 +1033,26 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
 	int present;
 	struct dw_mci_slot *slot = mmc_priv(mmc);
 	struct dw_mci_board *brd = slot->host->pdata;
+	int gpio_cd = !mmc_gpio_get_cd(mmc);
 
 	/* Use platform get_cd function, else try onboard card detect */
 	if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION)
 		present = 1;
 	else if (brd->get_cd)
 		present = !brd->get_cd(slot->id);
+	else if (!IS_ERR_VALUE(gpio_cd))
+		present = !!gpio_cd;
 	else
 		present = (mci_readl(slot->host, CDETECT) & (1 << slot->id))
 			== 0 ? 1 : 0;
 
-	if (present)
+	if (present) {
+		set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
 		dev_dbg(&mmc->class_dev, "card is present\n");
-	else
+	} else {
+		clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
 		dev_dbg(&mmc->class_dev, "card is not present\n");
+	}
 
 	return present;
 }
@@ -1926,10 +1933,6 @@ static void dw_mci_work_routine_card(struct work_struct *work)
 			/* Card change detected */
 			slot->last_detect_state = present;
 
-			/* Mark card as present if applicable */
-			if (present != 0)
-				set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
-
 			/* Clean up queue if present */
 			mrq = slot->mrq;
 			if (mrq) {
@@ -1977,8 +1980,6 @@ static void dw_mci_work_routine_card(struct work_struct *work)
 
 			/* Power down slot */
 			if (present == 0) {
-				clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
-
 				/* Clear down the FIFO */
 				dw_mci_fifo_reset(host);
 #ifdef CONFIG_MMC_DW_IDMAC
@@ -2079,6 +2080,26 @@ static int dw_mci_of_get_wp_gpio(struct device *dev, u8 slot)
 
 	return gpio;
 }
+
+/* find the cd gpio for a given slot; or -1 if none specified */
+static void dw_mci_of_get_cd_gpio(struct device *dev, u8 slot,
+					struct mmc_host *mmc)
+{
+	struct device_node *np = dw_mci_of_find_slot_node(dev, slot);
+	int gpio;
+
+	if (!np)
+		return;
+
+	gpio = of_get_named_gpio(np, "cd-gpios", 0);
+
+	/* Having a missing entry is valid; return silently */
+	if (!gpio_is_valid(gpio))
+		return;
+
+	if (mmc_gpio_request_cd(mmc, gpio, 0))
+		dev_warn(dev, "gpio [%d] request failed\n", gpio);
+}
 #else /* CONFIG_OF */
 static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot)
 {
@@ -2096,6 +2117,11 @@ static int dw_mci_of_get_wp_gpio(struct device *dev, u8 slot)
 {
 	return -EINVAL;
 }
+static void dw_mci_of_get_cd_gpio(struct device *dev, u8 slot,
+					struct mmc_host *mmc)
+{
+	return;
+}
 #endif /* CONFIG_OF */
 
 static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
@@ -2197,12 +2223,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id)
 #endif /* CONFIG_MMC_DW_IDMAC */
 	}
 
-	if (dw_mci_get_cd(mmc))
-		set_bit(DW_MMC_CARD_PRESENT, &slot->flags);
-	else
-		clear_bit(DW_MMC_CARD_PRESENT, &slot->flags);
-
 	slot->wp_gpio = dw_mci_of_get_wp_gpio(host->dev, slot->id);
+	dw_mci_of_get_cd_gpio(host->dev, slot->id, mmc);
 
 	ret = mmc_add_host(mmc);
 	if (ret)
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH v6 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform

In reply to Zhangfei Gao

Add dw_mmc-k3.c for k3v2, support sd/emmc

---
 .../devicetree/bindings/mmc/k3-dw-mshc.txt         |   60 ++++++++++
 drivers/mmc/host/Kconfig                           |   10 ++
 drivers/mmc/host/Makefile                          |    1 +
 drivers/mmc/host/dw_mmc-k3.c                       |  126 ++++++++++++++++++++
 4 files changed, 197 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
 create mode 100644 drivers/mmc/host/dw_mmc-k3.c
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +60 -0
new file mode 100644
index 000000000000..d7e2d7f159bb
@@ -0,0 +1,60 @@
+* Hisilicon specific extensions to the Synopsys Designware Mobile
+  Storage Host Controller
+
+Read synopsys-dw-mshc.txt for more details
+
+The Synopsys designware mobile storage host controller is used to interface
+a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
+differences between the core Synopsys dw mshc controller properties described
+by synopsys-dw-mshc.txt and the properties used by the Hisilicon specific
+extensions to the Synopsys Designware Mobile Storage Host Controller.
+
+Required Properties:
+
+* compatible: should be one of the following.
+  - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extentions.
+
+* clock-freq-table: should be the frequency (in Hz) array of the ciu clock
+	in each	supported mode.
+	0. CIU clock rate in Hz for DS mode
+	1. CIU clock rate in Hz for MMC HS mode
+	2. CIU clock rate in Hz for SD HS mode
+	3. CIU clock rate in Hz for SDR12 mode
+	4. CIU clock rate in Hz for SDR25 mode
+	5. CIU clock rate in Hz for SDR50 mode
+	6. CIU clock rate in Hz for SDR104 mode
+	7. CIU clock rate in Hz for DDR50 mode
+	8. CIU clock rate in Hz for HS200 mode
+
+Example:
+
+	/* for Hi3620 */
+
+	/* SoC portion */
+	dwmmc_0: dwmmc0 at fcd03000 {
+		compatible = "hisilicon,hi4511-dw-mshc";
+		reg = <0xfcd03000 0x1000>;
+		interrupts = <0 16 4>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		clocks = <&mmc_clock HI3620_SD_CIUCLK>, <&clock HI3620_DDRC_PER_CLK>;
+		clock-names = "ciu", "biu";
+		clock-freq-table =
+		<25000000 0 50000000 25000000 50000000 100000000 0 50000000>;
+	};
+
+	/* Board portion */
+	dwmmc0 at fcd03000 {
+		num-slots = <1>;
+		vmmc-supply = <&ldo12>;
+		fifo-depth = <0x100>;
+		supports-highspeed;
+		pinctrl-names = "default";
+		pinctrl-0 = <&sd_pmx_pins &sd_cfg_func1 &sd_cfg_func2>;
+		slot at 0 {
+			reg = <0>;
+			bus-width = <4>;
+			disable-wp;
+			cd-gpios = <&gpio10 3 0>;
+		};
+	};
drivers/mmc/host/Kconfig +10 -0
index 7fc5099e44b2..45aaa2de0f58 100644
@@ -575,6 +575,16 @@ config MMC_DW_SOCFPGA
 	  This selects support for Altera SoCFPGA specific extensions to the
 	  Synopsys DesignWare Memory Card Interface driver.
 
+config MMC_DW_K3
+	tristate "K3 specific extensions for Synopsys DW Memory Card Interface"
+	depends on MMC_DW
+	select MMC_DW_PLTFM
+	select MMC_DW_IDMAC
+	help
+	  This selects support for Hisilicon K3 SoC specific extensions to the
+	  Synopsys DesignWare Memory Card Interface driver. Select this option
+	  for platforms based on Hisilicon K3 SoC's.
+
 config MMC_DW_PCI
 	tristate "Synopsys Designware MCI support on PCI bus"
 	depends on MMC_DW && PCI
drivers/mmc/host/Makefile +1 -0
index c41d0c364509..64f5f8d35839 100644
@@ -43,6 +43,7 @@ obj-$(CONFIG_MMC_DW)		+= dw_mmc.o
 obj-$(CONFIG_MMC_DW_PLTFM)	+= dw_mmc-pltfm.o
 obj-$(CONFIG_MMC_DW_EXYNOS)	+= dw_mmc-exynos.o
 obj-$(CONFIG_MMC_DW_SOCFPGA)	+= dw_mmc-socfpga.o
+obj-$(CONFIG_MMC_DW_K3)		+= dw_mmc-k3.o
 obj-$(CONFIG_MMC_DW_PCI)	+= dw_mmc-pci.o
 obj-$(CONFIG_MMC_SH_MMCIF)	+= sh_mmcif.o
 obj-$(CONFIG_MMC_JZ4740)	+= jz4740_mmc.o
drivers/mmc/host/dw_mmc-k3.c new file +126 -0

126 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform

Quoted 24 lines · Zhangfei Gao

Add dw_mmc-k3.c for k3v2, support sd/emmc

---
 .../devicetree/bindings/mmc/k3-dw-mshc.txt         |   60 ++++++++++
 drivers/mmc/host/Kconfig                           |   10 ++
 drivers/mmc/host/Makefile                          |    1 +
 drivers/mmc/host/dw_mmc-k3.c                       |  126 ++++++++++++++++++++
 4 files changed, 197 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
 create mode 100644 drivers/mmc/host/dw_mmc-k3.c
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
new file mode 100644
index 000000000000..d7e2d7f159bb
@@ -0,0 +1,60 @@
+* Hisilicon specific extensions to the Synopsys Designware Mobile
+  Storage Host Controller
+
+Read synopsys-dw-mshc.txt for more details
+

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 15

Quoted 10 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +10 -0
+The Synopsys designware mobile storage host controller is used to interface
+a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
+differences between the core Synopsys dw mshc controller properties described
+by synopsys-dw-mshc.txt and the properties used by the Hisilicon specific
+extensions to the Synopsys Designware Mobile Storage Host Controller.
+
+Required Properties:
+
+* compatible: should be one of the following.
+  - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extentions.

I wonder if this is actually a different variant of the mshc hardware, or just wired up in a different way. Do you know details?

Since the only difference in the binding is the presence of the "clock-freq-table" property, we could also make this property generic for the mshc driver and use it if present but fall back to the normal behavior when it is absent.

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 27

Quoted 11 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +11 -0
+* clock-freq-table: should be the frequency (in Hz) array of the ciu clock
+	in each	supported mode.
+	0. CIU clock rate in Hz for DS mode
+	1. CIU clock rate in Hz for MMC HS mode
+	2. CIU clock rate in Hz for SD HS mode
+	3. CIU clock rate in Hz for SDR12 mode
+	4. CIU clock rate in Hz for SDR25 mode
+	5. CIU clock rate in Hz for SDR50 mode
+	6. CIU clock rate in Hz for SDR104 mode
+	7. CIU clock rate in Hz for DDR50 mode
+	8. CIU clock rate in Hz for HS200 mode

This looks god now.

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 31

Quoted 5 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
+static void dw_mci_k3_set_ios(struct dw_mci *host, struct mmc_ios *ios)
+{
+	struct dw_mci_k3_priv_data *priv = host->priv;
+	u32 rate = priv->clk_table[ios->timing];
+	int ret;

I think this should have some range checking to see if the mode that is being set had a clock frequency set in the DT.

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 38

Quoted 7 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +7 -0
+
+	ret = clk_set_rate(host->ciu_clk, rate);
+	if (ret)
+		dev_warn(host->dev, "failed to set clock rate %uHz\n", rate);
+
+	host->bus_hz = clk_get_rate(host->ciu_clk);
+}

Why do you call clk_get_rate() here, shouldn't it always be the same rate that you have just set?

Quoted 12 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +12 -0
+static int dw_mci_k3_parse_dt(struct dw_mci *host)
+{
+	struct dw_mci_k3_priv_data *priv;
+	struct device_node *node = host->dev->of_node;
+	struct property *prop;
+	const __be32 *cur;
+	u32 val, num = 0;
+
+	priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);
+	if (!priv) {
+		dev_err(host->dev, "mem alloc failed for private data\n");
+		return -ENOMEM;

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 60

Quoted 10 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +10 -0
+	}
+	host->priv = priv;
+
+	of_property_for_each_u32(node, "clock-freq-table", prop, cur, val) {
+		if (num >= MAX_NUMS)
+			break;
+		priv->clk_table[num++] = val;
+	}
+	return 0;
+}

If we make this property part of the generic binding, this function could also get moved to the main dw_mci driver.

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

Quoted 6 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +6 -0
+static int dw_mci_k3_suspend(struct device *dev)
+{
+	struct dw_mci *host = dev_get_drvdata(dev);
+	int ret = 0;
+
+	ret = dw_mci_suspend(host);

You should never initialize local variables when they are set later in the function (the ret = 0 part above). For more complex functions, this prevents gcc from warning you about accidentally uninitialized uses.

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

Quoted 5 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
+	if (!ret)
+		clk_disable_unprepare(host->ciu_clk);
+
+	return ret;
+}

The suspend/resume code also looks very generic. Can't we make these the default for dw-mci? If you do both, you won't even need a k3 specific driver. I think in general we should try hard to add code like this to the common driver when there is a chance that it can be shared with other platforms.

Arnd

maintainer
#4 lore raw

PATCH 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform

Quoted 114 lines · Arnd Bergmann
Quoted 24 lines · Zhangfei Gao

Add dw_mmc-k3.c for k3v2, support sd/emmc

---
 .../devicetree/bindings/mmc/k3-dw-mshc.txt         |   60 ++++++++++
 drivers/mmc/host/Kconfig                           |   10 ++
 drivers/mmc/host/Makefile                          |    1 +
 drivers/mmc/host/dw_mmc-k3.c                       |  126 ++++++++++++++++++++
 4 files changed, 197 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
 create mode 100644 drivers/mmc/host/dw_mmc-k3.c
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
new file mode 100644
index 000000000000..d7e2d7f159bb
@@ -0,0 +1,60 @@
+* Hisilicon specific extensions to the Synopsys Designware Mobile
+  Storage Host Controller
+
+Read synopsys-dw-mshc.txt for more details
+

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 15

Quoted 10 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +10 -0
+The Synopsys designware mobile storage host controller is used to interface
+a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
+differences between the core Synopsys dw mshc controller properties described
+by synopsys-dw-mshc.txt and the properties used by the Hisilicon specific
+extensions to the Synopsys Designware Mobile Storage Host Controller.
+
+Required Properties:
+
+* compatible: should be one of the following.
+  - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extentions.

I wonder if this is actually a different variant of the mshc hardware, or just wired up in a different way. Do you know details?

Since the only difference in the binding is the presence of the "clock-freq-table" property, we could also make this property generic for the mshc driver and use it if present but fall back to the normal behavior when it is absent.

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 27

Quoted 11 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +11 -0
+* clock-freq-table: should be the frequency (in Hz) array of the ciu clock
+	in each	supported mode.
+	0. CIU clock rate in Hz for DS mode
+	1. CIU clock rate in Hz for MMC HS mode
+	2. CIU clock rate in Hz for SD HS mode
+	3. CIU clock rate in Hz for SDR12 mode
+	4. CIU clock rate in Hz for SDR25 mode
+	5. CIU clock rate in Hz for SDR50 mode
+	6. CIU clock rate in Hz for SDR104 mode
+	7. CIU clock rate in Hz for DDR50 mode
+	8. CIU clock rate in Hz for HS200 mode

This looks god now.

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 31

Quoted 5 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
+static void dw_mci_k3_set_ios(struct dw_mci *host, struct mmc_ios *ios)
+{
+	struct dw_mci_k3_priv_data *priv = host->priv;
+	u32 rate = priv->clk_table[ios->timing];
+	int ret;

I think this should have some range checking to see if the mode that is being set had a clock frequency set in the DT.

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 38

Quoted 7 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +7 -0
+
+	ret = clk_set_rate(host->ciu_clk, rate);
+	if (ret)
+		dev_warn(host->dev, "failed to set clock rate %uHz\n", rate);
+
+	host->bus_hz = clk_get_rate(host->ciu_clk);
+}

Why do you call clk_get_rate() here, shouldn't it always be the same rate that you have just set?

Quoted 12 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +12 -0
+static int dw_mci_k3_parse_dt(struct dw_mci *host)
+{
+	struct dw_mci_k3_priv_data *priv;
+	struct device_node *node = host->dev->of_node;
+	struct property *prop;
+	const __be32 *cur;
+	u32 val, num = 0;
+
+	priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);
+	if (!priv) {
+		dev_err(host->dev, "mem alloc failed for private data\n");
+		return -ENOMEM;

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 60

Quoted 10 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +10 -0
+	}
+	host->priv = priv;
+
+	of_property_for_each_u32(node, "clock-freq-table", prop, cur, val) {
+		if (num >= MAX_NUMS)
+			break;
+		priv->clk_table[num++] = val;
+	}
+	return 0;
+}

If we make this property part of the generic binding, this function could also get moved to the main dw_mci driver.

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

Quoted 6 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +6 -0
+static int dw_mci_k3_suspend(struct device *dev)
+{
+	struct dw_mci *host = dev_get_drvdata(dev);
+	int ret = 0;
+
+	ret = dw_mci_suspend(host);

You should never initialize local variables when they are set later in the function (the ret = 0 part above). For more complex functions, this prevents gcc from warning you about accidentally uninitialized uses.

Quoted 10 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

Quoted 5 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
+	if (!ret)
+		clk_disable_unprepare(host->ciu_clk);
+
+	return ret;
+}

The suspend/resume code also looks very generic. Can't we make these the default for dw-mci? If you do both, you won't even need a k3 specific driver. I think in general we should try hard to add code like this to the common driver when there is a chance that it can be shared with other platforms.

Dw-mmc has the LOW_POWER mode feature at CLKENA register, this feature is running like clock-gating.
So i have known it didn't control clock enable/disable in dw-mmc.c.

Best Regards,
Jaehoon Chung

Quoted 3 lines

Arnd

#5 lore raw

PATCH 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform

Quoted 40 lines · Jaehoon Chung
Quoted 39 lines · Arnd Bergmann
Quoted 24 lines · Zhangfei Gao

Add dw_mmc-k3.c for k3v2, support sd/emmc

---
 .../devicetree/bindings/mmc/k3-dw-mshc.txt         |   60 ++++++++++
 drivers/mmc/host/Kconfig                           |   10 ++
 drivers/mmc/host/Makefile                          |    1 +
 drivers/mmc/host/dw_mmc-k3.c                       |  126 ++++++++++++++++++++
 4 files changed, 197 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
 create mode 100644 drivers/mmc/host/dw_mmc-k3.c
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
new file mode 100644
index 000000000000..d7e2d7f159bb
@@ -0,0 +1,60 @@
+* Hisilicon specific extensions to the Synopsys Designware Mobile
+  Storage Host Controller
+
+Read synopsys-dw-mshc.txt for more details
+

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 15

Quoted 10 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +10 -0
+The Synopsys designware mobile storage host controller is used to interface
+a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
+differences between the core Synopsys dw mshc controller properties described
+by synopsys-dw-mshc.txt and the properties used by the Hisilicon specific
+extensions to the Synopsys Designware Mobile Storage Host Controller.
+
+Required Properties:
+
+* compatible: should be one of the following.
+  - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extentions.

I wonder if this is actually a different variant of the mshc hardware, or just wired up in a different way. Do you know details?

Quoted 3 lines
Quoted 3 lines

Since the only difference in the binding is the presence of the "clock-freq-table" property, we could also make this property generic for the mshc driver and use it if present but fall back to the normal behavior when it is absent.

There are still other differences and limitations besides "clock-freq-table". The controller seems less intelligent than other Synopsys mmc controller. The tuning process like HS200 is not intelligent, as a result, some local registers are added to help this.

Quoted 15 lines
Quoted 15 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 27

Quoted 12 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +11 -0
+* clock-freq-table: should be the frequency (in Hz) array of the ciu clock
+    in each supported mode.
+    0. CIU clock rate in Hz for DS mode
+    1. CIU clock rate in Hz for MMC HS mode
+    2. CIU clock rate in Hz for SD HS mode
+    3. CIU clock rate in Hz for SDR12 mode
+    4. CIU clock rate in Hz for SDR25 mode
+    5. CIU clock rate in Hz for SDR50 mode
+    6. CIU clock rate in Hz for SDR104 mode
+    7. CIU clock rate in Hz for DDR50 mode
+    8. CIU clock rate in Hz for HS200 mode

This looks god now.

Quoted 8 lines
Quoted 8 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 31

Quoted 5 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
+static void dw_mci_k3_set_ios(struct dw_mci *host, struct mmc_ios *ios)
+{
+    struct dw_mci_k3_priv_data *priv = host->priv;
+    u32 rate = priv->clk_table[ios->timing];
+    int ret;

I think this should have some range checking to see if the mode that is being set had a clock frequency set in the DT.

The range safety should be ensured by the clk_table array, MAX_NUMS=10.

Quoted 11 lines
Quoted 11 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 38

Quoted 8 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +7 -0
+
+    ret = clk_set_rate(host->ciu_clk, rate);
+    if (ret)
+            dev_warn(host->dev, "failed to set clock rate %uHz\n", rate);
+
+    host->bus_hz = clk_get_rate(host->ciu_clk);
+}

Why do you call clk_get_rate() here, shouldn't it always be the same rate that you have just set?

It is more accurate to use clk_get_rate here.
For example, if switch to ios->clock as you suggested before, 52M will be set for mmc, while 50M is supported.
However, it can simply use rate set currently.

Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +17 -0
+static int dw_mci_k3_parse_dt(struct dw_mci *host)
+{
+    struct dw_mci_k3_priv_data *priv;
+    struct device_node *node = host->dev->of_node;
+    struct property *prop;
+    const __be32 *cur;
+    u32 val, num = 0;
+
+    priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);
+    if (!priv) {
+            dev_err(host->dev, "mem alloc failed for private data\n");
+            return -ENOMEM;
+    }
+    host->priv = priv;
+
+    of_property_for_each_u32(node, "clock-freq-table", prop, cur, val) {
+            if (num >= MAX_NUMS)
Quoted 8 lines
Quoted 8 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 60

Quoted 5 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
+                    break;
+            priv->clk_table[num++] = val;
+    }
+    return 0;
+}

If we make this property part of the generic binding, this function could also get moved to the main dw_mci driver.

This may be not general.
The controller does not generate the clock itself, and set rate to the outside clock source, which may be different according to the working mode.

Quoted 11 lines
Quoted 11 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

Quoted 7 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +6 -0
+static int dw_mci_k3_suspend(struct device *dev)
+{
+    struct dw_mci *host = dev_get_drvdata(dev);
+    int ret = 0;
+
+    ret = dw_mci_suspend(host);

You should never initialize local variables when they are set later in the function (the ret = 0 part above). For more complex functions, this prevents gcc from warning you about accidentally uninitialized uses.

Frankly speaking, I didn't know this rule at all.
Often see the warning before like ?Variable to be used not initialized?, so preferred to init the local variable as much as possible. Looks like it is wrong.

Quoted 12 lines
Quoted 11 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

Quoted 6 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
+    if (!ret)
+            clk_disable_unprepare(host->ciu_clk);
+
+    return ret;
+}

The suspend/resume code also looks very generic. Can't we make these the default for dw-mci? If you do both, you won't even need a k3 specific driver. I think in general we should try hard to add code like this to the common driver when there is a chance that it can be shared with other platforms.

Quoted 3 lines

Dw-mmc has the LOW_POWER mode feature at CLKENA register, this feature is running like clock-gating.
So i have known it didn't control clock enable/disable in dw-mmc.c.

It is added here since we have to set special register when resume back, which has been abstracted to ciu_clk prepare operation.

Quoted 13 lines

Best Regards,
Jaehoon Chung

Quoted 3 lines

Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author
#6 lore raw

PATCH v6 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform

Quoted 119 lines · Zhangfei Gao
Quoted 40 lines · Jaehoon Chung
Quoted 39 lines · Arnd Bergmann
Quoted 24 lines · Zhangfei Gao

Add dw_mmc-k3.c for k3v2, support sd/emmc

---
  .../devicetree/bindings/mmc/k3-dw-mshc.txt         |   60 ++++++++++
  drivers/mmc/host/Kconfig                           |   10 ++
  drivers/mmc/host/Makefile                          |    1 +
  drivers/mmc/host/dw_mmc-k3.c                       |  126 ++++++++++++++++++++
  4 files changed, 197 insertions(+)

create mode 100644 Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt create mode 100644 drivers/mmc/host/dw_mmc-k3.c

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
new file mode 100644
index 000000000000..d7e2d7f159bb
@@ -0,0 +1,60 @@
+* Hisilicon specific extensions to the Synopsys Designware Mobile
+  Storage Host Controller
+
+Read synopsys-dw-mshc.txt for more details
+

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 15

Quoted 10 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +10 -0
+The Synopsys designware mobile storage host controller is used to interface
+a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
+differences between the core Synopsys dw mshc controller properties described
+by synopsys-dw-mshc.txt and the properties used by the Hisilicon specific
+extensions to the Synopsys Designware Mobile Storage Host Controller.
+
+Required Properties:
+
+* compatible: should be one of the following.
+  - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extentions.

I wonder if this is actually a different variant of the mshc hardware, or just wired up in a different way. Do you know details?

Quoted 3 lines
Quoted 3 lines

Since the only difference in the binding is the presence of the "clock-freq-table" property, we could also make this property generic for the mshc driver and use it if present but fall back to the normal behavior when it is absent.

There are still other differences and limitations besides "clock-freq-table". The controller seems less intelligent than other Synopsys mmc controller. The tuning process like HS200 is not intelligent, as a result, some local registers are added to help this.

Quoted 15 lines
Quoted 15 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 27

Quoted 12 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +11 -0
+* clock-freq-table: should be the frequency (in Hz) array of the ciu clock
+    in each supported mode.
+    0. CIU clock rate in Hz for DS mode
+    1. CIU clock rate in Hz for MMC HS mode
+    2. CIU clock rate in Hz for SD HS mode
+    3. CIU clock rate in Hz for SDR12 mode
+    4. CIU clock rate in Hz for SDR25 mode
+    5. CIU clock rate in Hz for SDR50 mode
+    6. CIU clock rate in Hz for SDR104 mode
+    7. CIU clock rate in Hz for DDR50 mode
+    8. CIU clock rate in Hz for HS200 mode

This looks god now.

Quoted 8 lines
Quoted 8 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 31

Quoted 5 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
+static void dw_mci_k3_set_ios(struct dw_mci *host, struct mmc_ios *ios)
+{
+    struct dw_mci_k3_priv_data *priv = host->priv;
+    u32 rate = priv->clk_table[ios->timing];
+    int ret;

I think this should have some range checking to see if the mode that is being set had a clock frequency set in the DT.

The range safety should be ensured by the clk_table array, MAX_NUMS=10.

Quoted 11 lines
Quoted 11 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 38

Quoted 8 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +7 -0
+
+    ret = clk_set_rate(host->ciu_clk, rate);
+    if (ret)
+            dev_warn(host->dev, "failed to set clock rate %uHz\n", rate);
+
+    host->bus_hz = clk_get_rate(host->ciu_clk);
+}

Why do you call clk_get_rate() here, shouldn't it always be the same rate that you have just set?

It is more accurate to use clk_get_rate here.
For example, if switch to ios->clock as you suggested before, 52M will be set for mmc, while 50M is supported.
However, it can simply use rate set currently.

Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +17 -0
+static int dw_mci_k3_parse_dt(struct dw_mci *host)
+{
+    struct dw_mci_k3_priv_data *priv;
+    struct device_node *node = host->dev->of_node;
+    struct property *prop;
+    const __be32 *cur;
+    u32 val, num = 0;
+
+    priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);
+    if (!priv) {
+            dev_err(host->dev, "mem alloc failed for private data\n");
+            return -ENOMEM;
+    }
+    host->priv = priv;
+
+    of_property_for_each_u32(node, "clock-freq-table", prop, cur, val) {
+            if (num >= MAX_NUMS)
Quoted 8 lines
Quoted 8 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 60

Quoted 5 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
+                    break;
+            priv->clk_table[num++] = val;
+    }
+    return 0;
+}

If we make this property part of the generic binding, this function could also get moved to the main dw_mci driver.

Quoted 16 lines

This may be not general.
The controller does not generate the clock itself, and set rate to the outside clock source, which may be different according to the working mode.

Quoted 11 lines
Quoted 11 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

Quoted 7 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +6 -0
+static int dw_mci_k3_suspend(struct device *dev)
+{
+    struct dw_mci *host = dev_get_drvdata(dev);
+    int ret = 0;
+
+    ret = dw_mci_suspend(host);

You should never initialize local variables when they are set later in the function (the ret = 0 part above). For more complex functions, this prevents gcc from warning you about accidentally uninitialized uses.

I am sorry I may fall into the dead end, but still quite not understand this rule.
I alwayes thought it would be a good habit to init local variables before. Do you mean it should NOT init local variable as much as possible and only init on demand, like solving the gcc warning.
Why not init the them at start in case random value cause unpredicted error?

Quoted 38 lines

Frankly speaking, I didn't know this rule at all.
Often see the warning before like ?Variable to be used not initialized?, so preferred to init the local variable as much as possible. Looks like it is wrong.

Quoted 12 lines
Quoted 11 lines

Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt

Quoted 6 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +5 -0
+    if (!ret)
+            clk_disable_unprepare(host->ciu_clk);
+
+    return ret;
+}

The suspend/resume code also looks very generic. Can't we make these the default for dw-mci? If you do both, you won't even need a k3 specific driver. I think in general we should try hard to add code like this to the common driver when there is a chance that it can be shared with other platforms.

Quoted 3 lines

Dw-mmc has the LOW_POWER mode feature at CLKENA register, this feature is running like clock-gating.
So i have known it didn't control clock enable/disable in dw-mmc.c.

It is added here since we have to set special register when resume back, which has been abstracted to ciu_clk prepare operation.

Quoted 13 lines

Best Regards,
Jaehoon Chung

Quoted 3 lines

Arnd

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#7 lore raw

PATCH 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform

Quoted 11 lines · zhangfei
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

drivers/mmc/host/dw_mmc-k3.c line 89

Quoted 6 lines
drivers/mmc/host/dw_mmc-k3.c new file +6 -0
+static int dw_mci_k3_suspend(struct device *dev)
+{
+    struct dw_mci *host = dev_get_drvdata(dev);
+    int ret = 0;
+
+    ret = dw_mci_suspend(host);

You should never initialize local variables when they are set later in the function (the ret = 0 part above). For more complex functions, this prevents gcc from warning you about accidentally uninitialized uses.

Quoted 6 lines

I am sorry I may fall into the dead end, but still quite not understand this rule.
I alwayes thought it would be a good habit to init local variables before. Do you mean it should NOT init local variable as much as possible and only init on demand, like solving the gcc warning.
Why not init the them at start in case random value cause unpredicted error?

The gcc warnings are 100% correct, we can use them as a tool to write better code. If you write code that has no warnings with a modern compiler, you will never use random values, but if you always initialize the local variables, you can end up accidentally using '0' where you shouldn't have.

See http://rusty.ozlabs.org/?p=232 for an excellent article on the topic by former Linaro assignee Rusty Russell.

Arnd

author
#8 lore raw

PATCH v6 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform

Dear Arnd,

Quoted 19 lines · Arnd Bergmann
Quoted 11 lines · zhangfei
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

drivers/mmc/host/dw_mmc-k3.c line 89

Quoted 6 lines
drivers/mmc/host/dw_mmc-k3.c new file +6 -0
+static int dw_mci_k3_suspend(struct device *dev)
+{
+    struct dw_mci *host = dev_get_drvdata(dev);
+    int ret = 0;
+
+    ret = dw_mci_suspend(host);

You should never initialize local variables when they are set later in the function (the ret = 0 part above). For more complex functions, this prevents gcc from warning you about accidentally uninitialized uses.

Quoted 6 lines

I am sorry I may fall into the dead end, but still quite not understand this rule.
I alwayes thought it would be a good habit to init local variables before. Do you mean it should NOT init local variable as much as possible and only init on demand, like solving the gcc warning.
Why not init the them at start in case random value cause unpredicted error?

Quoted 8 lines

The gcc warnings are 100% correct, we can use them as a tool to write better code. If you write code that has no warnings with a modern compiler, you will never use random values, but if you always initialize the local variables, you can end up accidentally using '0' where you shouldn't have.

See http://rusty.ozlabs.org/?p=232 for an excellent article on the topic by former Linaro assignee Rusty Russell.

Excellent, this is what I am looking for.
Thanks for the patience.
I may need some time and gradually change the habit to diminish the hurt memory caused by uninitialized vector.
Will update and take care latter.

By the way, are you fine with the other comments' explanation.

Thanks

#9 lore raw

PATCH 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform

In reply to Arnd Bergmann
Quoted 11 lines · Arnd Bergmann
Quoted 5 lines · Zhangfei Gao
drivers/mmc/host/dw_mmc-k3.c new file +5 -0
+static void dw_mci_k3_set_ios(struct dw_mci *host, struct mmc_ios *ios)
+{
+	struct dw_mci_k3_priv_data *priv = host->priv;
+	u32 rate = priv->clk_table[ios->timing];
+	int ret;

[ ... ]

Quoted 10 lines

drivers/mmc/host/dw_mmc-k3.c line 37

Quoted 7 lines
drivers/mmc/host/dw_mmc-k3.c new file +7 -0
+
+	ret = clk_set_rate(host->ciu_clk, rate);
+	if (ret)
+		dev_warn(host->dev, "failed to set clock rate %uHz\n", rate);
+
+	host->bus_hz = clk_get_rate(host->ciu_clk);
+}

Why do you call clk_get_rate() here, shouldn't it always be the same rate that you have just set?

Not necessarily. What you pass to clk_set_rate() is the rate/frequency that you _want_, while what you get from clk_get_rate() is the rate you _got_ taking the specific input clock rate and the available sets of multipliers/dividers into consideration. Both values should be similar (roughly the same), but they need not be identical. The order of the difference depends on the granularity of the hardware dividers or whether PLLs are used.

So, re-fetching the resulting rate after setting up a desired rate actually better reflects the status-quo for diagnostics or for subsequent processing.

virtually yours
Gerhard Sittig

Signature · 3 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr. 5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
author
#10 lore raw

PATCH v6 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform

Quoted 32 lines · Gerhard Sittig
Quoted 11 lines · Arnd Bergmann
Quoted 5 lines · Zhangfei Gao
drivers/mmc/host/dw_mmc-k3.c new file +5 -0
+static void dw_mci_k3_set_ios(struct dw_mci *host, struct mmc_ios *ios)
+{
+	struct dw_mci_k3_priv_data *priv = host->priv;
+	u32 rate = priv->clk_table[ios->timing];
+	int ret;

[ ... ]

Quoted 10 lines

drivers/mmc/host/dw_mmc-k3.c line 37

Quoted 7 lines
drivers/mmc/host/dw_mmc-k3.c new file +7 -0
+
+	ret = clk_set_rate(host->ciu_clk, rate);
+	if (ret)
+		dev_warn(host->dev, "failed to set clock rate %uHz\n", rate);
+
+	host->bus_hz = clk_get_rate(host->ciu_clk);
+}

Why do you call clk_get_rate() here, shouldn't it always be the same rate that you have just set?

Not necessarily. What you pass to clk_set_rate() is the rate/frequency that you _want_, while what you get from clk_get_rate() is the rate you _got_ taking the specific input clock rate and the available sets of multipliers/dividers into consideration. Both values should be similar (roughly the same), but they need not be identical. The order of the difference depends on the granularity of the hardware dividers or whether PLLs are used.

Quoted 3 lines

So, re-fetching the resulting rate after setting up a desired rate actually better reflects the status-quo for diagnostics or for subsequent processing.

Thanks Gerhard for the professional explanation.

#11 lore raw

PATCH v6 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform

In reply to Zhangfei Gao

Add dw_mmc-k3.c for k3v2, support sd/emmc

---
 .../devicetree/bindings/mmc/k3-dw-mshc.txt         |   60 +++++++++
 drivers/mmc/host/Kconfig                           |   10 ++
 drivers/mmc/host/Makefile                          |    1 +
 drivers/mmc/host/dw_mmc-k3.c                       |  132 ++++++++++++++++++++
 4 files changed, 203 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt
 create mode 100644 drivers/mmc/host/dw_mmc-k3.c
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +60 -0
new file mode 100644
index 000000000000..d7e2d7f159bb
@@ -0,0 +1,60 @@
+* Hisilicon specific extensions to the Synopsys Designware Mobile
+  Storage Host Controller
+
+Read synopsys-dw-mshc.txt for more details
+
+The Synopsys designware mobile storage host controller is used to interface
+a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
+differences between the core Synopsys dw mshc controller properties described
+by synopsys-dw-mshc.txt and the properties used by the Hisilicon specific
+extensions to the Synopsys Designware Mobile Storage Host Controller.
+
+Required Properties:
+
+* compatible: should be one of the following.
+  - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extentions.
+
+* clock-freq-table: should be the frequency (in Hz) array of the ciu clock
+	in each	supported mode.
+	0. CIU clock rate in Hz for DS mode
+	1. CIU clock rate in Hz for MMC HS mode
+	2. CIU clock rate in Hz for SD HS mode
+	3. CIU clock rate in Hz for SDR12 mode
+	4. CIU clock rate in Hz for SDR25 mode
+	5. CIU clock rate in Hz for SDR50 mode
+	6. CIU clock rate in Hz for SDR104 mode
+	7. CIU clock rate in Hz for DDR50 mode
+	8. CIU clock rate in Hz for HS200 mode
+
+Example:
+
+	/* for Hi3620 */
+
+	/* SoC portion */
+	dwmmc_0: dwmmc0 at fcd03000 {
+		compatible = "hisilicon,hi4511-dw-mshc";
+		reg = <0xfcd03000 0x1000>;
+		interrupts = <0 16 4>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		clocks = <&mmc_clock HI3620_SD_CIUCLK>, <&clock HI3620_DDRC_PER_CLK>;
+		clock-names = "ciu", "biu";
+		clock-freq-table =
+		<25000000 0 50000000 25000000 50000000 100000000 0 50000000>;
+	};
+
+	/* Board portion */
+	dwmmc0 at fcd03000 {
+		num-slots = <1>;
+		vmmc-supply = <&ldo12>;
+		fifo-depth = <0x100>;
+		supports-highspeed;
+		pinctrl-names = "default";
+		pinctrl-0 = <&sd_pmx_pins &sd_cfg_func1 &sd_cfg_func2>;
+		slot at 0 {
+			reg = <0>;
+			bus-width = <4>;
+			disable-wp;
+			cd-gpios = <&gpio10 3 0>;
+		};
+	};
drivers/mmc/host/Kconfig +10 -0
index 7fc5099e44b2..45aaa2de0f58 100644
@@ -575,6 +575,16 @@ config MMC_DW_SOCFPGA
 	  This selects support for Altera SoCFPGA specific extensions to the
 	  Synopsys DesignWare Memory Card Interface driver.
 
+config MMC_DW_K3
+	tristate "K3 specific extensions for Synopsys DW Memory Card Interface"
+	depends on MMC_DW
+	select MMC_DW_PLTFM
+	select MMC_DW_IDMAC
+	help
+	  This selects support for Hisilicon K3 SoC specific extensions to the
+	  Synopsys DesignWare Memory Card Interface driver. Select this option
+	  for platforms based on Hisilicon K3 SoC's.
+
 config MMC_DW_PCI
 	tristate "Synopsys Designware MCI support on PCI bus"
 	depends on MMC_DW && PCI
drivers/mmc/host/Makefile +1 -0
index c41d0c364509..64f5f8d35839 100644
@@ -43,6 +43,7 @@ obj-$(CONFIG_MMC_DW)		+= dw_mmc.o
 obj-$(CONFIG_MMC_DW_PLTFM)	+= dw_mmc-pltfm.o
 obj-$(CONFIG_MMC_DW_EXYNOS)	+= dw_mmc-exynos.o
 obj-$(CONFIG_MMC_DW_SOCFPGA)	+= dw_mmc-socfpga.o
+obj-$(CONFIG_MMC_DW_K3)		+= dw_mmc-k3.o
 obj-$(CONFIG_MMC_DW_PCI)	+= dw_mmc-pci.o
 obj-$(CONFIG_MMC_SH_MMCIF)	+= sh_mmcif.o
 obj-$(CONFIG_MMC_JZ4740)	+= jz4740_mmc.o
drivers/mmc/host/dw_mmc-k3.c new file +132 -0

132 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#12 lore raw

PATCH v6 3/3 clk: hisilicon: add hi3620_mmc_clks

In reply to Zhangfei Gao

Suggest by Arnd: abstract mmc tuning as clock behavior, also because different soc have different tuning method and registers. hi3620_mmc_clks is added to handle mmc clock specifically on hi3620.

---
 .../bindings/arm/hisilicon/hisilicon.txt           |   14 ++
 .../devicetree/bindings/clock/hi3620-clock.txt     |    1 +
 drivers/clk/hisilicon/clk-hi3620.c                 |  262 ++++++++++++++++++++
 include/dt-bindings/clock/hi3620-clock.h           |    5 +
 4 files changed, 282 insertions(+)
Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt +14 -0
index 8c7a4653508d..df0a452b8526 100644
@@ -30,3 +30,17 @@ Example:
 		resume-offset = <0x308>;
 		reboot-offset = <0x4>;
 	};
+
+PCTRL: Peripheral misc control register
+
+Required Properties:
+- compatible: "hisilicon,pctrl"
+- reg: Address and size of pctrl.
+
+Example:
+
+	/* for Hi3620 */
+	pctrl: pctrl at fca09000 {
+		compatible = "hisilicon,pctrl";
+		reg = <0xfca09000 0x1000>;
+	};
Documentation/devicetree/bindings/clock/hi3620-clock.txt +1 -0
index 4b71ab41be53..dad6269f52c5 100644
@@ -7,6 +7,7 @@ Required Properties:
 
 - compatible: should be one of the following.
   - "hisilicon,hi3620-clock" - controller compatible with Hi3620 SoC.
+  - "hisilicon,hi3620-mmc-clock" - controller specific for Hi3620 mmc.
 
 - reg: physical base address of the controller and length of memory mapped
   region.
drivers/clk/hisilicon/clk-hi3620.c +262 -0

265 lines not on this page · raw message

include/dt-bindings/clock/hi3620-clock.h +5 -0
index 6eaa6a45e110..21b9d0e2eb0c 100644
@@ -147,6 +147,11 @@
 #define HI3620_MMC_CLK3		217
 #define HI3620_MCU_CLK		218
 
+#define HI3620_SD_CIUCLK	0
+#define HI3620_MMC_CIUCLK1	1
+#define HI3620_MMC_CIUCLK2	2
+#define HI3620_MMC_CIUCLK3	3
+
 #define HI3620_NR_CLKS		219
 
 #endif	/* __DTS_HI3620_CLOCK_H */
Signature · 1 line
1.7.9.5