diff options
author | unsik Kim <donari75@gmail.com> | 2009-06-16 02:40:20 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-06-16 02:40:20 -0400 |
commit | 5ced504b1bd1979378de35c56aa5d3d79fb5033f (patch) | |
tree | cdaa8b872762e25ad1b426423b1a0bacfecb7783 | |
parent | e475bba2fdee9c3dbfe25f026f8fb8de69508ad2 (diff) |
mg_disk: seperate mg_disk.h again
eec9462088a26c046d4db3100796a340a50890b8 fold mg_disk.h into mg_disk.c,
but mg_disk platform driver needs private data for operation. This also
make mg_disk.c as machine independent. Seperate only needed structure and
defines to mg_disk.h
Signed-off-by: unsik Kim <donari75@gmail.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r-- | drivers/block/mg_disk.c | 28 | ||||
-rw-r--r-- | include/linux/mg_disk.h | 45 |
2 files changed, 46 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; |
diff --git a/include/linux/mg_disk.h b/include/linux/mg_disk.h new file mode 100644 index 000000000000..e11f4d9f1c2e --- /dev/null +++ b/include/linux/mg_disk.h | |||
@@ -0,0 +1,45 @@ | |||
1 | /* | ||
2 | * include/linux/mg_disk.c | ||
3 | * | ||
4 | * Private data for mflash platform driver | ||
5 | * | ||
6 | * (c) 2008 mGine Co.,LTD | ||
7 | * (c) 2008 unsik Kim <donari75@gmail.com> | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify | ||
10 | * it under the terms of the GNU General Public License version 2 as | ||
11 | * published by the Free Software Foundation. | ||
12 | */ | ||
13 | |||
14 | #ifndef __MG_DISK_H__ | ||
15 | #define __MG_DISK_H__ | ||
16 | |||
17 | /* name for platform device */ | ||
18 | #define MG_DEV_NAME "mg_disk" | ||
19 | |||
20 | /* names of GPIO resource */ | ||
21 | #define MG_RST_PIN "mg_rst" | ||
22 | /* except MG_BOOT_DEV, reset-out pin should be assigned */ | ||
23 | #define MG_RSTOUT_PIN "mg_rstout" | ||
24 | |||
25 | /* device attribution */ | ||
26 | /* use mflash as boot device */ | ||
27 | #define MG_BOOT_DEV (1 << 0) | ||
28 | /* use mflash as storage device */ | ||
29 | #define MG_STORAGE_DEV (1 << 1) | ||
30 | /* same as MG_STORAGE_DEV, but bootloader already done reset sequence */ | ||
31 | #define MG_STORAGE_DEV_SKIP_RST (1 << 2) | ||
32 | |||
33 | /* private driver data */ | ||
34 | struct mg_drv_data { | ||
35 | /* disk resource */ | ||
36 | u32 use_polling; | ||
37 | |||
38 | /* device attribution */ | ||
39 | u32 dev_attr; | ||
40 | |||
41 | /* internally used */ | ||
42 | void *host; | ||
43 | }; | ||
44 | |||
45 | #endif | ||