colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: exynos_dw_mmc: Move quirks from struct dwmci_host to chip data

Browse Source 
host->quirks field is only used internally in exynos_dw_mmc.c driver.
To avoid cluttering the scope of struct dwmci_host, move quirks field
into Exynos driver's chip data, where it can be statically defined.

No functional change.

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
This commit is contained in:
Sam Protsenko
2024-08-07 22:14:34 -05:00
committed by Minkyu Kang
parent 897e96c5a8
commit b8ea3810aa
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mmc/exynos_dw_mmc.c
View File

@@ -25,6 +25,9 @@
#define EXYNOS4412_FIXED_CIU_CLK_DIV 4 #define EXYNOS4412_FIXED_CIU_CLK_DIV 4
/* Quirks */
#define DWMCI_QUIRK_DISABLE_SMU BIT(0)
#ifdef CONFIG_DM_MMC #ifdef CONFIG_DM_MMC
#include <dm.h> #include <dm.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@@ -39,6 +42,7 @@ struct exynos_mmc_plat {
struct exynos_dwmmc_variant { struct exynos_dwmmc_variant {
u32 clksel; /* CLKSEL register offset */ u32 clksel; /* CLKSEL register offset */
u8 div; /* (optional) fixed clock divider value: 0..7 */ u8 div; /* (optional) fixed clock divider value: 0..7 */
u32 quirks; /* quirk flags - see DWMCI_QUIRK_... */
}; };
/* Exynos implmentation specific drver private data */ /* Exynos implmentation specific drver private data */
@@ -173,7 +177,7 @@ static void exynos_dwmci_board_init(struct dwmci_host *host)
{ {
struct dwmci_exynos_priv_data *priv = exynos_dwmmc_get_priv(host); struct dwmci_exynos_priv_data *priv = exynos_dwmmc_get_priv(host);
if (host->quirks & DWMCI_QUIRK_DISABLE_SMU) { if (priv->chip->quirks & DWMCI_QUIRK_DISABLE_SMU) {
dwmci_writel(host, EMMCP_MPSBEGIN0, 0); dwmci_writel(host, EMMCP_MPSBEGIN0, 0);
dwmci_writel(host, EMMCP_SEND0, 0); dwmci_writel(host, EMMCP_SEND0, 0);
dwmci_writel(host, EMMCP_CTRL0, dwmci_writel(host, EMMCP_CTRL0,
@@ -205,11 +209,7 @@ static int exynos_dwmci_core_init(struct dwmci_host *host)
} }
host->name = "EXYNOS DWMMC"; host->name = "EXYNOS DWMMC";
#ifdef CONFIG_EXYNOS5420
host->quirks = DWMCI_QUIRK_DISABLE_SMU;
#endif
host->board_init = exynos_dwmci_board_init; host->board_init = exynos_dwmci_board_init;
host->caps = MMC_MODE_DDR_52MHz; host->caps = MMC_MODE_DDR_52MHz;
host->clksel = exynos_dwmci_clksel; host->clksel = exynos_dwmci_clksel;
host->get_mmc_clk = exynos_dwmci_get_clk; host->get_mmc_clk = exynos_dwmci_get_clk;
@@ -352,6 +352,9 @@ static const struct exynos_dwmmc_variant exynos4_drv_data = {
static const struct exynos_dwmmc_variant exynos5_drv_data = { static const struct exynos_dwmmc_variant exynos5_drv_data = {
.clksel = DWMCI_CLKSEL, .clksel = DWMCI_CLKSEL,
#ifdef CONFIG_EXYNOS5420
.quirks = DWMCI_QUIRK_DISABLE_SMU,
#endif
}; };
static const struct udevice_id exynos_dwmmc_ids[] = { static const struct udevice_id exynos_dwmmc_ids[] = {

5
include/dwmmc.h
View File

@@ -149,9 +149,6 @@
#define DWMCI_IDINTEN_TI BIT(0) #define DWMCI_IDINTEN_TI BIT(0)
#define DWMCI_IDINTEN_MASK (DWMCI_IDINTEN_TI | DWMCI_IDINTEN_RI) #define DWMCI_IDINTEN_MASK (DWMCI_IDINTEN_TI | DWMCI_IDINTEN_RI)
/* Quirks */
#define DWMCI_QUIRK_DISABLE_SMU BIT(0)
/** /**
* struct dwmci_idmac_regs - Offsets of IDMAC registers * struct dwmci_idmac_regs - Offsets of IDMAC registers
* *
@@ -180,7 +177,6 @@ struct dwmci_idmac_regs {
* *
* @name: Device name * @name: Device name
* @ioaddr: Base I/O address of controller * @ioaddr: Base I/O address of controller
* @quirks: Quick flags - see DWMCI_QUIRK_...
* @caps: Capabilities - see MMC_MODE_... * @caps: Capabilities - see MMC_MODE_...
* @clock: Current clock frequency (after internal divider), Hz * @clock: Current clock frequency (after internal divider), Hz
* @bus_hz: Bus speed in Hz, if @get_mmc_clk() is NULL * @bus_hz: Bus speed in Hz, if @get_mmc_clk() is NULL
@@ -200,7 +196,6 @@ struct dwmci_idmac_regs {
struct dwmci_host { struct dwmci_host {
const char *name; const char *name;
void *ioaddr; void *ioaddr;
unsigned int quirks;
unsigned int caps; unsigned int caps;
unsigned int clock; unsigned int clock;
unsigned int bus_hz; unsigned int bus_hz;