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

[~shefty/rdma-dev.git] / include / linux / mmc / sh_mmcif.h

diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h
index cfcc6e320e2fa5d3823bbf58b3747c1cf10fe147..bf173502d74418784c0c12128b43419a1242ceb3 100644 (file)
--- a/include/linux/mmc/sh_mmcif.h
+++ b/include/linux/mmc/sh_mmcif.h
@@ -14,8 +14,9 @@
 #ifndef __SH_MMCIF_H__
 #define __SH_MMCIF_H__
 
 #ifndef __SH_MMCIF_H__
 #define __SH_MMCIF_H__
 

-#include <linux/platform_device.h>

 #include <linux/io.h>
 #include <linux/io.h>

+#include <linux/platform_device.h>
+#include <linux/sh_dma.h>

 
 /*
  * MMCIF : CE_CLK_CTRL [19:16]
 
 /*
  * MMCIF : CE_CLK_CTRL [19:16]


@@ -31,13 +32,19 @@
  * 1111 : Peripheral clock (sup_pclk set '1')
  */
 
  * 1111 : Peripheral clock (sup_pclk set '1')
  */
 

+struct sh_mmcif_dma {
+       struct sh_dmae_slave chan_priv_tx;
+       struct sh_dmae_slave chan_priv_rx;
+};
+

 struct sh_mmcif_plat_data {
        void (*set_pwr)(struct platform_device *pdev, int state);
        void (*down_pwr)(struct platform_device *pdev);
        int (*get_cd)(struct platform_device *pdef);
 struct sh_mmcif_plat_data {
        void (*set_pwr)(struct platform_device *pdev, int state);
        void (*down_pwr)(struct platform_device *pdev);
        int (*get_cd)(struct platform_device *pdef);

-       u8      sup_pclk;       /* 1 :SH7757, 0: SH7724/SH7372 */
-       unsigned long caps;
-       u32     ocr;
+       struct sh_mmcif_dma     *dma;
+       u8                      sup_pclk;       /* 1 :SH7757, 0: SH7724/SH7372 */
+       unsigned long           caps;
+       u32                     ocr;

 };
 
 #define MMCIF_CE_CMD_SET       0x00000000
 };
 
 #define MMCIF_CE_CMD_SET       0x00000000