From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 11 Jan 2011 04:05:15 +0000 (+0900)
Subject: Merge branches 'sh/memchunk' and 'common/mmcif' into sh-latest
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=89e9fd32c6f4ed58cd6f6e3c3cf5b536a3f36100;p=linux.git

Merge branches 'sh/memchunk' and 'common/mmcif' into sh-latest
---

89e9fd32c6f4ed58cd6f6e3c3cf5b536a3f36100
diff --cc include/linux/mmc/sh_mmcif.h
index 5c99da1078aa2,44fc5348fd5d7,cfcc6e320e2fa..bf173502d7441
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@@@ -177,25 -209,27 -216,4 +223,4 @@@@ static inline void sh_mmcif_boot_init(v
   	sh_mmcif_boot_cmd(base, 0x03400040, 0x00010000);
   }
   
-- static inline void sh_mmcif_boot_slurp(void __iomem *base,
-- 				       unsigned char *buf,
-- 				       unsigned long no_bytes)
-- {
-- 	unsigned long tmp;
-- 
-- 	/* In data transfer mode: Set clock to Bus clock/4 (about 20Mhz) */
-  	sh_mmcif_writel(base, MMCIF_CE_CLK_CTRL, 0x01012fff);
 - 	sh_mmcif_writel(base, MMCIF_CE_CLK_CTRL,
 - 			CLK_ENABLE | CLKDIV_4 | SRSPTO_256 |
 - 			SRBSYTO_29 | SRWDTO_29 | SCCSTO_29);
-- 
-- 	/* CMD9 - Get CSD */
-- 	sh_mmcif_boot_cmd(base, 0x09806000, 0x00010000);
-- 
-- 	/* CMD7 - Select the card */
-- 	sh_mmcif_boot_cmd(base, 0x07400000, 0x00010000);
-- 
-- 	tmp = no_bytes / SH_MMCIF_BBS;
-- 	tmp += (no_bytes % SH_MMCIF_BBS) ? 1 : 0;
-- 
-- 	sh_mmcif_boot_do_read(base, 512, tmp, buf);
-- }
-- 
   #endif /* __SH_MMCIF_H__ */