Skip to contentSkip to conversation

mmc: dw_mmc: add dw_mmc-k3

PATCH Superseded Zhangfei Gao 2 participants 14 messages Dec 11, 2013 – Dec 13, 2013

Subsystems (4)

v4 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v4 cover mmc: dw_mmc: add dw_mmc-k3

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         |   51 ++++
 drivers/clk/hisilicon/clk-hi3620.c                 |  266 ++++++++++++++++++++
 drivers/mmc/host/Kconfig                           |   10 +
 drivers/mmc/host/Makefile                          |    1 +
 drivers/mmc/host/dw_mmc-k3.c                       |  136 ++++++++++
 drivers/mmc/host/dw_mmc.c                          |   48 +++-
 include/dt-bindings/clock/hi3620-clock.h           |    5 +
 9 files changed, 519 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 v4 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 v4 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         |   51 ++++++++
 drivers/mmc/host/Kconfig                           |   10 ++
 drivers/mmc/host/Makefile                          |    1 +
 drivers/mmc/host/dw_mmc-k3.c                       |  136 ++++++++++++++++++++
 4 files changed, 198 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 +51 -0
new file mode 100644
index 000000000000..d816b89c386a
@@ -0,0 +1,51 @@
+* 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.
+* clk-table-num: should be number of clks in clk-table required by each mmc timing
+* clk-table: should clock list required by each mmc timing
+
+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";
+		clk-table-num = <8>;
+		clk-table =
+		<13000000 50000000 0 0 13000000 50000000 0 100000000>;
+	};
+
+	/* 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 +136 -0

136 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 26 lines · Zhangfei Gao

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

---
 .../devicetree/bindings/mmc/k3-dw-mshc.txt         |   51 ++++++++
 drivers/mmc/host/Kconfig                           |   10 ++
 drivers/mmc/host/Makefile                          |    1 +
 drivers/mmc/host/dw_mmc-k3.c                       |  136 ++++++++++++++++++++
 4 files changed, 198 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 +7 -0
new file mode 100644
index 000000000000..d816b89c386a
@@ -0,0 +1,51 @@
+* 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

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

Quoted 10 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +10 -0
+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.
+* clk-table-num: should be number of clks in clk-table required by each mmc timing
+* clk-table: should clock list required by each mmc timing

I have not seen "clk-table" and "clk-table-num" before. Are these standard properties? What are the units that are used here, what does the index mean?

Arnd

author
#4 lore raw

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

Quoted 12 lines · Arnd Bergmann

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

Quoted 6 lines · Zhangfei Gao
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +6 -0
+Required Properties:
+
+* compatible: should be one of the following.
+  - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific extentions.
+* clk-table-num: should be number of clks in clk-table required by each mmc timing
+* clk-table: should clock list required by each mmc timing

I have not seen "clk-table" and "clk-table-num" before. Are these standard properties? What are the units that are used here, what does the index mean?

"clk-table" and "clk-table-num" are private properties.
Instead simply on/off, the ip need different ciu clock for each timing mode. Take emmc as example,
clk-table-num = <8>;
clk-table =
<13000000 50000000 0 0 13000000 50000000 0 100000000>; MMC_TIMING_LEGACY mode, 25M should be set with parent clock 180M, MMC_TIMING_MMC_HS mode, 50M is required with parent clock 360M

"clk-table" list all clocks to be set in all supported timing one by one. "clk-table-num" is the table number, since not find function getting table number.
For example, next version will support MMC_TIMING_MMC_HS200 mode, the clk-table-num = <9> with 9 clocks in the "clk-table"

Thanks

author
#5 lore raw

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

Quoted 20 lines · zhangfei
Quoted 16 lines · Arnd Bergmann
Quoted 8 lines · Zhangfei Gao
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +4 -0
+Required Properties:
+
+* compatible: should be one of the following.
+  - "hisilicon,hi4511-dw-mshc": for controllers with hi4511 specific

extentions.
+* clk-table-num: should be number of clks in clk-table required by each mmc timing
+* clk-table: should clock list required by each mmc timing

I have not seen "clk-table" and "clk-table-num" before. Are these standard
properties? What are the units that are used here, what does the index mean?

Quoted 6 lines

"clk-table" and "clk-table-num" are private properties. Instead simply on/off, the ip need different ciu clock for each timing mode.
Take emmc as example,
clk-table-num = <8>;
clk-table =

My bad, this is for sd.

Quoted 1 line

<13000000 50000000 0 0 13000000 50000000 0 100000000>;

<25000000 0 50000000 25000000 50000000 100000000 0 50000000>;

Quoted 12 lines

MMC_TIMING_LEGACY mode, 25M should be set with parent clock 180M, MMC_TIMING_MMC_HS mode, 50M is required with parent clock 360M

"clk-table" list all clocks to be set in all supported timing one by one. "clk-table-num" is the table number, since not find function getting table number.
For example, next version will support MMC_TIMING_MMC_HS200 mode, the clk-table-num = <9> with 9 clocks in the "clk-table"

Thanks

#6 lore raw

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

In reply to zhangfei
Quoted 7 lines · zhangfei
Quoted 4 lines

I have not seen "clk-table" and "clk-table-num" before. Are these standard properties? What are the units that are used here, what does the index mean?

"clk-table" and "clk-table-num" are private properties.
Instead simply on/off, the ip need different ciu clock for each timing mode.

But aren't the times fixed for each mode? Why do you need to specify them in the DT? I would expect that the clock rates for each mode are set in the MMC and SD specifications. When you call clk_set_rate(), it should normally be enough to ask for the clock you actually want and let the clk subsystem figure out how to set up the parents and multipliers on the way.

Quoted 7 lines

Take emmc as example,
clk-table-num = <8>;
clk-table =
<13000000 50000000 0 0 13000000 50000000 0 100000000>; MMC_TIMING_LEGACY mode, 25M should be set with parent clock 180M, MMC_TIMING_MMC_HS mode, 50M is required with parent clock 360M

Quoted 5 lines

"clk-table" list all clocks to be set in all supported timing one by one. "clk-table-num" is the table number, since not find function getting table number.
For example, next version will support MMC_TIMING_MMC_HS200 mode, the clk-table-num = <9> with 9 clocks in the "clk-table"

If you have a property with an array, you can use of_find_property() to get to the 'struct property' and then read the 'length' member of that struct, or you can use of_property_for_each_u32() to iterate through each value.

While I still hope that you don't even need this array as per the reasoning above, if you actually need it, you should specify exactly what each value means, such as

1. CIU clock rate in HZ for 20MHz SPI mode operation
2. CIU clock rate in HZ for 25MHz SD card operation
3. CIU clock rate in HZ for 26MHz MMC card operation
4. CIU clock rate in HZ for 50MHz SD card operation
...

Arnd

author
#7 lore raw

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

Dear Arnd

Quoted 6 lines · Arnd Bergmann
Quoted 5 lines · zhangfei
Quoted 4 lines

I have not seen "clk-table" and "clk-table-num" before. Are these standard properties? What are the units that are used here, what does the index mean?

Quoted 8 lines
Quoted 2 lines

"clk-table" and "clk-table-num" are private properties.
Instead simply on/off, the ip need different ciu clock for each timing mode.

But aren't the times fixed for each mode? Why do you need to specify them in the DT? I would expect that the clock rates for each mode are set in the MMC and SD specifications. When you call clk_set_rate(), it should normally be enough to ask for the clock you actually want and let the clk subsystem figure out how to set up the parents and multipliers on the way.

Yes. that's will be perfect.

However, currently this ip still has no such capability.
1. Input rate for init are diferent for different controller, not the init 400K, some are 13M, others are 25M, since different clock source. This can be easily solved by clock-freq-init = <25000000>
2. There is maxmum limit, also can be easily solved by define CLK_MAX.
3. However some mode can not use the max speed from ios->clock for example UHS_SDR104_MAX_DTR 208000000 can not be used, only half may be reached, at least currently.

Quoted 14 lines
Quoted 8 lines

Take emmc as example,
clk-table-num = <8>;
clk-table =
<13000000 50000000 0 0 13000000 50000000 0 100000000>; MMC_TIMING_LEGACY mode, 25M should be set with parent clock 180M, MMC_TIMING_MMC_HS mode, 50M is required with parent clock 360M

Quoted 5 lines

"clk-table" list all clocks to be set in all supported timing one by one. "clk-table-num" is the table number, since not find function getting table number.
For example, next version will support MMC_TIMING_MMC_HS200 mode, the clk-table-num = <9> with 9 clocks in the "clk-table"

Quoted 4 lines

If you have a property with an array, you can use of_find_property() to get to the 'struct property' and then read the 'length' member of that struct, or you can use of_property_for_each_u32() to iterate through each value.

Great, this works.

Quoted 10 lines

While I still hope that you don't even need this array as per the reasoning above, if you actually need it, you should specify exactly what each value means, such as

1. CIU clock rate in HZ for 20MHz SPI mode operation
2. CIU clock rate in HZ for 25MHz SD card operation
3. CIU clock rate in HZ for 26MHz MMC card operation
4. CIU clock rate in HZ for 50MHz SD card operation
...

How about this desc

* clock-freq-table: should be the frequency (in Hz) array of the ciu clock
in each supported timing.

1. CIU clock rate in HZ for MMC_TIMING_LEGACY mode

2. CIU clock rate in HZ for MMC_TIMING_MMC_HS mode
3. CIU clock rate in HZ for MMC_TIMING_SD_HS mode
4. CIU clock rate in HZ for MMC_TIMING_UHS_SDR12 mode

5. CIU clock rate in HZ for MMC_TIMING_UHS_SDR25 mode

6. CIU clock rate in HZ for MMC_TIMING_UHS_SDR50 mode

7. CIU clock rate in HZ for MMC_TIMING_UHS_SDR104 mode

8. CIU clock rate in HZ for MMC_TIMING_SD_HS mode

9. CIU clock rate in HZ for MMC_TIMING_MMC_HS200 mode

Thanks

#8 lore raw

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

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

---
 .../devicetree/bindings/mmc/k3-dw-mshc.txt         |   59 +++++++++
 drivers/mmc/host/Kconfig                           |   10 ++
 drivers/mmc/host/Makefile                          |    1 +
 drivers/mmc/host/dw_mmc-k3.c                       |  128 ++++++++++++++++++++
 4 files changed, 198 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 +59 -0
new file mode 100644
index 000000000000..5501c7c1138f
@@ -0,0 +1,59 @@
+* 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 timing mode.
+	1. CIU clock rate in HZ for MMC_TIMING_LEGACY mode
+	2. CIU clock rate in HZ for MMC_TIMING_MMC_HS mode
+	3. CIU clock rate in HZ for MMC_TIMING_SD_HS mode
+	4. CIU clock rate in HZ for MMC_TIMING_UHS_SDR12 mode
+	5. CIU clock rate in HZ for MMC_TIMING_UHS_SDR25 mode
+	6. CIU clock rate in HZ for MMC_TIMING_UHS_SDR50 mode
+	7. CIU clock rate in HZ for MMC_TIMING_UHS_SDR104 mode
+	8. CIU clock rate in HZ for MMC_TIMING_SD_HS mode
+	9. CIU clock rate in HZ for MMC_TIMING_MMC_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";
+		clk-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 +128 -0

128 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#9 lore raw

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

In reply to zhangfei
Quoted 11 lines · zhangfei
Quoted 7 lines · Arnd Bergmann

On Wednesday 11 December 2013, zhangfei wrote:

But aren't the times fixed for each mode? Why do you need to specify them in the DT? I would expect that the clock rates for each mode are set in the MMC and SD specifications. When you call clk_set_rate(), it should normally be enough to ask for the clock you actually want and let the clk subsystem figure out how to set up the parents and multipliers on the way.

Yes. that's will be perfect.

Quoted 8 lines

However, currently this ip still has no such capability.
Input rate for init are diferent for different controller, not the
init 400K, some are 13M, others are 25M, since different clock source. This can be easily solved by clock-freq-init = <25000000>
2. There is maxmum limit, also can be easily solved by define CLK_MAX.
3. However some mode can not use the max speed from ios->clock for example UHS_SDR104_MAX_DTR 208000000 can not be used, only half may be reached, at least currently.

I don't fully understand the explanation, but if some of the other people with interest in dw-mmc (I've added some more to Cc now) think this makes sense, I'm fine with it too.

Quoted 14 lines

How about this desc

* clock-freq-table: should be the frequency (in Hz) array of the ciu clock
in each supported timing.

1. CIU clock rate in HZ for MMC_TIMING_LEGACY mode

2. CIU clock rate in HZ for MMC_TIMING_MMC_HS mode
3. CIU clock rate in HZ for MMC_TIMING_SD_HS mode
4. CIU clock rate in HZ for MMC_TIMING_UHS_SDR12 mode

5. CIU clock rate in HZ for MMC_TIMING_UHS_SDR25 mode

Quoted 8 lines

6. CIU clock rate in HZ for MMC_TIMING_UHS_SDR50 mode

7. CIU clock rate in HZ for MMC_TIMING_UHS_SDR104 mode

8. CIU clock rate in HZ for MMC_TIMING_SD_HS mode

9. CIU clock rate in HZ for MMC_TIMING_MMC_HS200 mode

Yes, that is much better. but please avoid using Linux internal identifiers (e.g. MMC_TIMING_LEGACY) and instead use the terminology from the MMC and SD specs. Also 'Hz' is the official symbol for Hertz, not 'HZ'.

Arnd

author
#10 lore raw

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

Quoted 21 lines · Arnd Bergmann
Quoted 11 lines · zhangfei
Quoted 7 lines · Arnd Bergmann

On Wednesday 11 December 2013, zhangfei wrote:

But aren't the times fixed for each mode? Why do you need to specify them in the DT? I would expect that the clock rates for each mode are set in the MMC and SD specifications. When you call clk_set_rate(), it should normally be enough to ask for the clock you actually want and let the clk subsystem figure out how to set up the parents and multipliers on the way.

Yes. that's will be perfect.

Quoted 8 lines

However, currently this ip still has no such capability.
Input rate for init are diferent for different controller, not the
init 400K, some are 13M, others are 25M, since different clock source. This can be easily solved by clock-freq-init = <25000000>
2. There is maxmum limit, also can be easily solved by define CLK_MAX.
3. However some mode can not use the max speed from ios->clock for example UHS_SDR104_MAX_DTR 208000000 can not be used, only half may be reached, at least currently.

Quoted 1 line

I don't fully understand the explanation,

This is the ip's limitation currently, that some mode can only operate at limited freq, rather than the max freq from spec.
Will upgrade to use ios->clock once the limitation is solved.

but if some of the other

Quoted 3 lines

people with interest in dw-mmc (I've added some more to Cc now) think this makes sense, I'm fine with it too.

Could I treat this as Ack or Partially Ack for the next version :)

Quoted 18 lines
Quoted 18 lines

How about this desc

* clock-freq-table: should be the frequency (in Hz) array of the ciu clock
in each supported timing.

1. CIU clock rate in HZ for MMC_TIMING_LEGACY mode

2. CIU clock rate in HZ for MMC_TIMING_MMC_HS mode
3. CIU clock rate in HZ for MMC_TIMING_SD_HS mode
4. CIU clock rate in HZ for MMC_TIMING_UHS_SDR12 mode

5. CIU clock rate in HZ for MMC_TIMING_UHS_SDR25 mode

6. CIU clock rate in HZ for MMC_TIMING_UHS_SDR50 mode

7. CIU clock rate in HZ for MMC_TIMING_UHS_SDR104 mode

Quoted 9 lines
Quoted 4 lines

8. CIU clock rate in HZ for MMC_TIMING_SD_HS mode

9. CIU clock rate in HZ for MMC_TIMING_MMC_HS200 mode

Yes, that is much better. but please avoid using Linux internal identifiers (e.g. MMC_TIMING_LEGACY) and instead use the terminology from the MMC and SD specs. Also 'Hz' is the official symbol for Hertz, not 'HZ'.

Update to

* 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

Thanks

#11 lore raw

PATCH v4 3/3 clk: hisilicon: add hi3620_mmc_clks

In reply to Zhangfei Gao

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
#12 lore raw

PATCH 3/3 clk: hisilicon: add hi3620_mmc_clks

Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt Example: · line 46

Quoted 13 lines · Zhangfei Gao
Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt +13 -0
+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>;
+       };

It seems you are missing the clock specific parts of the binding:
You should document the required value of #clock-cells as well as the possible values for the clock specifier.

Arnd

author
#13 lore raw

PATCH v4 3/3 clk: hisilicon: add hi3620_mmc_clks

Quoted 10 lines · Arnd Bergmann
Quoted 9 lines · Zhangfei Gao
Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt +9 -0
+PCTRL: Peripheral misc control register
+
+Required Properties:
+- compatible: "hisilicon,pctrl"
+- reg: Address and size of pctrl.
+
+Example:
+
+       /* for Hi3620 */
Quoted 9 lines

Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt Example: · line 46

Quoted 4 lines
Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt +4 -0
+       pctrl: pctrl at fca09000 {
+               compatible = "hisilicon,pctrl";
+               reg = <0xfca09000 0x1000>;
+       };

It seems you are missing the clock specific parts of the binding:
You should document the required value of #clock-cells as well as the possible values for the clock specifier.

It is reuse Documentation/devicetree/bindings/clock/hi3620-clock.txt via adding hisilicon,hi3620-mmc-clock"

- 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.

- #clock-cells: should be 1.

Thanks