aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-4.14/0143-mmc-mediatek-add-support-of-mt2701-mt2712.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@phrozen.org>2020-04-03 11:54:12 +0200
committerJohn Crispin <john@phrozen.org>2020-04-06 07:07:42 +0200
commit08df22e2abf053e2d5ddef6393fe26b277fa7d18 (patch)
treeeaee171fe4eff4bf025215456ce0522552a43ca7 /target/linux/mediatek/patches-4.14/0143-mmc-mediatek-add-support-of-mt2701-mt2712.patch
parente2ceb8dd93ace2e82fe136e1900b6830ac11049d (diff)
downloadupstream-08df22e2abf053e2d5ddef6393fe26b277fa7d18.tar.gz
upstream-08df22e2abf053e2d5ddef6393fe26b277fa7d18.tar.bz2
upstream-08df22e2abf053e2d5ddef6393fe26b277fa7d18.zip
mediatek: drop v4.14 support
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/mediatek/patches-4.14/0143-mmc-mediatek-add-support-of-mt2701-mt2712.patch')
-rw-r--r--target/linux/mediatek/patches-4.14/0143-mmc-mediatek-add-support-of-mt2701-mt2712.patch187
1 files changed, 0 insertions, 187 deletions
diff --git a/target/linux/mediatek/patches-4.14/0143-mmc-mediatek-add-support-of-mt2701-mt2712.patch b/target/linux/mediatek/patches-4.14/0143-mmc-mediatek-add-support-of-mt2701-mt2712.patch
deleted file mode 100644
index c06cf73a78..0000000000
--- a/target/linux/mediatek/patches-4.14/0143-mmc-mediatek-add-support-of-mt2701-mt2712.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From 8119f3e147deaf97a66e953fecf3d2b0edbb07fd Mon Sep 17 00:00:00 2001
-From: Chaotian Jing <chaotian.jing@mediatek.com>
-Date: Mon, 16 Oct 2017 09:46:29 +0800
-Subject: [PATCH 143/224] mmc: mediatek: add support of mt2701/mt2712
-
-mt2701/mt2712 has 12bit clock div, which is not compatible with
-mt8135/mt8173. and, some additional features will be added in
-mt2701/mt2712, so that need distinguish it by comatibale name.
-
-Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com>
-Tested-by: Sean Wang <sean.wang@mediatek.com>
-Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
----
- drivers/mmc/host/mtk-sd.c | 82 +++++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 69 insertions(+), 13 deletions(-)
-
---- a/drivers/mmc/host/mtk-sd.c
-+++ b/drivers/mmc/host/mtk-sd.c
-@@ -95,6 +95,9 @@
- #define MSDC_CFG_CKDIV (0xff << 8) /* RW */
- #define MSDC_CFG_CKMOD (0x3 << 16) /* RW */
- #define MSDC_CFG_HS400_CK_MODE (0x1 << 18) /* RW */
-+#define MSDC_CFG_HS400_CK_MODE_EXTRA (0x1 << 22) /* RW */
-+#define MSDC_CFG_CKDIV_EXTRA (0xfff << 8) /* RW */
-+#define MSDC_CFG_CKMOD_EXTRA (0x3 << 20) /* RW */
-
- /* MSDC_IOCON mask */
- #define MSDC_IOCON_SDR104CKS (0x1 << 0) /* RW */
-@@ -297,6 +300,10 @@ struct msdc_save_para {
- u32 emmc50_cfg0;
- };
-
-+struct mtk_mmc_compatible {
-+ u8 clk_div_bits;
-+};
-+
- struct msdc_tune_para {
- u32 iocon;
- u32 pad_tune;
-@@ -311,6 +318,7 @@ struct msdc_delay_phase {
-
- struct msdc_host {
- struct device *dev;
-+ const struct mtk_mmc_compatible *dev_comp;
- struct mmc_host *mmc; /* mmc structure */
- int cmd_rsp;
-
-@@ -352,6 +360,31 @@ struct msdc_host {
- struct msdc_tune_para saved_tune_para; /* tune result of CMD21/CMD19 */
- };
-
-+static const struct mtk_mmc_compatible mt8135_compat = {
-+ .clk_div_bits = 8,
-+};
-+
-+static const struct mtk_mmc_compatible mt8173_compat = {
-+ .clk_div_bits = 8,
-+};
-+
-+static const struct mtk_mmc_compatible mt2701_compat = {
-+ .clk_div_bits = 12,
-+};
-+
-+static const struct mtk_mmc_compatible mt2712_compat = {
-+ .clk_div_bits = 12,
-+};
-+
-+static const struct of_device_id msdc_of_ids[] = {
-+ { .compatible = "mediatek,mt8135-mmc", .data = &mt8135_compat},
-+ { .compatible = "mediatek,mt8173-mmc", .data = &mt8173_compat},
-+ { .compatible = "mediatek,mt2701-mmc", .data = &mt2701_compat},
-+ { .compatible = "mediatek,mt2712-mmc", .data = &mt2712_compat},
-+ {}
-+};
-+MODULE_DEVICE_TABLE(of, msdc_of_ids);
-+
- static void sdr_set_bits(void __iomem *reg, u32 bs)
- {
- u32 val = readl(reg);
-@@ -511,7 +544,12 @@ static void msdc_set_timeout(struct msdc
- timeout = (ns + clk_ns - 1) / clk_ns + clks;
- /* in 1048576 sclk cycle unit */
- timeout = (timeout + (0x1 << 20) - 1) >> 20;
-- sdr_get_field(host->base + MSDC_CFG, MSDC_CFG_CKMOD, &mode);
-+ if (host->dev_comp->clk_div_bits == 8)
-+ sdr_get_field(host->base + MSDC_CFG,
-+ MSDC_CFG_CKMOD, &mode);
-+ else
-+ sdr_get_field(host->base + MSDC_CFG,
-+ MSDC_CFG_CKMOD_EXTRA, &mode);
- /*DDR mode will double the clk cycles for data timeout */
- timeout = mode >= 2 ? timeout * 2 : timeout;
- timeout = timeout > 1 ? timeout - 1 : 0;
-@@ -550,7 +588,11 @@ static void msdc_set_mclk(struct msdc_ho
-
- flags = readl(host->base + MSDC_INTEN);
- sdr_clr_bits(host->base + MSDC_INTEN, flags);
-- sdr_clr_bits(host->base + MSDC_CFG, MSDC_CFG_HS400_CK_MODE);
-+ if (host->dev_comp->clk_div_bits == 8)
-+ sdr_clr_bits(host->base + MSDC_CFG, MSDC_CFG_HS400_CK_MODE);
-+ else
-+ sdr_clr_bits(host->base + MSDC_CFG,
-+ MSDC_CFG_HS400_CK_MODE_EXTRA);
- if (timing == MMC_TIMING_UHS_DDR50 ||
- timing == MMC_TIMING_MMC_DDR52 ||
- timing == MMC_TIMING_MMC_HS400) {
-@@ -570,8 +612,12 @@ static void msdc_set_mclk(struct msdc_ho
-
- if (timing == MMC_TIMING_MMC_HS400 &&
- hz >= (host->src_clk_freq >> 1)) {
-- sdr_set_bits(host->base + MSDC_CFG,
-- MSDC_CFG_HS400_CK_MODE);
-+ if (host->dev_comp->clk_div_bits == 8)
-+ sdr_set_bits(host->base + MSDC_CFG,
-+ MSDC_CFG_HS400_CK_MODE);
-+ else
-+ sdr_set_bits(host->base + MSDC_CFG,
-+ MSDC_CFG_HS400_CK_MODE_EXTRA);
- sclk = host->src_clk_freq >> 1;
- div = 0; /* div is ignore when bit18 is set */
- }
-@@ -589,8 +635,15 @@ static void msdc_set_mclk(struct msdc_ho
- sclk = (host->src_clk_freq >> 2) / div;
- }
- }
-- sdr_set_field(host->base + MSDC_CFG, MSDC_CFG_CKMOD | MSDC_CFG_CKDIV,
-- (mode << 8) | div);
-+ if (host->dev_comp->clk_div_bits == 8)
-+ sdr_set_field(host->base + MSDC_CFG,
-+ MSDC_CFG_CKMOD | MSDC_CFG_CKDIV,
-+ (mode << 8) | div);
-+ else
-+ sdr_set_field(host->base + MSDC_CFG,
-+ MSDC_CFG_CKMOD_EXTRA | MSDC_CFG_CKDIV_EXTRA,
-+ (mode << 12) | div);
-+
- sdr_set_bits(host->base + MSDC_CFG, MSDC_CFG_CKPDN);
- while (!(readl(host->base + MSDC_CFG) & MSDC_CFG_CKSTB))
- cpu_relax();
-@@ -1620,12 +1673,17 @@ static int msdc_drv_probe(struct platfor
- struct mmc_host *mmc;
- struct msdc_host *host;
- struct resource *res;
-+ const struct of_device_id *of_id;
- int ret;
-
- if (!pdev->dev.of_node) {
- dev_err(&pdev->dev, "No DT found\n");
- return -EINVAL;
- }
-+
-+ of_id = of_match_node(msdc_of_ids, pdev->dev.of_node);
-+ if (!of_id)
-+ return -EINVAL;
- /* Allocate MMC host for this device */
- mmc = mmc_alloc_host(sizeof(struct msdc_host), &pdev->dev);
- if (!mmc)
-@@ -1689,11 +1747,15 @@ static int msdc_drv_probe(struct platfor
- msdc_of_property_parse(pdev, host);
-
- host->dev = &pdev->dev;
-+ host->dev_comp = of_id->data;
- host->mmc = mmc;
- host->src_clk_freq = clk_get_rate(host->src_clk);
- /* Set host parameters to mmc */
- mmc->ops = &mt_msdc_ops;
-- mmc->f_min = DIV_ROUND_UP(host->src_clk_freq, 4 * 255);
-+ if (host->dev_comp->clk_div_bits == 8)
-+ mmc->f_min = DIV_ROUND_UP(host->src_clk_freq, 4 * 255);
-+ else
-+ mmc->f_min = DIV_ROUND_UP(host->src_clk_freq, 4 * 4095);
-
- mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23;
- /* MMC core transfer sizes tunable parameters */
-@@ -1842,12 +1904,6 @@ static const struct dev_pm_ops msdc_dev_
- SET_RUNTIME_PM_OPS(msdc_runtime_suspend, msdc_runtime_resume, NULL)
- };
-
--static const struct of_device_id msdc_of_ids[] = {
-- { .compatible = "mediatek,mt8135-mmc", },
-- {}
--};
--MODULE_DEVICE_TABLE(of, msdc_of_ids);
--
- static struct platform_driver mt_msdc_driver = {
- .probe = msdc_drv_probe,
- .remove = msdc_drv_remove,