diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-01-15 10:36:52 -0500 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2013-02-24 14:36:57 -0500 |
| commit | 6b40d18295a878c0e8ff02062cb9b8e9a6b156e4 (patch) | |
| tree | a85a7ba8d07c76e8630a3a8b109c95f2ef28b19c | |
| parent | ef4d0888bb7e1b963880f086575081c3d39cad2d (diff) | |
mmc: sdhci-esdhc-imx: remove D3CD check from SDHCI_HOST_CONTROL write
SDHCI_CTRL_D3CD is not a standard SDHCI_HOST_CONTROL, so there is no
need to check it in SDHCI_HOST_CONTROL write at all. Remove it.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Dirk Behme <dirk.behme@de.bosch.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
| -rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index ac6f971b625f..322eabfd61c6 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c | |||
| @@ -297,10 +297,8 @@ static void esdhc_writeb_le(struct sdhci_host *host, u8 val, int reg) | |||
| 297 | */ | 297 | */ |
| 298 | return; | 298 | return; |
| 299 | case SDHCI_HOST_CONTROL: | 299 | case SDHCI_HOST_CONTROL: |
| 300 | /* FSL messed up here, so we can just keep those three */ | 300 | /* FSL messed up here, so we need to manually compose it. */ |
| 301 | new_val = val & (SDHCI_CTRL_LED | \ | 301 | new_val = val & (SDHCI_CTRL_LED | SDHCI_CTRL_4BITBUS); |
| 302 | SDHCI_CTRL_4BITBUS | \ | ||
| 303 | SDHCI_CTRL_D3CD); | ||
| 304 | /* ensure the endianness */ | 302 | /* ensure the endianness */ |
| 305 | new_val |= ESDHC_HOST_CONTROL_LE; | 303 | new_val |= ESDHC_HOST_CONTROL_LE; |
| 306 | /* bits 8&9 are reserved on mx25 */ | 304 | /* bits 8&9 are reserved on mx25 */ |