Commit 3e2b0af4 authored Oct 02, 2017 by Jerome Brunet Committed by Ulf Hansson Oct 04, 2017

mmc: meson-gx: fix rx phase reset

Resetting the phase when POWER_ON is set the set_ios() call means that the
phase is reset almost every time the set_ios() is called, while the
expected behavior was to reset the phase on a power cycle.

This had gone unnoticed until now because in all mode (except hs400) the
tuning is done after the last to set_ios(). In such case, the tuning
result is used anyway. In HS400, there are a few calls to set_ios() after
the tuning is done, overwriting the tuning result.

Resetting the phase on POWER_UP instead of POWER_ON solve the problem.

Fixes: d341ca88 ("mmc: meson-gx: rework tuning function")
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent ca3dcd3f

drivers/mmc/host/meson-gx-mmc.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -745,6 +745,10 @@ static void meson_mmc_set_ios(struct mmc_host mmc, struct mmc_ios ios)
		case MMC_POWER_UP:
		if (!IS_ERR(mmc->supply.vmmc))
		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);

		/* Reset rx phase */
		clk_set_phase(host->rx_clk, 0);

		break;

		case MMC_POWER_ON:
		@@ -758,8 +762,6 @@ static void meson_mmc_set_ios(struct mmc_host mmc, struct mmc_ios ios)
		host->vqmmc_enabled = true;
		}

		/* Reset rx phase */
		clk_set_phase(host->rx_clk, 0);
		break;
		}