[PATCH v2 0/2] Add HiSilicon Hi3798CV200 specific dw_mmc extension driver

[PATCH v2 0/2] Add HiSilicon Hi3798CV200 specific dw_mmc extension driver

[Shawn Guo]

It adds the dt-bindings and driver support for HiSilicon Hi3798CV200
specific dw_mmc extension.

Changes for v2:
 - Rebase to v4.16-rc.
 - Use SPDX tag for license.
 - Make ciu-sample and ciu-drive clock be required.
 - Drop deprecated num-slots property from bindings example.
 - Do not show board vs. SoC portion split in bindings example.
 - Use .init hook instead of .parse_dt for initialization.
 - Improve MODULE_DESCRIPTION to make it clear this is Hi3798CV200
   specific extension.
 - Various style improvements and code cleanups.

v1: https://lkml.org/lkml/2017/10/17/1213

tianshuliang (2):
  dt-bindings: mmc: add bindings for hi3798cv200-dw-mshc
  mmc: dw_mmc: add support for hi3798cv200 specific extensions of
    dw-mshc

 .../bindings/mmc/hi3798cv200-dw-mshc.txt           |  40 +++++
 drivers/mmc/host/Kconfig                           |   9 +
 drivers/mmc/host/Makefile                          |   1 +
 drivers/mmc/host/dw_mmc-hi3798cv200.c              | 197 +++++++++++++++++++++
 4 files changed, 247 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mmc/hi3798cv200-dw-mshc.txt
 create mode 100644 drivers/mmc/host/dw_mmc-hi3798cv200.c

-- 
1.9.1

[PATCH v2 1/2] dt-bindings: mmc: add bindings for hi3798cv200-dw-mshc

[Shawn Guo]

From: tianshuliang <tianshuliang@hisilicon.com>

Hisilicon hi3798cv200 SoC extends the dw-mshc controller
for additional clock control. Add device tree bindings for
hi3798cv200-dw-mshc.

Signed-off-by: tianshuliang <tianshuliang@hisilicon.com>
Signed-off-by: Jiancheng Xue <xuejiancheng@hisilicon.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 .../bindings/mmc/hi3798cv200-dw-mshc.txt           | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mmc/hi3798cv200-dw-mshc.txt

diff --git a/Documentation/devicetree/bindings/mmc/hi3798cv200-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/hi3798cv200-dw-mshc.txt
new file mode 100644
index 000000000000..a0693b7145f2
--- /dev/null
+++ b/Documentation/devicetree/bindings/mmc/hi3798cv200-dw-mshc.txt
@@ -0,0 +1,40 @@
+* Hisilicon Hi3798CV200 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 Hi3798CV200
+specific extensions to the Synopsys Designware Mobile Storage Host Controller.
+
+Required Properties:
+- compatible: Should contain "hisilicon,hi3798cv200-dw-mshc".
+- clocks: A list of phandle + clock-specifier pairs for the clocks listed
+  in clock-names.
+- clock-names: Should contain the following:
+	"ciu" - The ciu clock described in synopsys-dw-mshc.txt.
+	"biu" - The biu clock described in synopsys-dw-mshc.txt.
+	"ciu-sample" - Hi3798CV200 extended phase clock for ciu sampling.
+	"ciu-drive"  - Hi3798CV200 extended phase clock for ciu driving.
+
+Example:
+
+	emmc: mmc@9830000 {
+		compatible = "hisilicon,hi3798cv200-dw-mshc";
+		reg = <0x9830000 0x10000>;
+		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&crg HISTB_MMC_CIU_CLK>,
+			 <&crg HISTB_MMC_BIU_CLK>,
+			 <&crg HISTB_MMC_SAMPLE_CLK>,
+			 <&crg HISTB_MMC_DRV_CLK>;
+		clock-names = "ciu", "biu", "ciu-sample", "ciu-drive";
+		fifo-depth = <256>;
+		clock-frequency = <200000000>;
+		cap-mmc-highspeed;
+		mmc-ddr-1_8v;
+		mmc-hs200-1_8v;
+		non-removable;
+		bus-width = <8>;
+	};
-- 
1.9.1

