aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/skd_s1120.h
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2013-11-05 06:37:06 -0500
committerJens Axboe <axboe@kernel.dk>2013-11-08 11:10:30 -0500
commit7f74e5e94477b7b859c239661399af1fe37927f8 (patch)
treebf26a3d91351eea00fa8f548aee646d8469ba7b0 /drivers/block/skd_s1120.h
parentebedd16dab5e7cf22fb1156b74fa53f0233389a7 (diff)
skd: remove SKD_OMIT_FROM_SRC_DIST ifdefs
SKD_OMIT_FROM_SRC_DIST is never defined. Cc: Akhil Bhansali <abhansali@stec-inc.com> Cc: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/skd_s1120.h')
-rw-r--r--drivers/block/skd_s1120.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/block/skd_s1120.h b/drivers/block/skd_s1120.h
index bf01941cdd62..426581e6d170 100644
--- a/drivers/block/skd_s1120.h
+++ b/drivers/block/skd_s1120.h
@@ -21,11 +21,9 @@
21#define FIT_QCMD_QID_MASK (0x3 << 1) 21#define FIT_QCMD_QID_MASK (0x3 << 1)
22#define FIT_QCMD_QID0 (0x0 << 1) 22#define FIT_QCMD_QID0 (0x0 << 1)
23#define FIT_QCMD_QID_NORMAL FIT_QCMD_QID0 23#define FIT_QCMD_QID_NORMAL FIT_QCMD_QID0
24#ifndef SKD_OMIT_FROM_SRC_DIST
25#define FIT_QCMD_QID1 (0x1 << 1) 24#define FIT_QCMD_QID1 (0x1 << 1)
26#define FIT_QCMD_QID2 (0x2 << 1) 25#define FIT_QCMD_QID2 (0x2 << 1)
27#define FIT_QCMD_QID3 (0x3 << 1) 26#define FIT_QCMD_QID3 (0x3 << 1)
28#endif /* SKD_OMIT_FROM_SRC_DIST */
29#define FIT_QCMD_FLUSH_QUEUE (0ull) /* add QID */ 27#define FIT_QCMD_FLUSH_QUEUE (0ull) /* add QID */
30#define FIT_QCMD_MSGSIZE_MASK (0x3 << 4) 28#define FIT_QCMD_MSGSIZE_MASK (0x3 << 4)
31#define FIT_QCMD_MSGSIZE_64 (0x0 << 4) 29#define FIT_QCMD_MSGSIZE_64 (0x0 << 4)
@@ -39,13 +37,9 @@
39 * Control, 32-bit r/w 37 * Control, 32-bit r/w
40 */ 38 */
41#define FIT_CONTROL 0x500u 39#define FIT_CONTROL 0x500u
42#ifndef SKD_OMIT_FROM_SRC_DIST
43#define FIT_CR_HARD_RESET (1u << 0u) 40#define FIT_CR_HARD_RESET (1u << 0u)
44#endif /* SKD_OMIT_FROM_SRC_DIST */
45#define FIT_CR_SOFT_RESET (1u << 1u) 41#define FIT_CR_SOFT_RESET (1u << 1u)
46#ifndef SKD_OMIT_FROM_SRC_DIST
47#define FIT_CR_DIS_TIMESTAMPS (1u << 6u) 42#define FIT_CR_DIS_TIMESTAMPS (1u << 6u)
48#endif /* SKD_OMIT_FROM_SRC_DIST */
49#define FIT_CR_ENABLE_INTERRUPTS (1u << 7u) 43#define FIT_CR_ENABLE_INTERRUPTS (1u << 7u)
50 44
51/* 45/*
@@ -53,10 +47,8 @@
53 */ 47 */
54#define FIT_STATUS 0x510u 48#define FIT_STATUS 0x510u
55#define FIT_SR_DRIVE_STATE_MASK 0x000000FFu 49#define FIT_SR_DRIVE_STATE_MASK 0x000000FFu
56#ifndef SKD_OMIT_FROM_SRC_DIST
57#define FIT_SR_SIGNATURE (0xFF << 8) 50#define FIT_SR_SIGNATURE (0xFF << 8)
58#define FIT_SR_PIO_DMA (1 << 16) 51#define FIT_SR_PIO_DMA (1 << 16)
59#endif /* SKD_OMIT_FROM_SRC_DIST */
60#define FIT_SR_DRIVE_OFFLINE 0x00 52#define FIT_SR_DRIVE_OFFLINE 0x00
61#define FIT_SR_DRIVE_INIT 0x01 53#define FIT_SR_DRIVE_INIT 0x01
62/* #define FIT_SR_DRIVE_READY 0x02 */ 54/* #define FIT_SR_DRIVE_READY 0x02 */
@@ -74,14 +66,12 @@
74#define FIT_SR_DEVICE_MISSING 0xFF 66#define FIT_SR_DEVICE_MISSING 0xFF
75#define FIT_SR__RESERVED 0xFFFFFF00u 67#define FIT_SR__RESERVED 0xFFFFFF00u
76 68
77#ifndef SKD_OMIT_FROM_SRC_DIST
78/* 69/*
79 * FIT_STATUS - Status register data definition 70 * FIT_STATUS - Status register data definition
80 */ 71 */
81#define FIT_SR_STATE_MASK (0xFF << 0) 72#define FIT_SR_STATE_MASK (0xFF << 0)
82#define FIT_SR_SIGNATURE (0xFF << 8) 73#define FIT_SR_SIGNATURE (0xFF << 8)
83#define FIT_SR_PIO_DMA (1 << 16) 74#define FIT_SR_PIO_DMA (1 << 16)
84#endif /* SKD_OMIT_FROM_SRC_DIST */
85 75
86 76
87/* 77/*
@@ -189,10 +179,8 @@
189#define FIT_MFD_PM_SLEEP 0x17u 179#define FIT_MFD_PM_SLEEP 0x17u
190#define FIT_MFD_CMD_PROGRESS 0x18u 180#define FIT_MFD_CMD_PROGRESS 0x18u
191 181
192#ifndef SKD_OMIT_FROM_SRC_DIST
193#define FIT_MTD_DEBUG 0xFEu 182#define FIT_MTD_DEBUG 0xFEu
194#define FIT_MFD_DEBUG 0xFFu 183#define FIT_MFD_DEBUG 0xFFu
195#endif /* SKD_OMIT_FROM_SRC_DIST */
196 184
197#define FIT_MFD_MASK (0xFFu) 185#define FIT_MFD_MASK (0xFFu)
198#define FIT_MFD_DATA_MASK (0xFFu) 186#define FIT_MFD_DATA_MASK (0xFFu)
@@ -248,7 +236,6 @@ struct fit_msg_hdr {
248#define FIT_PROTOCOL_MINOR_VER(mtd_val) ((mtd_val >> 16) & 0xF) 236#define FIT_PROTOCOL_MINOR_VER(mtd_val) ((mtd_val >> 16) & 0xF)
249#define FIT_PROTOCOL_MAJOR_VER(mtd_val) ((mtd_val >> 20) & 0xF) 237#define FIT_PROTOCOL_MAJOR_VER(mtd_val) ((mtd_val >> 20) & 0xF)
250 238
251#ifndef SKD_OMIT_FROM_SRC_DIST
252/* 239/*
253 * Format of a completion entry. The completion queue is circular 240 * Format of a completion entry. The completion queue is circular
254 * and must have at least as many entries as the maximum number 241 * and must have at least as many entries as the maximum number
@@ -264,7 +251,6 @@ struct fit_msg_hdr {
264 * Command_context is opaque and taken verbatim from the SSDI command. 251 * Command_context is opaque and taken verbatim from the SSDI command.
265 * All other fields are big endian. 252 * All other fields are big endian.
266 */ 253 */
267#endif /* SKD_OMIT_FROM_SRC_DIST */
268#define FIT_PROTOCOL_VERSION_0 0 254#define FIT_PROTOCOL_VERSION_0 0
269 255
270/* 256/*