diff options
| author | Simon Horman <horms@verge.net.au> | 2010-11-26 23:02:58 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-29 12:54:50 +0900 |
| commit | 1ae0affedce1d3e401991fbe7f2674753f0a7641 (patch) | |
| tree | 0df282400a9e16d6a8ad131359c4794b7154de48 /include/linux | |
| parent | 7211a1bae6eac26539eb2d77a26fcd1bccef8137 (diff) | |
| download | lwn-1ae0affedce1d3e401991fbe7f2674753f0a7641.tar.gz lwn-1ae0affedce1d3e401991fbe7f2674753f0a7641.zip | |
mmc, sh: Correct value for reset
This resolves a regression that I introduced in
"mmc, sh: Move constants to sh_mmcif.h". Having
examined the manual and tested the code on an AP4EVB board
it seems that the correct sequence is.
1) Write 1 to bit 31 and zeros to all other bits
2) Write zero to all bits
Cc: Yusuke Goda <yusuke.goda.sx@renesas.com>
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mmc/sh_mmcif.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h index a6bfa5296495..342ec1a38684 100644 --- a/include/linux/mmc/sh_mmcif.h +++ b/include/linux/mmc/sh_mmcif.h @@ -80,7 +80,7 @@ struct sh_mmcif_plat_data { /* CE_VERSION */ #define SOFT_RST_ON (1 << 31) -#define SOFT_RST_OFF ~SOFT_RST_ON +#define SOFT_RST_OFF 0 static inline u32 sh_mmcif_readl(void __iomem *addr, int reg) { @@ -168,12 +168,9 @@ static inline int sh_mmcif_boot_do_read(void __iomem *base, static inline void sh_mmcif_boot_init(void __iomem *base) { - unsigned long tmp; - /* reset */ - tmp = sh_mmcif_readl(base, MMCIF_CE_VERSION); - sh_mmcif_writel(base, MMCIF_CE_VERSION, tmp | SOFT_RST_ON); - sh_mmcif_writel(base, MMCIF_CE_VERSION, tmp & SOFT_RST_OFF); + sh_mmcif_writel(base, MMCIF_CE_VERSION, SOFT_RST_ON); + sh_mmcif_writel(base, MMCIF_CE_VERSION, SOFT_RST_OFF); /* byte swap */ sh_mmcif_writel(base, MMCIF_CE_BUF_ACC, BUF_ACC_ATYP); |