Commit 14b04c6a authored by Michał Mirosław's avatar Michał Mirosław Committed by Ulf Hansson
Browse files

mmc: sdhci-tegra: use generic sdhci_set_bus_width() 



Now that sdhci_set_bus_width() supports 8-bit bus widths based on the
MMC_CAP_8_BIT_DATA capability flag, replace the tegra version with the
generic sdhci version.

Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Tested-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 98f94ea6

drivers/mmc/host/sdhci-tegra.c

+2 −21
Original line number Diff line number Diff line
@@ -190,25 +190,6 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask) 
	tegra_host->ddr_signaling = false;

}



static void tegra_sdhci_set_bus_width(struct sdhci_host *host, int bus_width)

{

	u32 ctrl;



	ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);

	if ((host->mmc->caps & MMC_CAP_8_BIT_DATA) &&

	    (bus_width == MMC_BUS_WIDTH_8)) {

		ctrl &= ~SDHCI_CTRL_4BITBUS;

		ctrl |= SDHCI_CTRL_8BITBUS;

	} else {

		ctrl &= ~SDHCI_CTRL_8BITBUS;

		if (bus_width == MMC_BUS_WIDTH_4)

			ctrl |= SDHCI_CTRL_4BITBUS;

		else

			ctrl &= ~SDHCI_CTRL_4BITBUS;

	}

	sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);

}



static void tegra_sdhci_pad_autocalib(struct sdhci_host *host)

{

	u32 val;
@@ -323,7 +304,7 @@ static const struct sdhci_ops tegra_sdhci_ops = { 
	.read_w     = tegra_sdhci_readw,

	.write_l    = tegra_sdhci_writel,

	.set_clock  = tegra_sdhci_set_clock,

	.set_bus_width = tegra_sdhci_set_bus_width,

	.set_bus_width = sdhci_set_bus_width,

	.reset      = tegra_sdhci_reset,

	.platform_execute_tuning = tegra_sdhci_execute_tuning,

	.set_uhs_signaling = tegra_sdhci_set_uhs_signaling,
@@ -371,7 +352,7 @@ static const struct sdhci_ops tegra114_sdhci_ops = { 
	.write_w    = tegra_sdhci_writew,

	.write_l    = tegra_sdhci_writel,

	.set_clock  = tegra_sdhci_set_clock,

	.set_bus_width = tegra_sdhci_set_bus_width,

	.set_bus_width = sdhci_set_bus_width,

	.reset      = tegra_sdhci_reset,

	.platform_execute_tuning = tegra_sdhci_execute_tuning,

	.set_uhs_signaling = tegra_sdhci_set_uhs_signaling,

CRA Git | Maintained and supported by SUSTech CRA and CCSE