Commit c08bcb6c authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Ulf Hansson

mmc: meson-gx: introduce struct meson_tuning_params

Introduce struct meson_tuning_params for storing the clock phase
configurations. There's no functional change because tx and rx
clock phase were implicitely set to CLK_PHASE_0 before.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 06c9ccb7
...@@ -49,6 +49,8 @@ ...@@ -49,6 +49,8 @@
#define CLK_SRC_PLL 1 /* FCLK_DIV2 */ #define CLK_SRC_PLL 1 /* FCLK_DIV2 */
#define CLK_SRC_PLL_RATE 1000000000 #define CLK_SRC_PLL_RATE 1000000000
#define CLK_CORE_PHASE_MASK GENMASK(9, 8) #define CLK_CORE_PHASE_MASK GENMASK(9, 8)
#define CLK_TX_PHASE_MASK GENMASK(11, 10)
#define CLK_RX_PHASE_MASK GENMASK(13, 12)
#define CLK_PHASE_0 0 #define CLK_PHASE_0 0
#define CLK_PHASE_90 1 #define CLK_PHASE_90 1
#define CLK_PHASE_180 2 #define CLK_PHASE_180 2
...@@ -111,6 +113,12 @@ ...@@ -111,6 +113,12 @@
#define SD_EMMC_CFG_CMD_GAP 16 /* in clock cycles */ #define SD_EMMC_CFG_CMD_GAP 16 /* in clock cycles */
#define MUX_CLK_NUM_PARENTS 2 #define MUX_CLK_NUM_PARENTS 2
struct meson_tuning_params {
u8 core_phase;
u8 tx_phase;
u8 rx_phase;
};
struct meson_host { struct meson_host {
struct device *dev; struct device *dev;
struct mmc_host *mmc; struct mmc_host *mmc;
...@@ -130,6 +138,7 @@ struct meson_host { ...@@ -130,6 +138,7 @@ struct meson_host {
void *bounce_buf; void *bounce_buf;
dma_addr_t bounce_dma_addr; dma_addr_t bounce_dma_addr;
struct meson_tuning_params tp;
bool vqmmc_enabled; bool vqmmc_enabled;
}; };
...@@ -312,7 +321,9 @@ static int meson_mmc_clk_init(struct meson_host *host) ...@@ -312,7 +321,9 @@ static int meson_mmc_clk_init(struct meson_host *host)
/* init SD_EMMC_CLOCK to sane defaults w/min clock rate */ /* init SD_EMMC_CLOCK to sane defaults w/min clock rate */
clk_reg = 0; clk_reg = 0;
clk_reg |= FIELD_PREP(CLK_CORE_PHASE_MASK, CLK_PHASE_180); clk_reg |= FIELD_PREP(CLK_CORE_PHASE_MASK, host->tp.core_phase);
clk_reg |= FIELD_PREP(CLK_TX_PHASE_MASK, host->tp.tx_phase);
clk_reg |= FIELD_PREP(CLK_RX_PHASE_MASK, host->tp.rx_phase);
clk_reg |= FIELD_PREP(CLK_SRC_MASK, CLK_SRC_XTAL); clk_reg |= FIELD_PREP(CLK_SRC_MASK, CLK_SRC_XTAL);
clk_reg |= FIELD_PREP(CLK_DIV_MASK, CLK_DIV_MAX); clk_reg |= FIELD_PREP(CLK_DIV_MASK, CLK_DIV_MAX);
clk_reg &= ~CLK_ALWAYS_ON; clk_reg &= ~CLK_ALWAYS_ON;
...@@ -757,6 +768,10 @@ static int meson_mmc_probe(struct platform_device *pdev) ...@@ -757,6 +768,10 @@ static int meson_mmc_probe(struct platform_device *pdev)
if (ret) if (ret)
goto free_host; goto free_host;
host->tp.core_phase = CLK_PHASE_180;
host->tp.tx_phase = CLK_PHASE_0;
host->tp.rx_phase = CLK_PHASE_0;
ret = meson_mmc_clk_init(host); ret = meson_mmc_clk_init(host);
if (ret) if (ret)
goto err_core_clk; goto err_core_clk;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment