mmc: dw_mmc: add dw_mmc-k3
Subsystems (4)
v5 cover mmc: dw_mmc: add dw_mmc-k3
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 | 59 +++++ drivers/clk/hisilicon/clk-hi3620.c | 262 ++++++++++++++++++++ drivers/mmc/host/Kconfig | 10 + drivers/mmc/host/Makefile | 1 + drivers/mmc/host/dw_mmc-k3.c | 133 ++++++++++ drivers/mmc/host/dw_mmc.c | 48 +++- include/dt-bindings/clock/hi3620-clock.h | 5 + 9 files changed, 520 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
PATCH v5 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
@@ -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
PATCH v5 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform
In reply to Zhangfei GaoAdd 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 | 133 ++++++++++++++++++++ 4 files changed, 204 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
@@ -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
@@ -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
@@ -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 +133 -0
133 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform
Quoted 53 lines · Zhangfei Gao
Add
dw_mmc-k3.cfor k3v2, support sd/emmcSigned-off-by Zhangfei Gao <[email protected]>Signed-off-by Zhigang Wang <[email protected]>--- .../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 | 133 ++++++++++++++++++++ 4 files changed, 204 insertions(+) create mode 100644 Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt create mode 100644 drivers/mmc/host/dw_mmc-k3.cDocumentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +33
-0@@ -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 */
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 43
Quoted 10 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +10
-0+ 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>;
I think it could be solved with mmc->f_min and mmc->f_max(from clock-freq-min-max property) if there is no limitation per each speed mode. As seeing described table, it looks that.
Quoted 146 lines
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +17
-0+ }; + + /* 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@@ -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 && PCIdrivers/mmc/host/Makefile +1
-0@@ -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.odrivers/mmc/host/dw_mmc-k3.c new file +90
-0@@ -0,0 +1,133 @@ +/* +* Copyright (c) 2013 Linaro Ltd. +* Copyright (c) 2013 Hisilicon Limited. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/clk.h> +#include <linux/mmc/host.h> +#include <linux/mmc/dw_mmc.h> +#include <linux/of_address.h> + +#include "dw_mmc.h" +#include "dw_mmc-pltfm.h" + +#define MAX_NUMS 10 +struct dw_mci_k3_priv_data { +u32 clk_table[MAX_NUMS ]; +}; + +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; + + 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); +} + +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 ) +break ; + priv->clk_table[num++] = val; + } +return 0 ; +} + +static unsigned long k3_dwmmc_caps[4 ] = { +MMC_CAP_4_BIT_DATA |MMC_CAP_SD_HIGHSPEED , +MMC_CAP_8_BIT_DATA |MMC_CAP_MMC_HIGHSPEED , +0 , +0 , +}; + +static const struct dw_mci_drv_data k3_drv_data = { + .caps = k3_dwmmc_caps, + .set_ios = dw_mci_k3_set_ios, + .parse_dt = dw_mci_k3_parse_dt, +}; + +static const struct of_device_id dw_mci_k3_match[] = { + { .compatible ="hisilicon,hi4511-dw-mshc" , + .data = &k3_drv_data, }, + {}, +}; +MODULE_DEVICE_TABLE (of, dw_mci_k3_match); + +static int dw_mci_k3_probe (struct platform_device *pdev) +{ +const struct dw_mci_drv_data *drv_data; +const struct of_device_id *match; + + match =of_match_node (dw_mci_k3_match, pdev->dev.of_node); + drv_data = match->data; + +return dw_mci_pltfm_register (pdev, drv_data);
drivers/mmc/host/dw_mmc-k3.c line 100
Quoted 10 lines
drivers/mmc/host/dw_mmc-k3.c new file +10
-0+} + +static int dw_mci_k3_suspend (struct device *dev) +{ +struct dw_mci *host =dev_get_drvdata (dev); + +if (!IS_ERR (host->ciu_clk)) +clk_disable_unprepare (host->ciu_clk); + +return dw_mci_suspend (host);
If k3 needs clk_disable here, dw_mci_suspend()is expected to be called prior to clk_disable_unprepare()? Of course, it's ok at present though.
Thanks,
Seungwon Jeon
Quoted 40 lines
drivers/mmc/host/dw_mmc-k3.c new file +33
-1+} + +static int dw_mci_k3_resume (struct device *dev) +{ +struct dw_mci *host =dev_get_drvdata (dev); +int ret =0 ; + + ret =clk_prepare_enable (host->ciu_clk); +if (ret) { +dev_err (host->dev,"failed to enable ciu clock\n" ); +return ret; + } + +return dw_mci_resume (host); +} + +SIMPLE_DEV_PM_OPS (dw_mci_k3_pmops, dw_mci_k3_suspend, dw_mci_k3_resume); + +static struct platform_driver dw_mci_k3_pltfm_driver = { + .probe = dw_mci_k3_probe, + .remove = dw_mci_pltfm_remove, + .driver = { + .name ="dwmmc_k3" , + .of_match_table = dw_mci_k3_match, + .pm = &dw_mci_k3_pmops, + }, +}; + +module_platform_driver (dw_mci_k3_pltfm_driver); + +MODULE_DESCRIPTION ("K3 Specific DW-MSHC Driver Extension" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("platform:dwmmc-k3" ); --1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v5 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform
Dear Seungwon
Quoted 15 lines · Seungwon Jeon
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 43
Quoted 11 lines · Zhangfei Gao
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +11
-0+ /* 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>;I think it could be solved with
mmc->f_minandmmc->f_max(from clock-freq-min-max property)if there is no limitation per each speed mode. As seeing described table, it looks that.
Have tried them before, but unfortunately, they are different.
The controller can not generate clock itself, while depending on the outside clock generator, which may require to change clock source in differnt mode.
The value we want is set the capacibility of the clock input and the max clock freq where mmc works stable in that mode, which may be different in different mode.
clock-freq-min-max will set the value for set_ios.
For example, we use 25M as clock capability when init, which can not be set as freq-min, and used as set_ios, where 400K should be used, otherwise init definitely fail.
Quoted 11 lines
drivers/mmc/host/dw_mmc-k3.c line 100
Quoted 8 lines
drivers/mmc/host/dw_mmc-k3.c new file +8
-0+static int dw_mci_k3_suspend (struct device *dev) +{ +struct dw_mci *host =dev_get_drvdata (dev); + +if (!IS_ERR (host->ciu_clk)) +clk_disable_unprepare (host->ciu_clk); + +return dw_mci_suspend (host);If k3 needs
clk_disablehere, dw_mci_suspend()is expected to be called prior toclk_disable_unprepare()? Of course, it's ok at present though.
Sure, it can be switched, though dw_mci_suspend does nothing related with clock now.
Thanks
PATCH 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform
Quoted 25 lines · Zhangfei Gao
Dear Seungwon
Quoted 15 lines · Seungwon Jeon
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 43
Quoted 11 lines · Zhangfei Gao
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +11
-0+ /* 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>;I think it could be solved with
mmc->f_minandmmc->f_max(from clock-freq-min-max property)if there is no limitation per each speed mode. As seeing described table, it looks that.Have tried them before, but unfortunately, they are different.
The controller can not generate clock itself, while depending on the outside clock generator, which may require to change clock source in differnt mode.
Quoted 8 lines
The value we want is set the capacibility of the clock input and the max clock freq where mmc works stable in that mode, which may be different in different mode.
clock-freq-min-max will set the value for
set_ios.
For example, we use 25M as clock capability when init, which can not be set as freq-min, and used asset_ios, where 400K should be used, otherwise init definitely fail.
Can you check 'f_init' within 'drivers/mmc/core/core.c' file?
If you set 'f_min = 25000000' for init-sequence, mmc_set_ios() will pass that rate through 'ios.clock' Then, dw_mmc-k3 can do clk_set_rate() with 25MHz at dw_mci_k3_set_ios().
And other required speeds for each mode seem not specific compared with standard spec. Also clk_set_rate() would be possible with 'ios.clock' instead of specific table.
I just referred your example's clock-freq-table above.
Quoted 10 lines
Quoted 10 lines
drivers/mmc/host/dw_mmc-k3.c line 100
Quoted 9 lines
drivers/mmc/host/dw_mmc-k3.c new file +8
-0+static int dw_mci_k3_suspend (struct device *dev) +{ +struct dw_mci *host =dev_get_drvdata (dev); + +if (!IS_ERR (host->ciu_clk)) +clk_disable_unprepare (host->ciu_clk); + +return dw_mci_suspend (host);If k3 needs
clk_disablehere, dw_mci_suspend()is expected to be called prior to
Quoted 6 lines
clk_disable_unprepare()?Quoted 2 lines
Of course, it's ok at present though.
Sure, it can be switched, though
dw_mci_suspenddoes nothing related with clock now.
Yes, but if some works with ciu_clk is added in dw_mci_suspend(), it will affect.
Thanks,
Seungwon Jeon
PATCH v5 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform
Quoted 30 lines · Seungwon Jeon
Quoted 29 lines · Zhangfei Gao
Dear Seungwon
Quoted 15 lines · Seungwon Jeon
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 43
Quoted 11 lines · Zhangfei Gao
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +11
-0+ /* 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>;I think it could be solved with
mmc->f_minandmmc->f_max(from clock-freq-min-max property)if there is no limitation per each speed mode. As seeing described table, it looks that.Have tried them before, but unfortunately, they are different.
The controller can not generate clock itself, while depending on the outside clock generator, which may require to change clock source in differnt mode.
The value we want is set the capacibility of the clock input and the max clock freq where mmc works stable in that mode, which may be different in different mode.
Quoted 7 lines
Quoted 4 lines
clock-freq-min-max will set the value for
set_ios.
For example, we use 25M as clock capability when init, which can not be set as freq-min, and used asset_ios, where 400K should be used, otherwise init definitely fail.Can you check '
f_init' within 'drivers/mmc/core/core.c' file?
If you set 'f_min= 25000000' for init-sequence,mmc_set_ios()will pass that rate through 'ios.clock' Then, dw_mmc-k3 can doclk_set_rate()with 25MHz atdw_mci_k3_set_ios().
This means controller directly use 25M init emmc and sd card, it will fail. We still need 400K init freq, while the input clock source is 25M, divided by the controller.
Quoted 3 lines
And other required speeds for each mode seem not specific compared with standard spec. Also
clk_set_rate()would be possible with 'ios.clock' instead of specific table. I just referred your example's clock-freq-table above.
There also some controller limitation currently.
In some mode, the controller only works well in the limited freq. For example UHS_SDR104_MAX_DTR 208000000 can not be used, only half may be reached, at least currently
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/mmc/host/dw_mmc-k3.c line 100
Quoted 10 lines
drivers/mmc/host/dw_mmc-k3.c new file +8
-0+static int dw_mci_k3_suspend (struct device *dev) +{ +struct dw_mci *host =dev_get_drvdata (dev); + +if (!IS_ERR (host->ciu_clk)) +clk_disable_unprepare (host->ciu_clk); + +return dw_mci_suspend (host);If k3 needs
clk_disablehere, dw_mci_suspend()is expected to be called prior to
Quoted 8 lines
Quoted 6 lines
clk_disable_unprepare()?Quoted 2 lines
Of course, it's ok at present though.
Sure, it can be switched, though
dw_mci_suspenddoes nothing related with clock now.Yes, but if some works with
ciu_clkis added indw_mci_suspend(), it will affect.
Sorry for the misunderstood, I mean it make sense and will change. Thanks the advice.
PATCH 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform
Quoted 44 lines · Zhangfei Gao
Quoted 30 lines · Seungwon Jeon
Quoted 29 lines · Zhangfei Gao
Dear Seungwon
Quoted 15 lines · Seungwon Jeon
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 43
Quoted 11 lines · Zhangfei Gao
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +11
-0+ /* 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>;I think it could be solved with
mmc->f_minandmmc->f_max(from clock-freq-min-max property)if there is no limitation per each speed mode. As seeing described table, it looks that.Have tried them before, but unfortunately, they are different.
The controller can not generate clock itself, while depending on the outside clock generator, which may require to change clock source in differnt mode.
The value we want is set the capacibility of the clock input and the max clock freq where mmc works stable in that mode, which may be different in different mode.
Quoted 6 lines
Quoted 4 lines
clock-freq-min-max will set the value for
set_ios.
For example, we use 25M as clock capability when init, which can not be set as freq-min, and used asset_ios, where 400K should be used, otherwise init definitely fail.Can you check '
f_init' within 'drivers/mmc/core/core.c' file?
If you set 'f_min= 25000000' for init-sequence,mmc_set_ios()will pass that rate through'ios.clock'
Quoted 1 line
Then, dw_mmc-k3 can do
clk_set_rate()with 25MHz atdw_mci_k3_set_ios().This means controller directly use 25M init emmc and sd card, it will fail. We still need 400K init freq, while the input clock source is 25M, divided by the controller.
Quoted 7 lines
Quoted 3 lines
And other required speeds for each mode seem not specific compared with standard spec. Also
clk_set_rate()would be possible with 'ios.clock' instead of specific table. I just referred your example's clock-freq-table above.There also some controller limitation currently.
In some mode, the controller only works well in the limited freq. For exampleUHS_SDR104_MAX_DTR208000000 can not be used, only half may be reached, at least currently
Ok. I see your condition. I misunderstood a little bit.
I wonder whether limitation is only max frequency(SDR104 or HS200) except for init-freq. How about other mode? Working is fine with normal clock rate(from clock-freq-table)?
Thanks,
Seungwon Jeon
Quoted 28 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/mmc/host/dw_mmc-k3.c line 100
Quoted 11 lines
drivers/mmc/host/dw_mmc-k3.c new file +8
-0+static int dw_mci_k3_suspend (struct device *dev) +{ +struct dw_mci *host =dev_get_drvdata (dev); + +if (!IS_ERR (host->ciu_clk)) +clk_disable_unprepare (host->ciu_clk); + +return dw_mci_suspend (host);If k3 needs
clk_disablehere, dw_mci_suspend()is expected to be called prior toQuoted 8 lines
Quoted 6 lines
clk_disable_unprepare()?Quoted 2 lines
Of course, it's ok at present though.
Sure, it can be switched, though
dw_mci_suspenddoes nothing related with clock now.Yes, but if some works with
ciu_clkis added indw_mci_suspend(), it will affect.Sorry for the misunderstood, I mean it make sense and will change. Thanks the advice.
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v5 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform
Quoted 48 lines · Seungwon Jeon
Quoted 47 lines · Zhangfei Gao
Quoted 30 lines · Seungwon Jeon
Quoted 29 lines · Zhangfei Gao
Dear Seungwon
Quoted 15 lines · Seungwon Jeon
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt line 43
Quoted 11 lines · Zhangfei Gao
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +11
-0+ /* 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>;I think it could be solved with
mmc->f_minandmmc->f_max(from clock-freq-min-max property)if there is no limitation per each speed mode. As seeing described table, it looks that.Have tried them before, but unfortunately, they are different.
The controller can not generate clock itself, while depending on the outside clock generator, which may require to change clock source in differnt mode.
The value we want is set the capacibility of the clock input and the max clock freq where mmc works stable in that mode, which may be different in different mode.
Quoted 6 lines
Quoted 4 lines
clock-freq-min-max will set the value for
set_ios.
For example, we use 25M as clock capability when init, which can not be set as freq-min, and used asset_ios, where 400K should be used, otherwise init definitely fail.Can you check '
f_init' within 'drivers/mmc/core/core.c' file?
If you set 'f_min= 25000000' for init-sequence,mmc_set_ios()will pass that rate through'ios.clock'
Quoted 1 line
Then, dw_mmc-k3 can do
clk_set_rate()with 25MHz atdw_mci_k3_set_ios().This means controller directly use 25M init emmc and sd card, it will fail. We still need 400K init freq, while the input clock source is 25M, divided by the controller.
Quoted 3 lines
And other required speeds for each mode seem not specific compared with standard spec. Also
clk_set_rate()would be possible with 'ios.clock' instead of specific table. I just referred your example's clock-freq-table above.
Quoted 8 lines
Quoted 4 lines
There also some controller limitation currently.
In some mode, the controller only works well in the limited freq. For exampleUHS_SDR104_MAX_DTR208000000 can not be used, only half may be reached, at least currentlyOk. I see your condition. I misunderstood a little bit.
I wonder whether limitation is only max frequency(SDR104 or HS200) except for init-freq. How about other mode? Working is fine with normal clock rate(from clock-freq-table)?
The root cause is the controller can not generate stable clock itself, but depends on outside clock source, which is varying, and driver need to decide input clock rate / choose clock source according to the working mode.
Three cases here:
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. For example, CLK_MAX = 180M.
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.
The third case is current limitation, after this limitation is solved, we can switch to ios->clock directly.
Considering all these cases, we think using table is more suitable now.
Thanks
PATCH v5 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform
In reply to Zhangfei GaoAdd 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 | 134 ++++++++++++++++++++ 4 files changed, 205 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
@@ -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
@@ -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
@@ -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 +134 -0
134 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH v5 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform
Quoted 4 lines · Zhangfei Gao
Add
dw_mmc-k3.cfor k3v2, support sd/emmcSigned-off-by Zhangfei Gao <[email protected]>Signed-off-by Zhigang Wang <[email protected]>
Quoted 9 lines
--- .../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 | 134 ++++++++++++++++++++ 4 files changed, 205 insertions(+)create mode 100644
Documentation/devicetree/bindings/mmc/k3-dw-mshc.txtcreate mode 100644drivers/mmc/host/dw_mmc-k3.c
Any comments?
Thanks
Jaehoon Chung
maintainerPATCH 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform
In reply to Zhangfei GaoHi, Zhangfei,
Quoted 84 lines · Zhangfei Gao
Add
dw_mmc-k3.cfor k3v2, support sd/emmcSigned-off-by Zhangfei Gao <[email protected]>Signed-off-by Zhigang Wang <[email protected]>--- .../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 | 134 ++++++++++++++++++++ 4 files changed, 205 insertions(+) create mode 100644 Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt create mode 100644 drivers/mmc/host/dw_mmc-k3.cDocumentation/devicetree/bindings/mmc/k3-dw-mshc.txt new file +60
-0@@ -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 +0
-0
drivers/mmc/host/Kconfig config MMC_DW_SOCFPGA · line 582
Quoted 8 lines
drivers/mmc/host/Kconfig +5
-0@@ -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
Only use the IDMAC?
Quoted 83 lines
drivers/mmc/host/Kconfig +5
-0+ 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 && PCIdrivers/mmc/host/Makefile +1
-0@@ -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.odrivers/mmc/host/dw_mmc-k3.c new file +57
-0@@ -0,0 +1,134 @@ +/* +* Copyright (c) 2013 Linaro Ltd. +* Copyright (c) 2013 Hisilicon Limited. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/clk.h> +#include <linux/mmc/host.h> +#include <linux/mmc/dw_mmc.h> +#include <linux/of_address.h> + +#include "dw_mmc.h" +#include "dw_mmc-pltfm.h" + +#define MAX_NUMS 10 +struct dw_mci_k3_priv_data { +u32 clk_table[MAX_NUMS ]; +}; + +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; + + 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); +} + +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 ) +break ; + priv->clk_table[num++] = val;
drivers/mmc/host/dw_mmc-k3.c line 67
Quoted 10 lines
drivers/mmc/host/dw_mmc-k3.c new file +10
-0+ } +return 0 ; +} + +static unsigned long k3_dwmmc_caps[4 ] = { +MMC_CAP_4_BIT_DATA |MMC_CAP_SD_HIGHSPEED , +MMC_CAP_8_BIT_DATA |MMC_CAP_MMC_HIGHSPEED , +0 , +0 , +};
If supports-highspeed is defined at dt-file,
then MMC_CAP_SD_HIGHSEEPD and MMC_CAP_MMC_HIGHSPEED should set in dw-mmc.c
Quoted 39 lines
drivers/mmc/host/dw_mmc-k3.c new file +39
-0+ +static const struct dw_mci_drv_data k3_drv_data = { + .caps = k3_dwmmc_caps, + .set_ios = dw_mci_k3_set_ios, + .parse_dt = dw_mci_k3_parse_dt, +}; + +static const struct of_device_id dw_mci_k3_match[] = { + { .compatible ="hisilicon,hi4511-dw-mshc" , .data = &k3_drv_data, }, + {}, +}; +MODULE_DEVICE_TABLE (of, dw_mci_k3_match); + +static int dw_mci_k3_probe (struct platform_device *pdev) +{ +const struct dw_mci_drv_data *drv_data; +const struct of_device_id *match; + + match =of_match_node (dw_mci_k3_match, pdev->dev.of_node); + drv_data = match->data; + +return dw_mci_pltfm_register (pdev, drv_data); +} + +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); +if (!ret) +clk_disable_unprepare (host->ciu_clk); + +return ret; +} + +static int dw_mci_k3_resume (struct device *dev) +{ +struct dw_mci *host =dev_get_drvdata (dev);
drivers/mmc/host/dw_mmc-k3.c line 116
Quoted 10 lines
drivers/mmc/host/dw_mmc-k3.c new file +10
-0+int ret =0 ; + + ret =clk_prepare_enable (host->ciu_clk); +if (ret) { +dev_err (host->dev,"failed to enable ciu clock\n" ); +return ret; + } + +return dw_mci_resume (host); +}
Clock control need in suspend/resume? ciu-clk is used into dw-mmc.c.
Best Regards,
Jaehoon Chung
Quoted 19 lines
drivers/mmc/host/dw_mmc-k3.c new file +18
-0+ +SIMPLE_DEV_PM_OPS (dw_mci_k3_pmops, dw_mci_k3_suspend, dw_mci_k3_resume); + +static struct platform_driver dw_mci_k3_pltfm_driver = { + .probe = dw_mci_k3_probe, + .remove = dw_mci_pltfm_remove, + .driver = { + .name ="dwmmc_k3" , + .of_match_table = dw_mci_k3_match, + .pm = &dw_mci_k3_pmops, + }, +}; + +module_platform_driver (dw_mci_k3_pltfm_driver); + +MODULE_DESCRIPTION ("K3 Specific DW-MSHC Driver Extension" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("platform:dwmmc-k3" );
PATCH v5 2/3 mmc: dw_mmc: add dw_mmc-k3 for k3 platform
Dear Jaehoon
Thanks for the reviewing.
Quoted 7 lines · Jaehoon Chung
drivers/mmc/host/Kconfig config MMC_DW_SOCFPGA · line 582
Quoted 5 lines
drivers/mmc/host/Kconfig +5
-0+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_IDMACOnly use the IDMAC?
IDMAC has to be set here since we found the controller have some issue in non-dma mode.
Quoted 9 lines
drivers/mmc/host/dw_mmc-k3.c line 67
Quoted 6 lines
drivers/mmc/host/dw_mmc-k3.c new file +6
-0+static unsigned long k3_dwmmc_caps[4 ] = { +MMC_CAP_4_BIT_DATA |MMC_CAP_SD_HIGHSPEED , +MMC_CAP_8_BIT_DATA |MMC_CAP_MMC_HIGHSPEED , +0 , +0 , +};If supports-highspeed is defined at dt-file,
thenMMC_CAP_SD_HIGHSEEPDandMMC_CAP_MMC_HIGHSPEEDshould set indw-mmc.c
Yes, good catch, they can be removed.
Quoted 44 lines
Quoted 44 lines
drivers/mmc/host/dw_mmc-k3.c new file +43
-0+ +static const struct dw_mci_drv_data k3_drv_data = { + .caps = k3_dwmmc_caps, + .set_ios = dw_mci_k3_set_ios, + .parse_dt = dw_mci_k3_parse_dt, +}; + +static const struct of_device_id dw_mci_k3_match[] = { + { .compatible ="hisilicon,hi4511-dw-mshc" , .data = &k3_drv_data, }, + {}, +}; +MODULE_DEVICE_TABLE (of, dw_mci_k3_match); + +static int dw_mci_k3_probe (struct platform_device *pdev) +{ +const struct dw_mci_drv_data *drv_data; +const struct of_device_id *match; + + match =of_match_node (dw_mci_k3_match, pdev->dev.of_node); + drv_data = match->data; + +return dw_mci_pltfm_register (pdev, drv_data); +} + +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); +if (!ret) +clk_disable_unprepare (host->ciu_clk); + +return ret; +} + +static int dw_mci_k3_resume (struct device *dev) +{ +struct dw_mci *host =dev_get_drvdata (dev); +int ret =0 ; + + ret =clk_prepare_enable (host->ciu_clk); +if (ret) {
Quoted 8 lines
drivers/mmc/host/dw_mmc-k3.c line 116
Quoted 6 lines
drivers/mmc/host/dw_mmc-k3.c new file +6
-0+dev_err (host->dev,"failed to enable ciu clock\n" ); +return ret; + } + +return dw_mci_resume (host); +}Clock control need in suspend/resume? ciu-clk is used into
dw-mmc.c.
The ciu-clk is required here not only for power, but also clk prepare have to be triggered in the resume operation as well as init process, otherwise sd register access will fail. Some tuning registers accessing have been abstracted to clock.
Thanks
PATCH v5 3/3 clk: hisilicon: add hi3620_mmc_clks
In reply to Zhangfei GaoSuggest 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
@@ -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
@@ -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
@@ -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