diff options
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/mg_disk.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index 60de5a01e71e..f703f5478246 100644 --- a/drivers/block/mg_disk.c +++ b/drivers/block/mg_disk.c | |||
@@ -22,13 +22,12 @@ | |||
22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <linux/gpio.h> | 24 | #include <linux/gpio.h> |
25 | #include <linux/mg_disk.h> | ||
25 | 26 | ||
26 | #define MG_RES_SEC (CONFIG_MG_DISK_RES << 1) | 27 | #define MG_RES_SEC (CONFIG_MG_DISK_RES << 1) |
27 | 28 | ||
28 | /* name for block device */ | 29 | /* name for block device */ |
29 | #define MG_DISK_NAME "mgd" | 30 | #define MG_DISK_NAME "mgd" |
30 | /* name for platform device */ | ||
31 | #define MG_DEV_NAME "mg_disk" | ||
32 | 31 | ||
33 | #define MG_DISK_MAJ 0 | 32 | #define MG_DISK_MAJ 0 |
34 | #define MG_DISK_MAX_PART 16 | 33 | #define MG_DISK_MAX_PART 16 |
@@ -103,33 +102,8 @@ | |||
103 | #define MG_TMAX_SWRST_TO_RDY 500 | 102 | #define MG_TMAX_SWRST_TO_RDY 500 |
104 | #define MG_TMAX_RSTOUT 3000 | 103 | #define MG_TMAX_RSTOUT 3000 |
105 | 104 | ||
106 | /* device attribution */ | ||
107 | /* use mflash as boot device */ | ||
108 | #define MG_BOOT_DEV (1 << 0) | ||
109 | /* use mflash as storage device */ | ||
110 | #define MG_STORAGE_DEV (1 << 1) | ||
111 | /* same as MG_STORAGE_DEV, but bootloader already done reset sequence */ | ||
112 | #define MG_STORAGE_DEV_SKIP_RST (1 << 2) | ||
113 | |||
114 | #define MG_DEV_MASK (MG_BOOT_DEV | MG_STORAGE_DEV | MG_STORAGE_DEV_SKIP_RST) | 105 | #define MG_DEV_MASK (MG_BOOT_DEV | MG_STORAGE_DEV | MG_STORAGE_DEV_SKIP_RST) |
115 | 106 | ||
116 | /* names of GPIO resource */ | ||
117 | #define MG_RST_PIN "mg_rst" | ||
118 | /* except MG_BOOT_DEV, reset-out pin should be assigned */ | ||
119 | #define MG_RSTOUT_PIN "mg_rstout" | ||
120 | |||
121 | /* private driver data */ | ||
122 | struct mg_drv_data { | ||
123 | /* disk resource */ | ||
124 | u32 use_polling; | ||
125 | |||
126 | /* device attribution */ | ||
127 | u32 dev_attr; | ||
128 | |||
129 | /* internally used */ | ||
130 | struct mg_host *host; | ||
131 | }; | ||
132 | |||
133 | /* main structure for mflash driver */ | 107 | /* main structure for mflash driver */ |
134 | struct mg_host { | 108 | struct mg_host { |
135 | struct device *dev; | 109 | struct device *dev; |