diff options
Diffstat (limited to 'include/linux/mmc/sh_mmcif.h')
-rw-r--r-- | include/linux/mmc/sh_mmcif.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h index e7d5dd67bb74..ccd8fb2cad52 100644 --- a/include/linux/mmc/sh_mmcif.h +++ b/include/linux/mmc/sh_mmcif.h | |||
@@ -16,7 +16,6 @@ | |||
16 | 16 | ||
17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
19 | #include <linux/sh_dma.h> | ||
20 | 19 | ||
21 | /* | 20 | /* |
22 | * MMCIF : CE_CLK_CTRL [19:16] | 21 | * MMCIF : CE_CLK_CTRL [19:16] |
@@ -33,12 +32,12 @@ | |||
33 | */ | 32 | */ |
34 | 33 | ||
35 | struct sh_mmcif_plat_data { | 34 | struct sh_mmcif_plat_data { |
36 | void (*set_pwr)(struct platform_device *pdev, int state); | ||
37 | void (*down_pwr)(struct platform_device *pdev); | ||
38 | int (*get_cd)(struct platform_device *pdef); | 35 | int (*get_cd)(struct platform_device *pdef); |
39 | unsigned int slave_id_tx; /* embedded slave_id_[tr]x */ | 36 | unsigned int slave_id_tx; /* embedded slave_id_[tr]x */ |
40 | unsigned int slave_id_rx; | 37 | unsigned int slave_id_rx; |
41 | bool use_cd_gpio : 1; | 38 | bool use_cd_gpio : 1; |
39 | bool ccs_unsupported : 1; | ||
40 | bool clk_ctrl2_present : 1; | ||
42 | unsigned int cd_gpio; | 41 | unsigned int cd_gpio; |
43 | u8 sup_pclk; /* 1 :SH7757, 0: SH7724/SH7372 */ | 42 | u8 sup_pclk; /* 1 :SH7757, 0: SH7724/SH7372 */ |
44 | unsigned long caps; | 43 | unsigned long caps; |
@@ -62,6 +61,7 @@ struct sh_mmcif_plat_data { | |||
62 | #define MMCIF_CE_INT_MASK 0x00000044 | 61 | #define MMCIF_CE_INT_MASK 0x00000044 |
63 | #define MMCIF_CE_HOST_STS1 0x00000048 | 62 | #define MMCIF_CE_HOST_STS1 0x00000048 |
64 | #define MMCIF_CE_HOST_STS2 0x0000004C | 63 | #define MMCIF_CE_HOST_STS2 0x0000004C |
64 | #define MMCIF_CE_CLK_CTRL2 0x00000070 | ||
65 | #define MMCIF_CE_VERSION 0x0000007C | 65 | #define MMCIF_CE_VERSION 0x0000007C |
66 | 66 | ||
67 | /* CE_BUF_ACC */ | 67 | /* CE_BUF_ACC */ |