diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-01-01 22:09:31 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-01-02 07:44:57 -0500 |
commit | 15e5318c9cb92dc49f1326bce44798575e3b5774 (patch) | |
tree | 16a321bdd30f80ad0e7af610357b3c29837e8c52 /drivers/ata/pata_samsung_cf.c | |
parent | 96f7f6bd855cc47988e3efb1efc4926404ae6f60 (diff) |
ata: pata_samsung_cf: Merge pata_samsung_cf.h into pata_samsung_cf.c
Since pata_samsung_cf.h is referenced only by pata_samsung_cf.c, merge
it into the .c file.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/pata_samsung_cf.c')
-rw-r--r-- | drivers/ata/pata_samsung_cf.c | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c index e04d70b7ce76..cd2746b169a9 100644 --- a/drivers/ata/pata_samsung_cf.c +++ b/drivers/ata/pata_samsung_cf.c | |||
@@ -24,11 +24,47 @@ | |||
24 | #include <linux/slab.h> | 24 | #include <linux/slab.h> |
25 | 25 | ||
26 | #include <linux/platform_data/ata-samsung_cf.h> | 26 | #include <linux/platform_data/ata-samsung_cf.h> |
27 | #include "pata_samsung_cf.h" | ||
28 | 27 | ||
29 | #define DRV_NAME "pata_samsung_cf" | 28 | #define DRV_NAME "pata_samsung_cf" |
30 | #define DRV_VERSION "0.1" | 29 | #define DRV_VERSION "0.1" |
31 | 30 | ||
31 | #define S3C_CFATA_REG(x) (x) | ||
32 | #define S3C_CFATA_MUX S3C_CFATA_REG(0x0) | ||
33 | #define S3C_ATA_CTRL S3C_CFATA_REG(0x0) | ||
34 | #define S3C_ATA_STATUS S3C_CFATA_REG(0x4) | ||
35 | #define S3C_ATA_CMD S3C_CFATA_REG(0x8) | ||
36 | #define S3C_ATA_SWRST S3C_CFATA_REG(0xc) | ||
37 | #define S3C_ATA_IRQ S3C_CFATA_REG(0x10) | ||
38 | #define S3C_ATA_IRQ_MSK S3C_CFATA_REG(0x14) | ||
39 | #define S3C_ATA_CFG S3C_CFATA_REG(0x18) | ||
40 | |||
41 | #define S3C_ATA_MDMA_TIME S3C_CFATA_REG(0x28) | ||
42 | #define S3C_ATA_PIO_TIME S3C_CFATA_REG(0x2c) | ||
43 | #define S3C_ATA_UDMA_TIME S3C_CFATA_REG(0x30) | ||
44 | #define S3C_ATA_XFR_NUM S3C_CFATA_REG(0x34) | ||
45 | #define S3C_ATA_XFR_CNT S3C_CFATA_REG(0x38) | ||
46 | #define S3C_ATA_TBUF_START S3C_CFATA_REG(0x3c) | ||
47 | #define S3C_ATA_TBUF_SIZE S3C_CFATA_REG(0x40) | ||
48 | #define S3C_ATA_SBUF_START S3C_CFATA_REG(0x44) | ||
49 | #define S3C_ATA_SBUF_SIZE S3C_CFATA_REG(0x48) | ||
50 | #define S3C_ATA_CADR_TBUF S3C_CFATA_REG(0x4c) | ||
51 | #define S3C_ATA_CADR_SBUF S3C_CFATA_REG(0x50) | ||
52 | #define S3C_ATA_PIO_DTR S3C_CFATA_REG(0x54) | ||
53 | #define S3C_ATA_PIO_FED S3C_CFATA_REG(0x58) | ||
54 | #define S3C_ATA_PIO_SCR S3C_CFATA_REG(0x5c) | ||
55 | #define S3C_ATA_PIO_LLR S3C_CFATA_REG(0x60) | ||
56 | #define S3C_ATA_PIO_LMR S3C_CFATA_REG(0x64) | ||
57 | #define S3C_ATA_PIO_LHR S3C_CFATA_REG(0x68) | ||
58 | #define S3C_ATA_PIO_DVR S3C_CFATA_REG(0x6c) | ||
59 | #define S3C_ATA_PIO_CSD S3C_CFATA_REG(0x70) | ||
60 | #define S3C_ATA_PIO_DAD S3C_CFATA_REG(0x74) | ||
61 | #define S3C_ATA_PIO_READY S3C_CFATA_REG(0x78) | ||
62 | #define S3C_ATA_PIO_RDATA S3C_CFATA_REG(0x7c) | ||
63 | |||
64 | #define S3C_CFATA_MUX_TRUEIDE 0x01 | ||
65 | #define S3C_ATA_CFG_SWAP 0x40 | ||
66 | #define S3C_ATA_CFG_IORDYEN 0x02 | ||
67 | |||
32 | enum s3c_cpu_type { | 68 | enum s3c_cpu_type { |
33 | TYPE_S3C64XX, | 69 | TYPE_S3C64XX, |
34 | TYPE_S5PC100, | 70 | TYPE_S5PC100, |