aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2015-12-22 13:41:04 -0500
committerUlf Hansson <ulf.hansson@linaro.org>2016-01-05 12:04:56 -0500
commit1b84def8bf86ae9a39940c12a20ce9a2dfd66d56 (patch)
tree2ada0e93c31829041f83d1d605ff71a3de98c2c5
parent7ad2ed1dfcbed6f50923fc0afc24aac475bdc0b5 (diff)
mmc: tegra: use correct accessor for misc ctrl register
The misc control register is 32bit wide, the used readw/writew accessors only mainipulate the low 16bit of this register. It currently doesn't matter as all the bit changed are located in the lower half, but together with the u32 variable used to hold the contents of the register it is seriously confusing. Switch to 32bit accessors to avoid any future breakage. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/sdhci-tegra.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index ff2eefe9f237..83c4bf7bc16c 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -140,7 +140,7 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask)
140 if (!(mask & SDHCI_RESET_ALL)) 140 if (!(mask & SDHCI_RESET_ALL))
141 return; 141 return;
142 142
143 misc_ctrl = sdhci_readw(host, SDHCI_TEGRA_VENDOR_MISC_CTRL); 143 misc_ctrl = sdhci_readl(host, SDHCI_TEGRA_VENDOR_MISC_CTRL);
144 /* Erratum: Enable SDHCI spec v3.00 support */ 144 /* Erratum: Enable SDHCI spec v3.00 support */
145 if (soc_data->nvquirks & NVQUIRK_ENABLE_SDHCI_SPEC_300) 145 if (soc_data->nvquirks & NVQUIRK_ENABLE_SDHCI_SPEC_300)
146 misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_SDHCI_SPEC_300; 146 misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_SDHCI_SPEC_300;
@@ -151,7 +151,7 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask)
151 misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_DDR50; 151 misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_DDR50;
152 if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR104) 152 if (soc_data->nvquirks & NVQUIRK_ENABLE_SDR104)
153 misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_SDR104; 153 misc_ctrl |= SDHCI_MISC_CTRL_ENABLE_SDR104;
154 sdhci_writew(host, misc_ctrl, SDHCI_TEGRA_VENDOR_MISC_CTRL); 154 sdhci_writel(host, misc_ctrl, SDHCI_TEGRA_VENDOR_MISC_CTRL);
155 155
156 clk_ctrl = sdhci_readl(host, SDHCI_TEGRA_VENDOR_CLOCK_CTRL); 156 clk_ctrl = sdhci_readl(host, SDHCI_TEGRA_VENDOR_CLOCK_CTRL);
157 clk_ctrl &= ~SDHCI_CLOCK_CTRL_SPI_MODE_CLKEN_OVERRIDE; 157 clk_ctrl &= ~SDHCI_CLOCK_CTRL_SPI_MODE_CLKEN_OVERRIDE;