[PATCH v2 2/2] mmc: dw_mmc: add support for hi3798cv200 specific extensions of dw-mshc

[Shawn Guo]

From: tianshuliang <tianshuliang@hisilicon.com>

Hi3798CV200 SoC extends the dw-mshc controller for additional clock
and bus control. Add support for these extensions.

Signed-off-by: tianshuliang <tianshuliang@hisilicon.com>
Signed-off-by: Jiancheng Xue <xuejiancheng@hisilicon.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 drivers/mmc/host/Kconfig              |   9 ++
 drivers/mmc/host/Makefile             |   1 +
 drivers/mmc/host/dw_mmc-hi3798cv200.c | 197 ++++++++++++++++++++++++++++++++++
 3 files changed, 207 insertions(+)
 create mode 100644 drivers/mmc/host/dw_mmc-hi3798cv200.c

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 620c2d90a646..de36fffe8225 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -718,6 +718,15 @@ config MMC_DW_EXYNOS
 	  Synopsys DesignWare Memory Card Interface driver. Select this option
 	  for platforms based on Exynos4 and Exynos5 SoC's.
 
+config MMC_DW_HI3798CV200
+	tristate "Hi3798CV200 specific extensions for Synopsys DW Memory Card Interface"
+	depends on MMC_DW
+	select MMC_DW_PLTFM
+	help
+	  This selects support for HiSilicon Hi3798CV200 SoC specific extensions to the
+	  Synopsys DesignWare Memory Card Interface driver. Select this option
+	  for platforms based on HiSilicon Hi3798CV200 SoC.
+
 config MMC_DW_K3
 	tristate "K3 specific extensions for Synopsys DW Memory Card Interface"
 	depends on MMC_DW
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index 84cd1388abc3..00ec9a2f59be 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -51,6 +51,7 @@ obj-$(CONFIG_MMC_CAVIUM_THUNDERX) += thunderx-mmc.o
 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_HI3798CV200) += dw_mmc-hi3798cv200.o
 obj-$(CONFIG_MMC_DW_K3)		+= dw_mmc-k3.o
 obj-$(CONFIG_MMC_DW_PCI)	+= dw_mmc-pci.o
 obj-$(CONFIG_MMC_DW_ROCKCHIP)	+= dw_mmc-rockchip.o
