mmc: tegra: Configure default tap values
Set the default inbound timing adjustment tap value on reset and on non-tunable modes. The default tap value is not programmed on tunable modes because the tuning sequence is used instead to determine the tap value. Signed-off-by: Aapo Vienamo <avienamo@nvidia.com> Acked-by: Thierry Reding <treding@nvidia.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
85c0da1751
commit
c2c09678f8
|
@ -213,6 +213,58 @@ static bool tegra_sdhci_is_pad_and_regulator_valid(struct sdhci_host *host)
|
|||
return true;
|
||||
}
|
||||
|
||||
static bool tegra_sdhci_configure_card_clk(struct sdhci_host *host, bool enable)
|
||||
{
|
||||
bool status;
|
||||
u32 reg;
|
||||
|
||||
reg = sdhci_readw(host, SDHCI_CLOCK_CONTROL);
|
||||
status = !!(reg & SDHCI_CLOCK_CARD_EN);
|
||||
|
||||
if (status == enable)
|
||||
return status;
|
||||
|
||||
if (enable)
|
||||
reg |= SDHCI_CLOCK_CARD_EN;
|
||||
else
|
||||
reg &= ~SDHCI_CLOCK_CARD_EN;
|
||||
|
||||
sdhci_writew(host, reg, SDHCI_CLOCK_CONTROL);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
static void tegra_sdhci_set_tap(struct sdhci_host *host, unsigned int tap)
|
||||
{
|
||||
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
||||
struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
|
||||
const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
|
||||
bool card_clk_enabled = false;
|
||||
u32 reg;
|
||||
|
||||
/*
|
||||
* Touching the tap values is a bit tricky on some SoC generations.
|
||||
* The quirk enables a workaround for a glitch that sometimes occurs if
|
||||
* the tap values are changed.
|
||||
*/
|
||||
|
||||
if (soc_data->nvquirks & NVQUIRK_DIS_CARD_CLK_CONFIG_TAP)
|
||||
card_clk_enabled = tegra_sdhci_configure_card_clk(host, false);
|
||||
|
||||
reg = sdhci_readl(host, SDHCI_TEGRA_VENDOR_CLOCK_CTRL);
|
||||
reg &= ~SDHCI_CLOCK_CTRL_TAP_MASK;
|
||||
reg |= tap << SDHCI_CLOCK_CTRL_TAP_SHIFT;
|
||||
sdhci_writel(host, reg, SDHCI_TEGRA_VENDOR_CLOCK_CTRL);
|
||||
|
||||
if (soc_data->nvquirks & NVQUIRK_DIS_CARD_CLK_CONFIG_TAP &&
|
||||
card_clk_enabled) {
|
||||
udelay(1);
|
||||
sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
|
||||
tegra_sdhci_configure_card_clk(host, card_clk_enabled);
|
||||
}
|
||||
}
|
||||
|
||||
static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask)
|
||||
{
|
||||
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
||||
|
@ -225,6 +277,8 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask)
|
|||
if (!(mask & SDHCI_RESET_ALL))
|
||||
return;
|
||||
|
||||
tegra_sdhci_set_tap(host, tegra_host->default_tap);
|
||||
|
||||
misc_ctrl = sdhci_readl(host, SDHCI_TEGRA_VENDOR_MISC_CTRL);
|
||||
clk_ctrl = sdhci_readl(host, SDHCI_TEGRA_VENDOR_CLOCK_CTRL);
|
||||
|
||||
|
@ -286,27 +340,6 @@ static void tegra_sdhci_configure_cal_pad(struct sdhci_host *host, bool enable)
|
|||
usleep_range(1, 2);
|
||||
}
|
||||
|
||||
static bool tegra_sdhci_configure_card_clk(struct sdhci_host *host, bool enable)
|
||||
{
|
||||
bool status;
|
||||
u32 reg;
|
||||
|
||||
reg = sdhci_readw(host, SDHCI_CLOCK_CONTROL);
|
||||
status = !!(reg & SDHCI_CLOCK_CARD_EN);
|
||||
|
||||
if (status == enable)
|
||||
return status;
|
||||
|
||||
if (enable)
|
||||
reg |= SDHCI_CLOCK_CARD_EN;
|
||||
else
|
||||
reg &= ~SDHCI_CLOCK_CARD_EN;
|
||||
|
||||
sdhci_writew(host, reg, SDHCI_CLOCK_CONTROL);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
static void tegra_sdhci_set_pad_autocal_offset(struct sdhci_host *host,
|
||||
u16 pdpu)
|
||||
{
|
||||
|
@ -517,19 +550,6 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
|
|||
}
|
||||
}
|
||||
|
||||
static void tegra_sdhci_set_uhs_signaling(struct sdhci_host *host,
|
||||
unsigned timing)
|
||||
{
|
||||
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
||||
struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
|
||||
|
||||
if (timing == MMC_TIMING_UHS_DDR50 ||
|
||||
timing == MMC_TIMING_MMC_DDR52)
|
||||
tegra_host->ddr_signaling = true;
|
||||
|
||||
sdhci_set_uhs_signaling(host, timing);
|
||||
}
|
||||
|
||||
static unsigned int tegra_sdhci_get_max_clock(struct sdhci_host *host)
|
||||
{
|
||||
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
||||
|
@ -537,34 +557,36 @@ static unsigned int tegra_sdhci_get_max_clock(struct sdhci_host *host)
|
|||
return clk_round_rate(pltfm_host->clk, UINT_MAX);
|
||||
}
|
||||
|
||||
static void tegra_sdhci_set_tap(struct sdhci_host *host, unsigned int tap)
|
||||
static void tegra_sdhci_set_uhs_signaling(struct sdhci_host *host,
|
||||
unsigned timing)
|
||||
{
|
||||
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
||||
struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
|
||||
const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data;
|
||||
bool card_clk_enabled = false;
|
||||
u32 reg;
|
||||
bool set_default_tap = false;
|
||||
|
||||
/*
|
||||
* Touching the tap values is a bit tricky on some SoC generations.
|
||||
* The quirk enables a workaround for a glitch that sometimes occurs if
|
||||
* the tap values are changed.
|
||||
*/
|
||||
|
||||
if (soc_data->nvquirks & NVQUIRK_DIS_CARD_CLK_CONFIG_TAP)
|
||||
card_clk_enabled = tegra_sdhci_configure_card_clk(host, false);
|
||||
|
||||
reg = sdhci_readl(host, SDHCI_TEGRA_VENDOR_CLOCK_CTRL);
|
||||
reg &= ~SDHCI_CLOCK_CTRL_TAP_MASK;
|
||||
reg |= tap << SDHCI_CLOCK_CTRL_TAP_SHIFT;
|
||||
sdhci_writel(host, reg, SDHCI_TEGRA_VENDOR_CLOCK_CTRL);
|
||||
|
||||
if (soc_data->nvquirks & NVQUIRK_DIS_CARD_CLK_CONFIG_TAP &&
|
||||
card_clk_enabled) {
|
||||
usleep_range(1, 2);
|
||||
sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
|
||||
tegra_sdhci_configure_card_clk(host, card_clk_enabled);
|
||||
switch (timing) {
|
||||
case MMC_TIMING_UHS_SDR50:
|
||||
case MMC_TIMING_UHS_SDR104:
|
||||
case MMC_TIMING_MMC_HS200:
|
||||
case MMC_TIMING_MMC_HS400:
|
||||
/* Don't set default tap on tunable modes. */
|
||||
break;
|
||||
case MMC_TIMING_MMC_DDR52:
|
||||
case MMC_TIMING_UHS_DDR50:
|
||||
tegra_host->ddr_signaling = true;
|
||||
set_default_tap = true;
|
||||
break;
|
||||
default:
|
||||
set_default_tap = true;
|
||||
break;
|
||||
}
|
||||
|
||||
sdhci_set_uhs_signaling(host, timing);
|
||||
|
||||
tegra_sdhci_pad_autocalib(host);
|
||||
|
||||
if (set_default_tap)
|
||||
tegra_sdhci_set_tap(host, tegra_host->default_tap);
|
||||
}
|
||||
|
||||
static int tegra_sdhci_execute_tuning(struct sdhci_host *host, u32 opcode)
|
||||
|
|
Loading…
Reference in New Issue