staging: ks7010: move sdio specific register definitions into source file

This commit moves SDIO related register definitions from header
to source file. There is no need to have those into the header
because they are only being used in specific SDIO code.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/ks7010/ks7010_sdio.c b/drivers/staging/ks7010/ks7010_sdio.c
index d3401242d9b7d799eaecf6613d7f534d380eeafd..2029b49196ed707da66089be3dbf1ca3e2e23b6c 100644 (file)
--- a/drivers/staging/ks7010/ks7010_sdio.c
+++ b/drivers/staging/ks7010/ks7010_sdio.c
@@ -23,6 +23,78 @@
 #include "ks7010_sdio.h"
 
 #define ROM_FILE "ks7010sd.rom"
+
+/*  SDIO KeyStream vendor and device */
+#define SDIO_VENDOR_ID_KS_CODE_A       0x005b
+#define SDIO_VENDOR_ID_KS_CODE_B       0x0023
+
+/* Older sources suggest earlier versions were named 7910 or 79xx */
+#define SDIO_DEVICE_ID_KS_7010         0x7910
+
+/* Read/Write Status Register */
+#define READ_STATUS            0x000000
+#define WRITE_STATUS           0x00000C
+enum reg_status_type {
+       REG_STATUS_BUSY,
+       REG_STATUS_IDLE
+};
+
+/* Read Index Register */
+#define READ_INDEX             0x000004
+
+/* Read Data Size Register */
+#define READ_DATA_SIZE         0x000008
+
+/* Write Index Register */
+#define WRITE_INDEX            0x000010
+
+/* Write Status/Read Data Size Register
+ * for network packet (less than 2048 bytes data)
+ */
+#define WSTATUS_RSIZE          0x000014
+#define WSTATUS_MASK           0x80    /* Write Status Register value */
+#define RSIZE_MASK             0x7F    /* Read Data Size Register value [10:4] */
+
+/* ARM to SD interrupt Enable */
+#define INT_ENABLE             0x000020
+/* ARM to SD interrupt Pending */
+#define INT_PENDING            0x000024
+
+#define INT_GCR_B              BIT(7)
+#define INT_GCR_A              BIT(6)
+#define INT_WRITE_STATUS       BIT(5)
+#define INT_WRITE_INDEX        BIT(4)
+#define INT_WRITE_SIZE         BIT(3)
+#define INT_READ_STATUS        BIT(2)
+#define INT_READ_INDEX         BIT(1)
+#define INT_READ_SIZE          BIT(0)
+
+/* General Communication Register A */
+#define GCR_A                  0x000028
+enum gen_com_reg_a {
+       GCR_A_INIT,
+       GCR_A_REMAP,
+       GCR_A_RUN
+};
+
+/* General Communication Register B */
+#define GCR_B                  0x00002C
+enum gen_com_reg_b {
+       GCR_B_ACTIVE,
+       GCR_B_DOZE
+};
+
+/* Wakeup Register */
+#define WAKEUP                 0x008018
+#define WAKEUP_REQ             0x5a
+
+/* AHB Data Window  0x010000-0x01FFFF */
+#define DATA_WINDOW            0x010000
+#define WINDOW_SIZE            (64 * 1024)
+
+#define KS7010_IRAM_ADDRESS    0x06000000
+
+
 #define KS7010_FUNC_NUM 1
 #define KS7010_IO_BLOCK_SIZE 512
 #define KS7010_MAX_CLOCK 25000000

diff --git a/drivers/staging/ks7010/ks7010_sdio.h b/drivers/staging/ks7010/ks7010_sdio.h
index 1bcdbe322e9d6b844dba8242e1f8a2478f05e636..95ac86b94a7c8b53b19bd9ab4c349e45a6b9d4b1 100644 (file)
--- a/drivers/staging/ks7010/ks7010_sdio.h
+++ b/drivers/staging/ks7010/ks7010_sdio.h
@@ -11,75 +11,6 @@
 #ifndef _KS7010_SDIO_H
 #define _KS7010_SDIO_H
 
-/*  SDIO KeyStream vendor and device */
-#define SDIO_VENDOR_ID_KS_CODE_A       0x005b
-#define SDIO_VENDOR_ID_KS_CODE_B       0x0023
-/* Older sources suggest earlier versions were named 7910 or 79xx */
-#define SDIO_DEVICE_ID_KS_7010         0x7910
-
-/* Read/Write Status Register */
-#define READ_STATUS            0x000000
-#define WRITE_STATUS           0x00000C
-enum reg_status_type {
-       REG_STATUS_BUSY,
-       REG_STATUS_IDLE
-};
-
-/* Read Index Register */
-#define READ_INDEX             0x000004
-
-/* Read Data Size Register */
-#define READ_DATA_SIZE         0x000008
-
-/* Write Index Register */
-#define WRITE_INDEX            0x000010
-
-/* Write Status/Read Data Size Register
- * for network packet (less than 2048 bytes data)
- */
-#define WSTATUS_RSIZE          0x000014
-#define WSTATUS_MASK           0x80    /* Write Status Register value */
-#define RSIZE_MASK             0x7F    /* Read Data Size Register value [10:4] */
-
-/* ARM to SD interrupt Enable */
-#define INT_ENABLE             0x000020
-/* ARM to SD interrupt Pending */
-#define INT_PENDING            0x000024
-
-#define INT_GCR_B              BIT(7)
-#define INT_GCR_A              BIT(6)
-#define INT_WRITE_STATUS       BIT(5)
-#define INT_WRITE_INDEX        BIT(4)
-#define INT_WRITE_SIZE         BIT(3)
-#define INT_READ_STATUS        BIT(2)
-#define INT_READ_INDEX         BIT(1)
-#define INT_READ_SIZE          BIT(0)
-
-/* General Communication Register A */
-#define GCR_A                  0x000028
-enum gen_com_reg_a {
-       GCR_A_INIT,
-       GCR_A_REMAP,
-       GCR_A_RUN
-};
-
-/* General Communication Register B */
-#define GCR_B                  0x00002C
-enum gen_com_reg_b {
-       GCR_B_ACTIVE,
-       GCR_B_DOZE
-};
-
-/* Wakeup Register */
-#define WAKEUP                 0x008018
-#define WAKEUP_REQ             0x5a
-
-/* AHB Data Window  0x010000-0x01FFFF */
-#define DATA_WINDOW            0x010000
-#define WINDOW_SIZE            (64 * 1024)
-
-#define KS7010_IRAM_ADDRESS    0x06000000
-
 /**
  * struct ks_sdio_card - SDIO device data.
  *