diff --git a/drivers/mmc/host/dw_mmc-hi3798cv200.c b/drivers/mmc/host/dw_mmc-hi3798cv200.c
new file mode 100644
index 000000000000..364ad3dd7116
--- /dev/null
+++ b/drivers/mmc/host/dw_mmc-hi3798cv200.c
@@ -0,0 +1,197 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2017 HiSilicon Technologies Co., Ltd.
+ */
+
+#include <linux/clk.h>
+#include <linux/mfd/syscon.h>
+#include <linux/mmc/host.h>
+#include <linux/module.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+#include <linux/regmap.h>
+#include <linux/regulator/consumer.h>
+
+#include "dw_mmc.h"
+#include "dw_mmc-pltfm.h"
+
+#define SDMMC_DDR_REG		0x10c
+#define SDMMC_DDR_HS400		BIT(31)
+#define SDMMC_ENABLE_SH		0x110
+#define SDMMC_ENABLE_SH_PHASE	BIT(0)
+
+#define SDMMC_UHS_DDR		BIT(16)
+#define ALL_INT_CLR		0x1efff
+
+struct hi3798cv200_priv {
+	struct clk *sample_clk;
+	struct clk *drive_clk;
+};
+
+static void dw_mci_hi3798cv200_set_ios(struct dw_mci *host, struct mmc_ios *ios)
+{
+	struct hi3798cv200_priv *priv = host->priv;
+	u32 val;
+
+	val = mci_readl(host, UHS_REG);
+	if (ios->timing == MMC_TIMING_MMC_DDR52 ||
+	    ios->timing == MMC_TIMING_UHS_DDR50)
+		val |= SDMMC_UHS_DDR;
+	else
+		val &= ~SDMMC_UHS_DDR;
+	mci_writel(host, UHS_REG, val);
+
+	val = mci_readl(host, ENABLE_SH);
+	if (ios->timing == MMC_TIMING_MMC_DDR52)
+		val |= SDMMC_ENABLE_SH_PHASE;
+	else
+		val &= ~SDMMC_ENABLE_SH_PHASE;
+	mci_writel(host, ENABLE_SH, val);
+
+	val = mci_readl(host, DDR_REG);
+	if (ios->timing == MMC_TIMING_MMC_HS400)
+		val |= SDMMC_DDR_HS400;
+	else
+		val &= ~SDMMC_DDR_HS400;
+	mci_writel(host, DDR_REG, val);
+
+	if (ios->timing == MMC_TIMING_MMC_HS ||
+	    ios->timing == MMC_TIMING_LEGACY)
+		clk_set_phase(priv->drive_clk, 180);
+	else if (ios->timing == MMC_TIMING_MMC_HS200)
+		clk_set_phase(priv->drive_clk, 135);
+}
+
+static int dw_mci_hi3798cv200_execute_tuning(struct dw_mci_slot *slot,
+					     u32 opcode)
+{
+	int degrees[] = { 0, 45, 90, 135, 180, 225, 270, 315 };
+	struct dw_mci *host = slot->host;
+	struct hi3798cv200_priv *priv = host->priv;
+	int raise_point = -1, fall_point = -1;
+	int err, prev_err = -1;
+	int found = 0;
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(degrees); i++) {
+		clk_set_phase(priv->sample_clk, degrees[i]);
+		mci_writel(host, RINTSTS, ALL_INT_CLR);
+
+		err = mmc_send_tuning(slot->mmc, opcode, NULL);
+		if (!err)
+			found = 1;
+
+		if (i > 0) {
+			if (err && !prev_err)
+				fall_point = i - 1;
+			if (!err && prev_err)
+				raise_point = i;
+		}
+
+		if (raise_point != -1 && fall_point != -1)
+			goto tuning_out;
+
+		prev_err = err;
+		err = 0;
+	}
+
+tuning_out:
+	if (found) {
+		if (raise_point == -1)
+			raise_point = 0;
+		if (fall_point == -1)
+			fall_point = ARRAY_SIZE(degrees) - 1;
+		if (fall_point < raise_point) {
+			if ((raise_point + fall_point) >
+			    (ARRAY_SIZE(degrees) - 1))
+				i = fall_point / 2;
+			else
+				i = (raise_point + ARRAY_SIZE(degrees) - 1) / 2;
+		} else {
+			i = (raise_point + fall_point) / 2;
+		}
+
+		clk_set_phase(priv->sample_clk, degrees[i]);
+		dev_dbg(host->dev, "Tuning clk_sample[%d, %d], set[%d]\n",
+			raise_point, fall_point, degrees[i]);
+	} else {
+		dev_err(host->dev, "No valid clk_sample shift! use default\n");
+		err = -EINVAL;
+	}
+
+	mci_writel(host, RINTSTS, ALL_INT_CLR);
+	return err;
+}
+
+static int dw_mci_hi3798cv200_init(struct dw_mci *host)
+{
+	struct hi3798cv200_priv *priv;
+	int ret;
+
+	priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);
+	if (!priv)
+		return -ENOMEM;
+
+	priv->sample_clk = devm_clk_get(host->dev, "ciu-sample");
+	if (IS_ERR(priv->sample_clk)) {
+		dev_err(host->dev, "failed to get ciu-sample clock\n");
+		return PTR_ERR(priv->sample_clk);
+	}
+
+	priv->drive_clk = devm_clk_get(host->dev, "ciu-drive");
+	if (IS_ERR(priv->drive_clk)) {
+		dev_err(host->dev, "failed to get ciu-drive clock\n");
+		return PTR_ERR(priv->drive_clk);
+	}
+
+	ret = clk_prepare_enable(priv->sample_clk);
+	if (ret) {
+		dev_err(host->dev, "failed to enable ciu-sample clock\n");
+		return ret;
+	}
+
+	ret = clk_prepare_enable(priv->drive_clk);
+	if (ret) {
+		dev_err(host->dev, "failed to enable ciu-drive clock\n");
+		goto disable_sample_clk;
+	}
+
+	host->priv = priv;
+	return 0;
+
+disable_sample_clk:
+	clk_disable_unprepare(priv->sample_clk);
+	return ret;
+}
+
+static const struct dw_mci_drv_data hi3798cv200_data = {
+	.init = dw_mci_hi3798cv200_init,
+	.set_ios = dw_mci_hi3798cv200_set_ios,
+	.execute_tuning = dw_mci_hi3798cv200_execute_tuning,
+};
+
+static int dw_mci_hi3798cv200_probe(struct platform_device *pdev)
+{
+	return dw_mci_pltfm_register(pdev, &hi3798cv200_data);
+}
+
+static const struct of_device_id dw_mci_hi3798cv200_match[] = {
+	{ .compatible = "hisilicon,hi3798cv200-dw-mshc", },
+	{},
+};
+
+MODULE_DEVICE_TABLE(of, dw_mci_hi3798cv200_match);
+static struct platform_driver dw_mci_hi3798cv200_driver = {
+	.probe = dw_mci_hi3798cv200_probe,
+	.remove = dw_mci_pltfm_remove,
+	.driver = {
+		.name = "dwmmc_hi3798cv200",
+		.of_match_table = dw_mci_hi3798cv200_match,
+	},
+};
+module_platform_driver(dw_mci_hi3798cv200_driver);
+
+MODULE_DESCRIPTION("HiSilicon Hi3798CV200 Specific DW-MSHC Driver Extension");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:dwmmc_hi3798cv200");
-- 
1.9.1

