dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-28 22:11:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

mmc: mtk-sd: add support for MediaTek MT7620/MT7628 SoCs

Browse Source 
This patch adds mmc support for MediaTek MT7620/MT7628 SoCs.

Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
This commit is contained in:
Weijie Gao
2019-09-25 17:45:37 +08:00
committed by Daniel Schwierzeck
parent cff0b044d2
commit 3c92a957ee
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mmc/Kconfig
View File

@@ -698,7 +698,7 @@ config FTSDC010_SDIO
config MMC_MTK config MMC_MTK
bool "MediaTek SD/MMC Card Interface support" bool "MediaTek SD/MMC Card Interface support"
depends on ARCH_MEDIATEK depends on ARCH_MEDIATEK || ARCH_MTMIPS
depends on BLK && DM_MMC depends on BLK && DM_MMC
depends on OF_CONTROL depends on OF_CONTROL
help help

23
drivers/mmc/mtk-sd.c
View File

@@ -217,6 +217,7 @@ struct mtk_sd_regs {
struct msdc_compatible { struct msdc_compatible {
u8 clk_div_bits; u8 clk_div_bits;
u8 sclk_cycle_shift;
bool pad_tune0; bool pad_tune0;
bool async_fifo; bool async_fifo;
bool data_tune; bool data_tune;
@@ -664,7 +665,7 @@ static int msdc_ops_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,
static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks) static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks)
{ {
u32 timeout, clk_ns; u32 timeout, clk_ns, shift;
u32 mode = 0; u32 mode = 0;
host->timeout_ns = ns; host->timeout_ns = ns;
@@ -673,10 +674,11 @@ static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks)
if (host->sclk == 0) { if (host->sclk == 0) {
timeout = 0; timeout = 0;
} else { } else {
shift = host->dev_comp->sclk_cycle_shift;
clk_ns = 1000000000UL / host->sclk; clk_ns = 1000000000UL / host->sclk;
timeout = (ns + clk_ns - 1) / clk_ns + clks; timeout = (ns + clk_ns - 1) / clk_ns + clks;
/* unit is 1048576 sclk cycles */ /* unit is 1048576 sclk cycles */
timeout = (timeout + (0x1 << 20) - 1) >> 20; timeout = (timeout + (0x1 << shift) - 1) >> shift;
if (host->dev_comp->clk_div_bits == 8) if (host->dev_comp->clk_div_bits == 8)
mode = (readl(&host->base->msdc_cfg) & mode = (readl(&host->base->msdc_cfg) &
MSDC_CFG_CKMOD_M) >> MSDC_CFG_CKMOD_S; MSDC_CFG_CKMOD_M) >> MSDC_CFG_CKMOD_S;
@@ -1301,7 +1303,7 @@ static int msdc_drv_probe(struct udevice *dev)
host->mmc = &plat->mmc; host->mmc = &plat->mmc;
host->timeout_ns = 100000000; host->timeout_ns = 100000000;
host->timeout_clks = 3 * 1048576; host->timeout_clks = 3 * (1 << host->dev_comp->sclk_cycle_shift);
#ifdef CONFIG_PINCTRL #ifdef CONFIG_PINCTRL
pinctrl_select_state(dev, "default"); pinctrl_select_state(dev, "default");
@@ -1374,8 +1376,20 @@ static const struct dm_mmc_ops msdc_ops = {
#endif #endif
}; };
static const struct msdc_compatible mt7620_compat = {
.clk_div_bits = 8,
.sclk_cycle_shift = 16,
.pad_tune0 = false,
.async_fifo = false,
.data_tune = false,
.busy_check = false,
.stop_clk_fix = false,
.enhance_rx = false
};
static const struct msdc_compatible mt7623_compat = { static const struct msdc_compatible mt7623_compat = {
.clk_div_bits = 12, .clk_div_bits = 12,
.sclk_cycle_shift = 20,
.pad_tune0 = true, .pad_tune0 = true,
.async_fifo = true, .async_fifo = true,
.data_tune = true, .data_tune = true,
@@ -1386,6 +1400,7 @@ static const struct msdc_compatible mt7623_compat = {
static const struct msdc_compatible mt8516_compat = { static const struct msdc_compatible mt8516_compat = {
.clk_div_bits = 12, .clk_div_bits = 12,
.sclk_cycle_shift = 20,
.pad_tune0 = true, .pad_tune0 = true,
.async_fifo = true, .async_fifo = true,
.data_tune = true, .data_tune = true,
@@ -1395,6 +1410,7 @@ static const struct msdc_compatible mt8516_compat = {
static const struct msdc_compatible mt8183_compat = { static const struct msdc_compatible mt8183_compat = {
.clk_div_bits = 12, .clk_div_bits = 12,
.sclk_cycle_shift = 20,
.pad_tune0 = true, .pad_tune0 = true,
.async_fifo = true, .async_fifo = true,
.data_tune = true, .data_tune = true,
@@ -1403,6 +1419,7 @@ static const struct msdc_compatible mt8183_compat = {
}; };
static const struct udevice_id msdc_ids[] = { static const struct udevice_id msdc_ids[] = {
{ .compatible = "mediatek,mt7620-mmc", .data = (ulong)&mt7620_compat },
{ .compatible = "mediatek,mt7623-mmc", .data = (ulong)&mt7623_compat }, { .compatible = "mediatek,mt7623-mmc", .data = (ulong)&mt7623_compat },
{ .compatible = "mediatek,mt8516-mmc", .data = (ulong)&mt8516_compat }, { .compatible = "mediatek,mt8516-mmc", .data = (ulong)&mt8516_compat },
{ .compatible = "mediatek,mt8183-mmc", .data = (ulong)&mt8183_compat }, { .compatible = "mediatek,mt8183-mmc", .data = (ulong)&mt8183_compat },