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>

diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index a6bfa5296495d8895fc74fac93754b693749d7eb..342ec1a38684da76a800b4a266996592cdb501ea 100644 (file)
--- 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);