Re: [PATCH v2 2/2] mmc: dw_mmc: add support for hi3798cv200 specific extensions of dw-mshc

[Shawn Lin]

On 2018/3/6 14:58, Shawn Guo wrote:
> From: tianshuliang <tianshuliang@hisilicon.com>
> 
> Hi3798CV200 SoC extends the dw-mshc controller for additional clock
> and bus control. Add support for these extensions.

Overall it looks good except for some minor comment below.

> 
> Signed-off-by: tianshuliang <tianshuliang@hisilicon.com>
> Signed-off-by: Jiancheng Xue <xuejiancheng@hisilicon.com>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
>   drivers/mmc/host/Kconfig              |   9 ++
>   drivers/mmc/host/Makefile             |   1 +
>   drivers/mmc/host/dw_mmc-hi3798cv200.c | 197 ++++++++++++++++++++++++++++++++++
>   3 files changed, 207 insertions(+)
>   create mode 100644 drivers/mmc/host/dw_mmc-hi3798cv200.c
> 
> diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
> index 620c2d90a646..de36fffe8225 100644
> --- a/drivers/mmc/host/Kconfig
> +++ b/drivers/mmc/host/Kconfig
> @@ -718,6 +718,15 @@ config MMC_DW_EXYNOS
>   	  Synopsys DesignWare Memory Card Interface driver. Select this option
>   	  for platforms based on Exynos4 and Exynos5 SoC's.
>   
> +config MMC_DW_HI3798CV200
> +	tristate "Hi3798CV200 specific extensions for Synopsys DW Memory Card Interface"
> +	depends on MMC_DW
> +	select MMC_DW_PLTFM
> +	help
> +	  This selects support for HiSilicon Hi3798CV200 SoC specific extensions to the
> +	  Synopsys DesignWare Memory Card Interface driver. Select this option
> +	  for platforms based on HiSilicon Hi3798CV200 SoC.
> +
>   config MMC_DW_K3
>   	tristate "K3 specific extensions for Synopsys DW Memory Card Interface"
>   	depends on MMC_DW
> diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
> index 84cd1388abc3..00ec9a2f59be 100644
> --- a/drivers/mmc/host/Makefile
> +++ b/drivers/mmc/host/Makefile
> @@ -51,6 +51,7 @@ obj-$(CONFIG_MMC_CAVIUM_THUNDERX) += thunderx-mmc.o
>   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_HI3798CV200) += dw_mmc-hi3798cv200.o
>   obj-$(CONFIG_MMC_DW_K3)		+= dw_mmc-k3.o
>   obj-$(CONFIG_MMC_DW_PCI)	+= dw_mmc-pci.o
>   obj-$(CONFIG_MMC_DW_ROCKCHIP)	+= dw_mmc-rockchip.o
> diff --git a/drivers/mmc/host/dw_mmc-hi3798cv200.c b/drivers/mmc/host/dw_mmc-hi3798cv200.c
> new file mode 100644
> index 000000000000..364ad3dd7116
> --- /dev/null
> +++ b/drivers/mmc/host/dw_mmc-hi3798cv200.c
> @@ -0,0 +1,197 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (c) 2017 HiSilicon Technologies Co., Ltd.

