From patchwork Fri Feb 16 21:02:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 774020 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16C7B28E2B; Fri, 16 Feb 2024 21:02:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708117351; cv=none; b=f0X90drFMuAgfIOkEk4lFIJzMYnwBhJ6/TVCljKAXmcxQqXGQ1HwTX4GPe9k6yePry4wlf5D2AbieBCU8XVzHf7Dg82AsBofqopawZh2KRlW7iscQECORShllfj6bPrGUgt6F67PJP/LQ490CDJMKOcSY7xUINeiVTEVbAGu6iY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708117351; c=relaxed/simple; bh=251ik0E4UMYsyQZjqLcLSBwBl/7/YEYssrk8/HM+5OQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fi75Y3ZpIJh79m35PlJd+C/YmdOnuDkZX1Rsc0CK5pZ0d08fJTTIP1YDyrY41z1x1imeVjsCZeT0NVRQ4OND/NbBae9FZpDFu3wswdCjTlA0KVP8m7OFq066RLytW4qwe//TAnhSqgDoZAAxoem6sTeLMOm813mETauko4VsyeM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C7wSmqHn; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="C7wSmqHn" Received: by smtp.kernel.org (Postfix) with ESMTPS id 9D439C433F1; Fri, 16 Feb 2024 21:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708117350; bh=251ik0E4UMYsyQZjqLcLSBwBl/7/YEYssrk8/HM+5OQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=C7wSmqHnsv5IiDjdq+TE8zlsl0DMgdYVyhwAdVbzEiXEhm7E3Gbuo3OADK+dFsgW1 hGCX5+ATbdiOggs6U3t42N8BhrfnoL4i9yfMnr1yjNlPdV0rHPY5vFA0etJu9SKzyo BOLQbNRDuARVJXwNXA2PBGL55wIUmK7VzRkx/4co6mR4cRD/L52FvN4K1xdbz41VEY IGzQtiJgBSrbfHmGMlO1sYdPlVIkawvWWON2HrE4wwKJVN7AdCgAF0ZspWgi0HQAWZ dvabrZFXuqPUaGkaq9H77aEQP6LilHG44M+UDrVHm3r23SDngS+h/JuUfDY7QISTr3 D9ubQWOMHsZsA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 817EDC48BF5; Fri, 16 Feb 2024 21:02:30 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 17 Feb 2024 05:02:29 +0800 Subject: [PATCH v3 1/4] mmc: dw_mmc-hi3798cv200: remove MODULE_ALIAS() Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240217-b4-mmc-hi3798mv200-v3-1-f15464176947@outlook.com> References: <20240217-b4-mmc-hi3798mv200-v3-0-f15464176947@outlook.com> In-Reply-To: <20240217-b4-mmc-hi3798mv200-v3-0-f15464176947@outlook.com> To: Ulf Hansson , Jaehoon Chung , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Igor Opaniuk , tianshuliang , David Yang , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708117349; l=655; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=0u4f62e9siRMTmdM+MOND3wWH1hfTQP0NQvb4G8fUgo=; b=3xlUuW1Y11g1UK4Yaj2znDnXt85TDhRWfDC2//ie6OgQBYKxmsIOKHyffOlhpwNaX6L9k8ysz 8XNqrnxU/X0Ct8z0LvQOoKf3p5/uEj3DT7dR5ynMjrmxOhDqDtEmjYo X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: From: Yang Xiwen The alias is not used and should be removed. Signed-off-by: Yang Xiwen --- drivers/mmc/host/dw_mmc-hi3798cv200.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/mmc/host/dw_mmc-hi3798cv200.c b/drivers/mmc/host/dw_mmc-hi3798cv200.c index e9470c50a348..61923a518369 100644 --- a/drivers/mmc/host/dw_mmc-hi3798cv200.c +++ b/drivers/mmc/host/dw_mmc-hi3798cv200.c @@ -201,4 +201,3 @@ 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"); From patchwork Fri Feb 16 21:02:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 774019 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D0DD135A74; Fri, 16 Feb 2024 21:02:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708117351; cv=none; b=MNI0R2+Wnj9uAEgOm8UD+C46NcX9tyzy2Dh2ikRNwLppqpfjPMeIZH1HrP37JOtG7rx0VUMS/JKGHUHw2/wRaZKJw//jOf06YP2+lnXGY1iFwjeX7KV4c91a+Hk3lSLVR1hzfPKw331/iFphbS2gpfD8AySMKRoRypIWbyzHvHk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708117351; c=relaxed/simple; bh=tv2Xuz6CpMKcrJjZYSehkqKc6XHdPD8PJ9seVNpS/PM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ffTRSd7pLe21VLKjQ0lGC92fK8q7iiIbkhRWzXiQh8/5spVFL7aqZqRcAU7tO2fss7wgvdDoo+2oat3jmh36G+32u7PZsOn+qryozKrV2EqN87z4UY9N9nltptQGFdDKFaxrsS13Wcb+8jWuIfWAQzD39q68GxsOkYn+QFPnCKU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=q/0HB01+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="q/0HB01+" Received: by smtp.kernel.org (Postfix) with ESMTPS id A48F9C43394; Fri, 16 Feb 2024 21:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708117350; bh=tv2Xuz6CpMKcrJjZYSehkqKc6XHdPD8PJ9seVNpS/PM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=q/0HB01+As7lyU3BmbzetSKQsLo1/3c3UmBie8fMjy2is1afugW1dFWzXSEMgHb6l ykVeev7bDmTsKYLIZCOK6CjbsVxPE3p9/FLlTIQ2zZhdvDh3HBie5ph2b+s9SF4WER UHWaS1EmC0rekN49RrapdEhbtOCTcV9dFcK9d83kk8PVSHfiPoaEkKzVdTvzQWjcW6 Sj3NgsoNwkXTnUfNSQ2tiH2ys7w9UMDp4rbWMCYCtXtLP8fBpcxd/V+ysRWIItXjWJ lD2QJboCYDzrVe/x7p0hGA1KYdyn/nrJuj/N5XsCCZn+GPK48oLT9ZKWv/JBK7Fajj 5L5wzkMdughUA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A72DC48260; Fri, 16 Feb 2024 21:02:30 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 17 Feb 2024 05:02:30 +0800 Subject: [PATCH v3 2/4] mmc: dw_mmc: add support for hi3798mv200 Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240217-b4-mmc-hi3798mv200-v3-2-f15464176947@outlook.com> References: <20240217-b4-mmc-hi3798mv200-v3-0-f15464176947@outlook.com> In-Reply-To: <20240217-b4-mmc-hi3798mv200-v3-0-f15464176947@outlook.com> To: Ulf Hansson , Jaehoon Chung , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Igor Opaniuk , tianshuliang , David Yang , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708117349; l=8914; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=ZXUq4LugZ7YohpARkO8qzS8uuAtt58OsC2QWLmIjkWE=; b=AsQ6aCGfbnWFrgCrrTnCIuQdpgGtUjyHcVAWyPauvuEIj3ewsPkejkQcXFYFrtQNPBqgK/ORy 2lpctIv00JJBMlQBsrOi4jCskOcssThc3sUZVVfQ3v8prPgTTKL2uWh X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: From: Yang Xiwen Add support for Hi3798MV200 specific extension. Signed-off-by: Yang Xiwen --- drivers/mmc/host/Kconfig | 9 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/dw_mmc-hi3798mv200.c | 235 ++++++++++++++++++++++++++++++++++ 3 files changed, 245 insertions(+) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 81f2c4e05287..aebc587f77a7 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -798,6 +798,15 @@ config MMC_DW_HI3798CV200 Synopsys DesignWare Memory Card Interface driver. Select this option for platforms based on HiSilicon Hi3798CV200 SoC. +config MMC_DW_HI3798MV200 + tristate "Hi3798MV200 specific extensions for Synopsys DW Memory Card Interface" + depends on MMC_DW + select MMC_DW_PLTFM + help + This selects support for HiSilicon Hi3798MV200 SoC specific extensions to the + Synopsys DesignWare Memory Card Interface driver. Select this option + for platforms based on HiSilicon Hi3798MV200 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 d0be4465f3ec..f53f86d200ac 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -51,6 +51,7 @@ obj-$(CONFIG_MMC_DW_PLTFM) += dw_mmc-pltfm.o obj-$(CONFIG_MMC_DW_BLUEFIELD) += dw_mmc-bluefield.o obj-$(CONFIG_MMC_DW_EXYNOS) += dw_mmc-exynos.o obj-$(CONFIG_MMC_DW_HI3798CV200) += dw_mmc-hi3798cv200.o +obj-$(CONFIG_MMC_DW_HI3798MV200) += dw_mmc-hi3798mv200.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-hi3798mv200.c b/drivers/mmc/host/dw_mmc-hi3798mv200.c new file mode 100644 index 000000000000..b7d1d1a31a3f --- /dev/null +++ b/drivers/mmc/host/dw_mmc-hi3798mv200.c @@ -0,0 +1,235 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Modified from dw_mmc-hi3798cv200.c + * + * Copyright (c) 2024 Yang Xiwen + * Copyright (c) 2018 HiSilicon Technologies Co., Ltd. + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "dw_mmc.h" +#include "dw_mmc-pltfm.h" + +#define SDMMC_TUNING_CTRL 0x118 +#define SDMMC_TUNING_FIND_EDGE BIT(5) + +#define ALL_INT_CLR 0x1ffff + +/* DLL ctrl reg */ +#define SAP_DLL_CTRL_DLLMODE BIT(16) + +struct dw_mci_hi3798mv200_priv { + struct clk *sample_clk; + struct clk *drive_clk; + struct regmap *sap_dll_reg; + struct mmc_clk_phase_map phase_map; +}; + +static void dw_mci_hi3798mv200_set_ios(struct dw_mci *host, struct mmc_ios *ios) +{ + struct dw_mci_hi3798mv200_priv *priv = host->priv; + struct mmc_clk_phase phase = priv->phase_map.phase[ios->timing]; + u32 val; + + val = mci_readl(host, ENABLE_SHIFT); + if (ios->timing == MMC_TIMING_MMC_DDR52 + || ios->timing == MMC_TIMING_UHS_DDR50) + val |= SDMMC_ENABLE_PHASE; + else + val &= ~SDMMC_ENABLE_PHASE; + mci_writel(host, ENABLE_SHIFT, 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 (clk_set_rate(host->ciu_clk, ios->clock)) + dev_warn(host->dev, "Failed to set rate to %u\n", ios->clock); + else + // CLK_MUX_ROUND_NEAREST is enabled for this clock + // The actual clock rate is not what we setted, but a rounded value + // so we should get the rate once again + host->bus_hz = clk_get_rate(host->ciu_clk); + + if (phase.valid) { + clk_set_phase(priv->drive_clk, phase.out_deg); + clk_set_phase(priv->sample_clk, phase.in_deg); + } else { + dev_warn(host->dev, + "The phase entry for timing mode %d is missing in device tree.\n", + ios->timing); + } +} + +static inline int dw_mci_hi3798mv200_enable_tuning(struct dw_mci_slot *slot) +{ + struct dw_mci_hi3798mv200_priv *priv = slot->host->priv; + struct regmap *dll_reg = priv->sap_dll_reg; + + return regmap_clear_bits(dll_reg, 0, SAP_DLL_CTRL_DLLMODE); +} + +static inline int dw_mci_hi3798mv200_disable_tuning(struct dw_mci_slot *slot) +{ + struct dw_mci_hi3798mv200_priv *priv = slot->host->priv; + struct regmap *dll_reg = priv->sap_dll_reg; + + return regmap_set_bits(dll_reg, 0, SAP_DLL_CTRL_DLLMODE); +} + +static int dw_mci_hi3798mv200_execute_tuning_mix_mode(struct dw_mci_slot *slot, + u32 opcode) +{ + static const int degrees[] = { 0, 45, 90, 135, 180, 225, 270, 315 }; + struct dw_mci *host = slot->host; + struct dw_mci_hi3798mv200_priv *priv = host->priv; + int raise_point = -1, fall_point = -1; + int err, prev_err = -1; + int found = 0; + int regval; + int i; + int ret; + + // enable tuning + ret = dw_mci_hi3798mv200_enable_tuning(slot); + if (ret < 0) + return ret; + 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) { + regval = mci_readl(host, TUNING_CTRL); + if (regval & SDMMC_TUNING_FIND_EDGE) + err = 1; + else + 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: + ret = dw_mci_hi3798mv200_disable_tuning(slot); + if (ret < 0) + return ret; + 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; + } + + // use the same phase table for both HS200 and HS400 + priv->phase_map.phase[MMC_TIMING_MMC_HS200].in_deg = degrees[i]; + priv->phase_map.phase[MMC_TIMING_MMC_HS400].in_deg = degrees[i]; + + 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]); + err = 0; + } 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_hi3798mv200_init(struct dw_mci *host) +{ + struct dw_mci_hi3798mv200_priv *priv; + struct device_node *np = host->dev->of_node; + + priv = devm_kzalloc(host->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + mmc_of_parse_clk_phase(host->dev, &priv->phase_map); + + priv->sample_clk = devm_clk_get_enabled(host->dev, "ciu-sample"); + if (IS_ERR(priv->sample_clk)) + return dev_err_probe(host->dev, PTR_ERR(priv->sample_clk), + "failed to get enabled ciu-sample clock\n"); + + priv->drive_clk = devm_clk_get_enabled(host->dev, "ciu-drive"); + if (IS_ERR(priv->drive_clk)) + return dev_err_probe(host->dev, PTR_ERR(priv->drive_clk), + "failed to get enabled ciu-drive clock\n"); + + priv->sap_dll_reg = syscon_regmap_lookup_by_phandle(np, "hisilicon,sap-dll-reg"); + if (IS_ERR(priv->sap_dll_reg)) + return dev_err_probe(host->dev, PTR_ERR(priv->sap_dll_reg), + "failed to get sap-dll-reg\n"); + + host->priv = priv; + return 0; +} + +static const struct dw_mci_drv_data hi3798mv200_data = { + .common_caps = MMC_CAP_CMD23, + .init = dw_mci_hi3798mv200_init, + .set_ios = dw_mci_hi3798mv200_set_ios, + .execute_tuning = dw_mci_hi3798mv200_execute_tuning_mix_mode, +}; + +static const struct of_device_id dw_mci_hi3798mv200_match[] = { + { .compatible = "hisilicon,hi3798mv200-dw-mshc" }, + {}, +}; + +static int dw_mci_hi3798mv200_probe(struct platform_device *pdev) +{ + return dw_mci_pltfm_register(pdev, &hi3798mv200_data); +} + +static void dw_mci_hi3798mv200_remove(struct platform_device *pdev) +{ + dw_mci_pltfm_remove(pdev); +} + +MODULE_DEVICE_TABLE(of, dw_mci_hi3798mv200_match); +static struct platform_driver dw_mci_hi3798mv200_driver = { + .probe = dw_mci_hi3798mv200_probe, + .remove_new = dw_mci_hi3798mv200_remove, + .driver = { + .name = "dwmmc_hi3798mv200", + .probe_type = PROBE_PREFER_ASYNCHRONOUS, + .of_match_table = dw_mci_hi3798mv200_match, + }, +}; +module_platform_driver(dw_mci_hi3798mv200_driver); + +MODULE_DESCRIPTION("HiSilicon Hi3798MV200 Specific DW-MSHC Driver Extension"); +MODULE_LICENSE("GPL"); From patchwork Fri Feb 16 21:02:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 773557 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D15913A253; Fri, 16 Feb 2024 21:02:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708117351; cv=none; b=uv4NrML19DiYgjzx8pAFLtpP80V/UfCcUGZw93PS9wkglDiaU87MLz56dnwt+lHYy3JhgwiTQhIsK5CjKQXqduEGSQh1Jk8Ro7xfy6d8jdvEu5BEQfKFHNFGHTqXq/UL5RN0Ps4CxT1iVZSRdDyr6BySnsGHJzedFlRZt/OqDq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708117351; c=relaxed/simple; bh=kE1iyc4ikKEePbnss5tHCv37+9gy1c6VUZo9PtTp2VA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Sft8clUTRvFd0OIwR7wwzKYb3cfY3hNYwTvjWYRzU/SOnLfY3s0Qm1jIApzx0OnZiHM40j0FupzY/7SdFJ8NRiQwvzWmX6LGU3+elXNO3Lq6jrXG0fOsCYKkZc+JjAsGwwImk7WtQkV8d+Hvu3Airk1N6UOr+gZ3DiLXGk5ESUc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C07eQKQu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="C07eQKQu" Received: by smtp.kernel.org (Postfix) with ESMTPS id AECC5C43390; Fri, 16 Feb 2024 21:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708117350; bh=kE1iyc4ikKEePbnss5tHCv37+9gy1c6VUZo9PtTp2VA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=C07eQKQuKatfj2Ac8JpK08JodsOWphQ4g5sN/WEGrnqZdH2QsknZASQZf7c2Huajg lhsjswgwz8TIF9siW9rQmz5/ZhnZgqhReVScmKvDJ9ZJsyBFRW5VD3IvyBdZTlkXhA DwaW8Xxrk9mUvqgfiNk7AVcICubKuQe2j6vcptlWCWDgs68sVNyzwXjHGTO1hatPkK +4AVJYz84KuhOvSUDb9qPXzpZEFFePoa/LtINMOgUvtR3zZ+P5iuZUnuhEwO2bQ6Cs BjJAlZY42117iy6FVZVmX4Oh2i/lGG1EWxu8mL+p2vafApPprjUt8QnCUIa8Z8WRan 24/TMCBiulcfQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9453BC48BF7; Fri, 16 Feb 2024 21:02:30 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 17 Feb 2024 05:02:31 +0800 Subject: [PATCH v3 3/4] dt-bindings: mmc: dw-mshc-hi3798cv200: convert to YAML Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240217-b4-mmc-hi3798mv200-v3-3-f15464176947@outlook.com> References: <20240217-b4-mmc-hi3798mv200-v3-0-f15464176947@outlook.com> In-Reply-To: <20240217-b4-mmc-hi3798mv200-v3-0-f15464176947@outlook.com> To: Ulf Hansson , Jaehoon Chung , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Igor Opaniuk , tianshuliang , David Yang , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708117349; l=4642; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=2gvcPOcC0W9JjDo7uuJyb8+Jf0I4Z6n3x2BDfI4hOUA=; b=XQLOvaUzbqwudm3uFoDFpaPXJ74fVzy8FO5758AmTMQ5ydj2UwcnG5gkaFV8xtWgmuQ8n6bdB 7IXYLHTxOSvAYTbQeGJbgmbRh5aI1LtH8q/KibB5viAWCr9MLt+UmZz X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: From: Yang Xiwen convert the legacy txt binding to modern YAML and rename to hisilicon,hi3798cv200-dw-mshc.yaml. No semantic change. Signed-off-by: Yang Xiwen Reviewed-by: Krzysztof Kozlowski --- .../bindings/mmc/hi3798cv200-dw-mshc.txt | 40 ------------ .../mmc/hisilicon,hi3798cv200-dw-mshc.yaml | 75 ++++++++++++++++++++++ 2 files changed, 75 insertions(+), 40 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/hi3798cv200-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/hi3798cv200-dw-mshc.txt deleted file mode 100644 index a0693b7145f2..000000000000 --- a/Documentation/devicetree/bindings/mmc/hi3798cv200-dw-mshc.txt +++ /dev/null @@ -1,40 +0,0 @@ -* 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 = ; - 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>; - }; diff --git a/Documentation/devicetree/bindings/mmc/hisilicon,hi3798cv200-dw-mshc.yaml b/Documentation/devicetree/bindings/mmc/hisilicon,hi3798cv200-dw-mshc.yaml new file mode 100644 index 000000000000..f3dc973cb490 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/hisilicon,hi3798cv200-dw-mshc.yaml @@ -0,0 +1,75 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mmc/hisilicon,hi3798cv200-dw-mshc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Hisilicon Hi3798CV200 SoC specific extensions to the Synopsys DWMMC controller + +maintainers: + - Yang Xiwen + +properties: + compatible: + enum: + - hisilicon,hi3798cv200-dw-mshc + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + items: + - description: bus interface unit clock + - description: card interface unit clock + - description: card input sample phase clock + - description: controller output drive phase clock + + clock-names: + items: + - const: ciu + - const: biu + - const: ciu-sample + - const: ciu-drive + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + +allOf: + - $ref: synopsys-dw-mshc-common.yaml# + +unevaluatedProperties: false + +examples: + - | + #include + #include + + mmc@9830000 { + compatible = "hisilicon,hi3798cv200-dw-mshc"; + reg = <0x9830000 0x10000>; + interrupts = ; + 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"; + resets = <&crg 0xa0 4>; + reset-names = "reset"; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_pins_1 &emmc_pins_2 + &emmc_pins_3 &emmc_pins_4>; + fifo-depth = <256>; + clock-frequency = <200000000>; + cap-mmc-highspeed; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + non-removable; + bus-width = <8>; + }; From patchwork Fri Feb 16 21:02:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 773558 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D119139595; Fri, 16 Feb 2024 21:02:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708117351; cv=none; b=HM7a0WogB+4q0sqeLwEhiOdSKqcNdbNa5JGlcHL0pG7SRpvxFCJI38dMYaxN5ZIx12M35xT4pa+iVJN18oXDSGHQH1p0TTTsZUAsNpU91AI+YfprT+X0QKKtTpNWdzhwarD5YhIVPeONXe3b9Dus/AxHLqkBb3WoG6E73mjJ8YY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708117351; c=relaxed/simple; bh=7wSPhtESvVsFi3grbeSFiB3p/8T4CFcFBTX2JailsS8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Rp+DglkIwJQ+o+qMaGbLRvgY/jEF4+B8TvzA2EU2hDBktCeNj6giNuKHihAzW1c0PLCe9xtOeVGMX0zyDIzISokeq/FfsqiIHGCw3UrXQDJRiKj8Gkfrf5KhIN+aH3BMGs8NDrjZ6F8IPyJcP0yPVDihkRFGcTVgu81s5ew4XA4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HWGva+Ah; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HWGva+Ah" Received: by smtp.kernel.org (Postfix) with ESMTPS id BD7C8C43330; Fri, 16 Feb 2024 21:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708117350; bh=7wSPhtESvVsFi3grbeSFiB3p/8T4CFcFBTX2JailsS8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=HWGva+AhgQgN3WM79d+JUUrTY0bdho4bZEb42ic2RFGDHqZmuLoDFn5ADWHyHSRPV hXyyRpq0Zc29v6A64/K+4xehE4mn31wqQbDxRQAPX9SAG7J+l/aBtxXQ/afhSPpaOS 5Jp3TW9BkmMtJl7UyEYKC7V3hjGx4oRT6qhP3kGOeFvvYMJ/SERY/fblevvas6duBY LOaBuOwIsT9yXvwJkV6WnaU4KB9brhozNqxoBDakQ81BfVbTeRzECllnMA8aAznXxX 7C0DfjQWph65+hRHIOLlyocC/D5Nrbr46ZoDAR1rCyRv4l9RWVrfYD/yqfulO8GDr5 BmkTtD2vmE+og== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E61FC48BF6; Fri, 16 Feb 2024 21:02:30 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 17 Feb 2024 05:02:32 +0800 Subject: [PATCH v3 4/4] dt-bindings: mmc: hisilicon,hi3798cv200-dw-mshc: rename to hisilicon,hi3798-dw-mshc Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240217-b4-mmc-hi3798mv200-v3-4-f15464176947@outlook.com> References: <20240217-b4-mmc-hi3798mv200-v3-0-f15464176947@outlook.com> In-Reply-To: <20240217-b4-mmc-hi3798mv200-v3-0-f15464176947@outlook.com> To: Ulf Hansson , Jaehoon Chung , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Igor Opaniuk , tianshuliang , David Yang , linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708117349; l=2257; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=4kflwEv+WJmP2PPOQXUMuL9kHf3tVBCROKzZLHhxoCg=; b=De+GKfRljIWbAimat2RWpwDanhxiSTNmKJ/2FK/BfGDLvIyapvRs6Ka9et6HFD8QKfOqhoi1p YEL4HsJRGaJDvGo93lsCAaT86slCgcRumVlLqwlyYeFC/5ZuUgMpLKI X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: From: Yang Xiwen Add binding and an extra property for Hi3798MV200 DWMMC specific extension. Signed-off-by: Yang Xiwen --- ...-dw-mshc.yaml => hisilicon,hi3798-dw-mshc.yaml} | 23 ++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/mmc/hisilicon,hi3798cv200-dw-mshc.yaml b/Documentation/devicetree/bindings/mmc/hisilicon,hi3798-dw-mshc.yaml similarity index 73% rename from Documentation/devicetree/bindings/mmc/hisilicon,hi3798cv200-dw-mshc.yaml rename to Documentation/devicetree/bindings/mmc/hisilicon,hi3798-dw-mshc.yaml index f3dc973cb490..26d7f4be965b 100644 --- a/Documentation/devicetree/bindings/mmc/hisilicon,hi3798cv200-dw-mshc.yaml +++ b/Documentation/devicetree/bindings/mmc/hisilicon,hi3798-dw-mshc.yaml @@ -1,10 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause %YAML 1.2 --- -$id: http://devicetree.org/schemas/mmc/hisilicon,hi3798cv200-dw-mshc.yaml# +$id: http://devicetree.org/schemas/mmc/hisilicon,hi3798-dw-mshc.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Hisilicon Hi3798CV200 SoC specific extensions to the Synopsys DWMMC controller +title: Hisilicon HiSTB SoCs specific extensions to the Synopsys DWMMC controller maintainers: - Yang Xiwen @@ -13,6 +13,7 @@ properties: compatible: enum: - hisilicon,hi3798cv200-dw-mshc + - hisilicon,hi3798mv200-dw-mshc reg: maxItems: 1 @@ -34,6 +35,12 @@ properties: - const: ciu-sample - const: ciu-drive + hisilicon,sap-dll-reg: + $ref: /schemas/types.yaml#/definitions/phandle + description: + A phandle points to the sample delay-locked-loop(DLL) + syscon node, used for tuning. + required: - compatible - reg @@ -44,6 +51,18 @@ required: allOf: - $ref: synopsys-dw-mshc-common.yaml# + - if: + properties: + compatible: + contains: + const: hisilicon,hi3798mv200-dw-mshc + then: + required: + - hisilicon,sap-dll-reg + else: + properties: + hisilicon,sap-dll-reg: false + unevaluatedProperties: false examples: