mmc: dw_mmc: exynos: incorporate ciu_div into timing property
PATCH 4/7 mmc: dw_mmc: exynos: incorporate ciu_div into timing property
ciu_div may not be common value for all speed mode. So, it needs to be attached to CLKSEL timing.
Signed-off-by Seungwon Jeon <[email protected]>
--- drivers/mmc/host/dw_mmc-exynos.c | 75 ++++++++++++++++++++++++++------------ drivers/mmc/host/dw_mmc-exynos.h | 1 + 2 files changed, 53 insertions(+), 23 deletions(-)
drivers/mmc/host/dw_mmc-exynos.c +52 -23
@@ -39,6 +39,7 @@ struct dw_mci_exynos_priv_data {u8 ciu_div;u32 sdr_timing;u32 ddr_timing; +u32 hs200_timing;u32 cur_speed; };
@@ -64,6 +65,18 @@ static struct dw_mci_exynos_compatible { }, }; +static inline u8 dw_mci_exynos_get_ciu_div (struct dw_mci *host) +{ +struct dw_mci_exynos_priv_data *priv = host->priv; + +if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS4412 ) +return EXYNOS4412_FIXED_CIU_CLK_DIV ; +else if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS4210 ) +return EXYNOS4210_FIXED_CIU_CLK_DIV ; +else +return SDMMC_CLKSEL_GET_DIV (mci_readl (host,CLKSEL )) +1 ; +} +static int dw_mci_exynos_priv_init (struct dw_mci *host) {struct dw_mci_exynos_priv_data *priv = host->priv;
@@ -77,6 +90,8 @@ static int dw_mci_exynos_priv_init(struct dw_mci *host) SDMMC_MPSCTRL_NON_SECURE_WRITE_BIT); } + priv->ciu_div =dw_mci_exynos_get_ciu_div (host); +return 0 ; }
@@ -90,7 +105,7 @@ static int dw_mci_exynos_setup_clock(struct dw_mci *host)else rate =clk_get_rate (host->ciu_clk); - host->bus_hz = rate / (priv->ciu_div +1 ); + host->bus_hz = rate / priv->ciu_div;return 0 ; }
@@ -156,9 +171,10 @@ static void dw_mci_exynos_set_ios(struct dw_mci *host, struct mmc_ios *ios)struct dw_mci_exynos_priv_data *priv = host->priv;unsigned int wanted = ios->clock;unsigned long actual; -u8 div = priv->ciu_div +1 ; -if (ios->timing ==MMC_TIMING_MMC_DDR52 ) { +if (ios->timing ==MMC_TIMING_MMC_HS200 ) { +mci_writel (host,CLKSEL , priv->hs200_timing); + }else if (ios->timing ==MMC_TIMING_MMC_DDR52 ) {mci_writel (host,CLKSEL , priv->ddr_timing);/* Should be double rate for DDR mode */ if (ios->bus_width ==MMC_BUS_WIDTH_8 )
@@ -179,6 +195,7 @@ static void dw_mci_exynos_set_ios(struct dw_mci *host, struct mmc_ios *ios) wanted =EXYNOS_CCLKIN_MIN ;if (wanted != priv->cur_speed) { +u8 div =dw_mci_exynos_get_ciu_div (host);int ret =clk_set_rate (host->ciu_clk, wanted * div);if (ret) dev_warn(host->dev,
@@ -191,14 +208,34 @@ static void dw_mci_exynos_set_ios(struct dw_mci *host, struct mmc_ios *ios) } } +static int dw_mci_exynos_dt_populate_timing (struct dw_mci *host, +unsigned int ctrl_type, +const char *propname, +u32 *out_values) +{ +struct device_node *np = host->dev->of_node; +u32 timing[3 ]; +int ret; + + ret =of_property_read_u32_array (np, propname, timing,3 ); +if (ret) +return ret; + +if (ctrl_type ==DW_MCI_TYPE_EXYNOS4412 || + ctrl_type ==DW_MCI_TYPE_EXYNOS4210 ) + timing[2 ] =0 ; + + *out_values =SDMMC_CLKSEL_TIMING (timing[0 ], timing[1 ], timing[2 ]); + +return 0 ; +} + +static int dw_mci_exynos_parse_dt (struct dw_mci *host) {struct dw_mci_exynos_priv_data *priv;struct device_node *np = host->dev->of_node; -u32 timing[2 ]; -u32 div =0 ; -int idx; -int ret; +int idx, ret; priv =devm_kzalloc (host->dev,sizeof (*priv),GFP_KERNEL );if (!priv) {
@@ -211,29 +248,21 @@ static int dw_mci_exynos_parse_dt(struct dw_mci *host) priv->ctrl_type = exynos_compat[idx].ctrl_type; } -if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS4412 ) - priv->ciu_div =EXYNOS4412_FIXED_CIU_CLK_DIV -1 ; -else if (priv->ctrl_type ==DW_MCI_TYPE_EXYNOS4210 ) - priv->ciu_div =EXYNOS4210_FIXED_CIU_CLK_DIV -1 ; -else { -of_property_read_u32 (np,"samsung,dw-mshc-ciu-div" , &div); - priv->ciu_div = div; - } - - ret =of_property_read_u32_array (np, -"samsung,dw-mshc-sdr-timing" , timing,2 ); + ret =dw_mci_exynos_dt_populate_timing (host, priv->ctrl_type, +"samsung,dw-mshc-sdr-timing" , &priv->sdr_timing);if (ret)return ret; - priv->sdr_timing =SDMMC_CLKSEL_TIMING (timing[0 ], timing[1 ], div); - - ret =of_property_read_u32_array (np, -"samsung,dw-mshc-ddr-timing" , timing,2 ); + ret =dw_mci_exynos_dt_populate_timing (host, priv->ctrl_type, +"samsung,dw-mshc-ddr-timing" , &priv->ddr_timing);if (ret)return ret; - priv->ddr_timing =SDMMC_CLKSEL_TIMING (timing[0 ], timing[1 ], div); +dw_mci_exynos_dt_populate_timing (host, priv->ctrl_type, +"samsung,dw-mshc-hs200-timing" , &priv->hs200_timing); + host->priv = priv; +return 0 ; }
drivers/mmc/host/dw_mmc-exynos.h +1 -0
@@ -20,6 +20,7 @@#define SDMMC_CLKSEL_CCLK_DRIVE (x) (((x) & 7) << 16)#define SDMMC_CLKSEL_CCLK_DIVIDER (x) (((x) & 7) << 24)#define SDMMC_CLKSEL_GET_DRV_WD3 (x) (((x) >> 16) & 0x7) +#define SDMMC_CLKSEL_GET_DIV (x) (((x) >> 24) & 0x7)#define SDMMC_CLKSEL_TIMING (x, y, z) (SDMMC_CLKSEL_CCLK_SAMPLE(x) | \ SDMMC_CLKSEL_CCLK_DRIVE(y) | \ SDMMC_CLKSEL_CCLK_DIVIDER(z))
Signature · 1 line
1.7.4.1