2018?

> + */
> +
> +#include <linux/clk.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/mmc/host.h>
> +#include <linux/module.h>
> +#include <linux/of_address.h>
> +#include <linux/platform_device.h>
> +#include <linux/pm_runtime.h>
> +#include <linux/regmap.h>
> +#include <linux/regulator/consumer.h>
> +
> +#include "dw_mmc.h"
> +#include "dw_mmc-pltfm.h"
> +
> +#define SDMMC_DDR_REG		0x10c
> +#define SDMMC_DDR_HS400		BIT(31)
> +#define SDMMC_ENABLE_SH		0x110
> +#define SDMMC_ENABLE_SH_PHASE	BIT(0)
> +
> +#define SDMMC_UHS_DDR		BIT(16)

All these definition match the dwmmc datasbook, so I
sugguest to move it to dw_mmc.h.

> +#define ALL_INT_CLR		0x1efff

Why you leave out HLE?

> +
> +struct hi3798cv200_priv {
> +	struct clk *sample_clk;
> +	struct clk *drive_clk;
> +};
> +
> +static void dw_mci_hi3798cv200_set_ios(struct dw_mci *host, struct mmc_ios *ios)
> +{
> +	struct hi3798cv200_priv *priv = host->priv;
> +	u32 val;
> +
> +	val = mci_readl(host, UHS_REG);
> +	if (ios->timing == MMC_TIMING_MMC_DDR52 ||
> +	    ios->timing == MMC_TIMING_UHS_DDR50)
> +		val |= SDMMC_UHS_DDR;
> +	else
> +		val &= ~SDMMC_UHS_DDR;
> +	mci_writel(host, UHS_REG, val);
> +
> +	val = mci_readl(host, ENABLE_SH);
> +	if (ios->timing == MMC_TIMING_MMC_DDR52)
> +		val |= SDMMC_ENABLE_SH_PHASE;
> +	else
> +		val &= ~SDMMC_ENABLE_SH_PHASE;
> +	mci_writel(host, ENABLE_SH, val);
> +
> +	val = mci_readl(host, DDR_REG);
> +	if (ios->timing == MMC_TIMING_MMC_HS400)
> +		val |= SDMMC_DDR_HS400;
> +	else
> +		val &= ~SDMMC_DDR_HS400;
> +	mci_writel(host, DDR_REG, val);
> +
> +	if (ios->timing == MMC_TIMING_MMC_HS ||
> +	    ios->timing == MMC_TIMING_LEGACY)
> +		clk_set_phase(priv->drive_clk, 180);
> +	else if (ios->timing == MMC_TIMING_MMC_HS200)
> +		clk_set_phase(priv->drive_clk, 135);
> +}
> +
> +static int dw_mci_hi3798cv200_execute_tuning(struct dw_mci_slot *slot,
> +					     u32 opcode)
> +{
> +	int degrees[] = { 0, 45, 90, 135, 180, 225, 270, 315 };
> +	struct dw_mci *host = slot->host;
> +	struct hi3798cv200_priv *priv = host->priv;
> +	int raise_point = -1, fall_point = -1;
> +	int err, prev_err = -1;
> +	int found = 0;
> +	int i;
> +
> +	for (i = 0; i < ARRAY_SIZE(degrees); i++) {
> +		clk_set_phase(priv->sample_clk, degrees[i]);
> +		mci_writel(host, RINTSTS, ALL_INT_CLR);
> +
> +		err = mmc_send_tuning(slot->mmc, opcode, NULL);
> +		if (!err)
> +			found = 1;
> +
> +		if (i > 0) {
> +			if (err && !prev_err)
> +				fall_point = i - 1;
> +			if (!err && prev_err)
> +				raise_point = i;
> +		}
> +
> +		if (raise_point != -1 && fall_point != -1)
> +			goto tuning_out;
> +
> +		prev_err = err;
> +		err = 0;
> +	}
> +
> +tuning_out:
> +	if (found) {
> +		if (raise_point == -1)
> +			raise_point = 0;
> +		if (fall_point == -1)
> +			fall_point = ARRAY_SIZE(degrees) - 1;
> +		if (fall_point < raise_point) {
> +			if ((raise_point + fall_point) >
> +			    (ARRAY_SIZE(degrees) - 1))
> +				i = fall_point / 2;
> +			else
> +				i = (raise_point + ARRAY_SIZE(degrees) - 1) / 2;
> +		} else {
> +			i = (raise_point + fall_point) / 2;
> +		}
> +
> +		clk_set_phase(priv->sample_clk, degrees[i]);
> +		dev_dbg(host->dev, "Tuning clk_sample[%d, %d], set[%d]\n",
> +			raise_point, fall_point, degrees[i]);
> +	} else {
> +		dev_err(host->dev, "No valid clk_sample shift! use default\n");
> +		err = -EINVAL;
> +	}
> +
> +	mci_writel(host, RINTSTS, ALL_INT_CLR);
> +	return err;
> +}
> +
> +static int dw_mci_hi3798cv200_init(struct dw_mci *host)
> +{
> +	struct hi3798cv200_priv *priv;
> +	int ret;
> +
> +	priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);
> +	if (!priv)
> +		return -ENOMEM;
> +
> +	priv->sample_clk = devm_clk_get(host->dev, "ciu-sample");
> +	if (IS_ERR(priv->sample_clk)) {
> +		dev_err(host->dev, "failed to get ciu-sample clock\n");
> +		return PTR_ERR(priv->sample_clk);
> +	}
> +
> +	priv->drive_clk = devm_clk_get(host->dev, "ciu-drive");
> +	if (IS_ERR(priv->drive_clk)) {
> +		dev_err(host->dev, "failed to get ciu-drive clock\n");
> +		return PTR_ERR(priv->drive_clk);
> +	}
> +
> +	ret = clk_prepare_enable(priv->sample_clk);
> +	if (ret) {
> +		dev_err(host->dev, "failed to enable ciu-sample clock\n");
> +		return ret;
> +	}
> +
> +	ret = clk_prepare_enable(priv->drive_clk);
> +	if (ret) {
> +		dev_err(host->dev, "failed to enable ciu-drive clock\n");
> +		goto disable_sample_clk;
> +	}
> +
> +	host->priv = priv;
> +	return 0;
> +
> +disable_sample_clk:
> +	clk_disable_unprepare(priv->sample_clk);
> +	return ret;
> +}
> +
> +static const struct dw_mci_drv_data hi3798cv200_data = {
> +	.init = dw_mci_hi3798cv200_init,
> +	.set_ios = dw_mci_hi3798cv200_set_ios,
> +	.execute_tuning = dw_mci_hi3798cv200_execute_tuning,
> +};
> +
> +static int dw_mci_hi3798cv200_probe(struct platform_device *pdev)
> +{
> +	return dw_mci_pltfm_register(pdev, &hi3798cv200_data);
> +}
> +
> +static const struct of_device_id dw_mci_hi3798cv200_match[] = {
> +	{ .compatible = "hisilicon,hi3798cv200-dw-mshc", },
> +	{},
> +};
> +
> +MODULE_DEVICE_TABLE(of, dw_mci_hi3798cv200_match);
> +static struct platform_driver dw_mci_hi3798cv200_driver = {
> +	.probe = dw_mci_hi3798cv200_probe,
> +	.remove = dw_mci_pltfm_remove,

Do you need specific remove hook? As I notice you sample_clk
and drive_clk when probing. Same question if you gonna support
PM for this driver.

> +	.driver = {
> +		.name = "dwmmc_hi3798cv200",
> +		.of_match_table = dw_mci_hi3798cv200_match,
> +	},
> +};
> +module_platform_driver(dw_mci_hi3798cv200_driver);
> +
> +MODULE_DESCRIPTION("HiSilicon Hi3798CV200 Specific DW-MSHC Driver Extension");
> +MODULE_LICENSE("GPL v2");
> +MODULE_ALIAS("platform:dwmmc_hi3798cv200");
> 

Re: [PATCH v2 2/2] mmc: dw_mmc: add support for hi3798cv200 specific extensions of dw-mshc

[Shawn Guo]

On Tue, Mar 06, 2018 at 03:42:05PM +0800, Shawn Lin wrote:
> >diff --git a/drivers/mmc/host/dw_mmc-hi3798cv200.c b/drivers/mmc/host/dw_mmc-hi3798cv200.c
> >new file mode 100644
> >index 000000000000..364ad3dd7116
> >--- /dev/null
> >+++ b/drivers/mmc/host/dw_mmc-hi3798cv200.c
> >@@ -0,0 +1,197 @@
> >+// SPDX-License-Identifier: GPL-2.0
> >+/*
> >+ * Copyright (c) 2017 HiSilicon Technologies Co., Ltd.
> 
> 2018?

Okay.  I will update it to year 2018.

> 
> >+ */
> >+
> >+#include <linux/clk.h>
> >+#include <linux/mfd/syscon.h>
> >+#include <linux/mmc/host.h>
> >+#include <linux/module.h>
> >+#include <linux/of_address.h>
> >+#include <linux/platform_device.h>
> >+#include <linux/pm_runtime.h>
> >+#include <linux/regmap.h>
> >+#include <linux/regulator/consumer.h>
> >+
> >+#include "dw_mmc.h"
> >+#include "dw_mmc-pltfm.h"
> >+
> >+#define SDMMC_DDR_REG		0x10c
> >+#define SDMMC_DDR_HS400		BIT(31)
> >+#define SDMMC_ENABLE_SH		0x110
> >+#define SDMMC_ENABLE_SH_PHASE	BIT(0)
> >+
> >+#define SDMMC_UHS_DDR		BIT(16)
> 
> All these definition match the dwmmc datasbook, so I
> sugguest to move it to dw_mmc.h.

I do not have the access to dwmmc datasbook, so will rely on your
knowledge on this.  I will add a separate patch before this one to move
these defines into dw_mmc.h.

> 
> >+#define ALL_INT_CLR		0x1efff
> 
> Why you leave out HLE?

I do not know any particular reason for that, and I just verified that
it works with HLE included in there.

@Jiancheng, Shuliang, if you guys know any reason for that, please help
comment.  Otherwise, I will just include the bit HLE in ALL_INT_CLR.

> 
> >+
> >+struct hi3798cv200_priv {
> >+	struct clk *sample_clk;
> >+	struct clk *drive_clk;
> >+};
> >+

<snip>

> >+static int dw_mci_hi3798cv200_init(struct dw_mci *host)
> >+{
> >+	struct hi3798cv200_priv *priv;
> >+	int ret;
> >+
> >+	priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL);
> >+	if (!priv)
> >+		return -ENOMEM;
> >+
> >+	priv->sample_clk = devm_clk_get(host->dev, "ciu-sample");
> >+	if (IS_ERR(priv->sample_clk)) {
> >+		dev_err(host->dev, "failed to get ciu-sample clock\n");
> >+		return PTR_ERR(priv->sample_clk);
> >+	}
> >+
> >+	priv->drive_clk = devm_clk_get(host->dev, "ciu-drive");
> >+	if (IS_ERR(priv->drive_clk)) {
> >+		dev_err(host->dev, "failed to get ciu-drive clock\n");
> >+		return PTR_ERR(priv->drive_clk);
> >+	}
> >+
> >+	ret = clk_prepare_enable(priv->sample_clk);
> >+	if (ret) {
> >+		dev_err(host->dev, "failed to enable ciu-sample clock\n");
> >+		return ret;
> >+	}
> >+
> >+	ret = clk_prepare_enable(priv->drive_clk);
> >+	if (ret) {
> >+		dev_err(host->dev, "failed to enable ciu-drive clock\n");
> >+		goto disable_sample_clk;
> >+	}
> >+
> >+	host->priv = priv;
> >+	return 0;
> >+
> >+disable_sample_clk:
> >+	clk_disable_unprepare(priv->sample_clk);
> >+	return ret;
> >+}
> >+
> >+static const struct dw_mci_drv_data hi3798cv200_data = {
> >+	.init = dw_mci_hi3798cv200_init,
> >+	.set_ios = dw_mci_hi3798cv200_set_ios,
> >+	.execute_tuning = dw_mci_hi3798cv200_execute_tuning,
> >+};
> >+
> >+static int dw_mci_hi3798cv200_probe(struct platform_device *pdev)
> >+{
> >+	return dw_mci_pltfm_register(pdev, &hi3798cv200_data);
> >+}
> >+
> >+static const struct of_device_id dw_mci_hi3798cv200_match[] = {
> >+	{ .compatible = "hisilicon,hi3798cv200-dw-mshc", },
> >+	{},
> >+};
> >+
> >+MODULE_DEVICE_TABLE(of, dw_mci_hi3798cv200_match);
> >+static struct platform_driver dw_mci_hi3798cv200_driver = {
> >+	.probe = dw_mci_hi3798cv200_probe,
> >+	.remove = dw_mci_pltfm_remove,
> 
> Do you need specific remove hook? As I notice you sample_clk
> and drive_clk when probing. Same question if you gonna support
> PM for this driver.

Good point.  I will add a custom .remove hook to disable the clocks.

Thanks for the comments.

Shawn

Re: [PATCH v2 1/2] dt-bindings: mmc: add bindings for hi3798cv200-dw-mshc

[Rob Herring]

On Tue, Mar 06, 2018 at 02:58:50PM +0800, Shawn Guo wrote:
> From: tianshuliang <tianshuliang@hisilicon.com>
> 
> Hisilicon hi3798cv200 SoC extends the dw-mshc controller
> for additional clock control. Add device tree bindings for
> hi3798cv200-dw-mshc.
> 
> Signed-off-by: tianshuliang <tianshuliang@hisilicon.com>
> Signed-off-by: Jiancheng Xue <xuejiancheng@hisilicon.com>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> ---
>  .../bindings/mmc/hi3798cv200-dw-mshc.txt           | 40 ++++++++++++++++++++++
>  1 file changed, 40 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/mmc/hi3798cv200-dw-mshc.txt

Reviewed-by: Rob Herring <robh@kernel.org>