Staging: dt3155: Cleanup memory mapped i/o access
[firefly-linux-kernel-4.4.55.git] / drivers / staging / dt3155 / dt3155_io.h
index dd25a79bdee974dbf55adf2637a0c317fe240e3f..a9aa75405dfc39bf3f1d6f088903bcf0717c38dc 100644 (file)
@@ -34,11 +34,6 @@ MA 02111-1307 USA
 #ifndef DT3155_IO_INC
 #define DT3155_IO_INC
 
-/* macros to access registers */
-
-#define WriteMReg(Address, Data)       (*((u_long *)(Address)) = Data)
-#define ReadMReg(Address, Data)                (Data = *((u_long *)(Address)))
-
 /***************** 32 bit register globals  **************/
 
 /*  offsets for 32-bit memory mapped registers */
@@ -71,114 +66,114 @@ MA 02111-1307 USA
 /******** Assignments and Typedefs for 32 bit Memory Mapped Registers ********/
 
 typedef union fifo_trigger_tag {
-       u_long   reg;
+       u32   reg;
        struct {
-               u_long PACKED:6;
-               u_long       :9;
-               u_long PLANER:7;
-               u_long       :9;
+               u32 PACKED:6;
+               u32       :9;
+               u32 PLANER:7;
+               u32       :9;
        } fld;
 } FIFO_TRIGGER_R;
 
 typedef union xfer_mode_tag {
-       u_long   reg;
+       u32   reg;
        struct {
-               u_long             :2;
-               u_long FIELD_TOGGLE:1;
-               u_long             :5;
-               u_long             :2;
-               u_long             :22;
+               u32             :2;
+               u32 FIELD_TOGGLE:1;
+               u32             :5;
+               u32             :2;
+               u32             :22;
        } fld;
 } XFER_MODE_R;
 
 typedef union csr1_tag {
-       u_long   reg;
+       u32   reg;
        struct {
-               u_long CAP_CONT_EVE:1;
-               u_long CAP_CONT_ODD:1;
-               u_long CAP_SNGL_EVE:1;
-               u_long CAP_SNGL_ODD:1;
-               u_long FLD_DN_EVE  :1;
-               u_long FLD_DN_ODD  :1;
-               u_long SRST        :1;
-               u_long FIFO_EN     :1;
-               u_long FLD_CRPT_EVE:1;
-               u_long FLD_CRPT_ODD:1;
-               u_long ADDR_ERR_EVE:1;
-               u_long ADDR_ERR_ODD:1;
-               u_long CRPT_DIS    :1;
-               u_long RANGE_EN    :1;
-               u_long             :16;
+               u32 CAP_CONT_EVE:1;
+               u32 CAP_CONT_ODD:1;
+               u32 CAP_SNGL_EVE:1;
+               u32 CAP_SNGL_ODD:1;
+               u32 FLD_DN_EVE  :1;
+               u32 FLD_DN_ODD  :1;
+               u32 SRST        :1;
+               u32 FIFO_EN     :1;
+               u32 FLD_CRPT_EVE:1;
+               u32 FLD_CRPT_ODD:1;
+               u32 ADDR_ERR_EVE:1;
+               u32 ADDR_ERR_ODD:1;
+               u32 CRPT_DIS    :1;
+               u32 RANGE_EN    :1;
+               u32             :16;
        } fld;
 } CSR1_R;
 
 typedef union retry_wait_cnt_tag {
-       u_long   reg;
+       u32   reg;
        struct {
-               u_long RTRY_WAIT_CNT:8;
-               u_long              :24;
+               u32 RTRY_WAIT_CNT:8;
+               u32              :24;
        } fld;
 } RETRY_WAIT_CNT_R;
 
 typedef union int_csr_tag {
-       u_long   reg;
+       u32   reg;
        struct {
-               u_long FLD_END_EVE   :1;
-               u_long FLD_END_ODD   :1;
-               u_long FLD_START     :1;
-               u_long               :5;
-               u_long FLD_END_EVE_EN:1;
-               u_long FLD_END_ODD_EN:1;
-               u_long FLD_START_EN  :1;
-               u_long               :21;
+               u32 FLD_END_EVE   :1;
+               u32 FLD_END_ODD   :1;
+               u32 FLD_START     :1;
+               u32               :5;
+               u32 FLD_END_EVE_EN:1;
+               u32 FLD_END_ODD_EN:1;
+               u32 FLD_START_EN  :1;
+               u32               :21;
        } fld;
 } INT_CSR_R;
 
 typedef union mask_length_tag {
-       u_long   reg;
+       u32   reg;
        struct {
-               u_long MASK_LEN_EVE:5;
-               u_long             :11;
-               u_long MASK_LEN_ODD:5;
-               u_long             :11;
+               u32 MASK_LEN_EVE:5;
+               u32             :11;
+               u32 MASK_LEN_ODD:5;
+               u32             :11;
        } fld;
 } MASK_LENGTH_R;
 
 typedef union fifo_flag_cnt_tag {
-       u_long   reg;
+       u32   reg;
        struct {
-               u_long AF_COUNT:7;
-               u_long         :9;
-               u_long AE_COUNT:7;
-               u_long         :9;
+               u32 AF_COUNT:7;
+               u32         :9;
+               u32 AE_COUNT:7;
+               u32         :9;
        } fld;
 } FIFO_FLAG_CNT_R;
 
 typedef union iic_clk_dur {
-       u_long   reg;
+       u32   reg;
        struct {
-               u_long PHASE_1:8;
-               u_long PHASE_2:8;
-               u_long PHASE_3:8;
-               u_long PHASE_4:8;
+               u32 PHASE_1:8;
+               u32 PHASE_2:8;
+               u32 PHASE_3:8;
+               u32 PHASE_4:8;
        } fld;
 } IIC_CLK_DUR_R;
 
 typedef union iic_csr1_tag {
-       u_long   reg;
+       u32   reg;
        struct {
-               u_long AUTO_EN     :1;
-               u_long BYPASS      :1;
-               u_long SDA_OUT     :1;
-               u_long SCL_OUT     :1;
-               u_long             :4;
-               u_long AUTO_ABORT  :1;
-               u_long DIRECT_ABORT:1;
-               u_long SDA_IN      :1;
-               u_long SCL_IN      :1;
-               u_long             :4;
-               u_long AUTO_ADDR   :8;
-               u_long RD_DATA     :8;
+               u32 AUTO_EN     :1;
+               u32 BYPASS      :1;
+               u32 SDA_OUT     :1;
+               u32 SCL_OUT     :1;
+               u32             :4;
+               u32 AUTO_ABORT  :1;
+               u32 DIRECT_ABORT:1;
+               u32 SDA_IN      :1;
+               u32 SCL_IN      :1;
+               u32             :4;
+               u32 AUTO_ADDR   :8;
+               u32 RD_DATA     :8;
        } fld;
 } IIC_CSR1_R;
 
@@ -186,14 +181,14 @@ typedef union iic_csr1_tag {
  * iic_csr2_tag
  */
 typedef union iic_csr2_tag {
-       u_long   reg;
+       u32   reg;
        struct {
-               u_long DIR_WR_DATA :8;
-               u_long DIR_SUB_ADDR:8;
-               u_long DIR_RD      :1;
-               u_long DIR_ADDR    :7;
-               u_long NEW_CYCLE   :1;
-               u_long             :7;
+               u32 DIR_WR_DATA :8;
+               u32 DIR_SUB_ADDR:8;
+               u32 DIR_RD      :1;
+               u32 DIR_ADDR    :7;
+               u32 NEW_CYCLE   :1;
+               u32             :7;
        } fld;
 }  IIC_CSR2_R;
 
@@ -203,10 +198,10 @@ typedef union iic_csr2_tag {
  * dma_upper_lmt_tag
  */
 typedef union dma_upper_lmt_tag   {
-       u_long reg;
+       u32 reg;
        struct {
-               u_long DMA_UPPER_LMT_VAL:24;
-               u_long                  :8;
+               u32 DMA_UPPER_LMT_VAL:24;
+               u32                  :8;
        } fld;
 } DMA_UPPER_LMT_R;
 
@@ -214,12 +209,12 @@ typedef union dma_upper_lmt_tag   {
 /*
  * Global declarations of local copies of boards' 32 bit registers
  */
-extern u_long even_dma_start_r;                /*  bit 0 should always be 0 */
-extern u_long odd_dma_start_r;         /*               ..          */
-extern u_long even_dma_stride_r;       /*  bits 0&1 should always be 0 */
-extern u_long odd_dma_stride_r;                /*               ..             */
-extern u_long even_pixel_fmt_r;
-extern u_long odd_pixel_fmt_r;
+extern u32 even_dma_start_r;           /*  bit 0 should always be 0 */
+extern u32 odd_dma_start_r;            /*               ..          */
+extern u32 even_dma_stride_r;  /*  bits 0&1 should always be 0 */
+extern u32 odd_dma_stride_r;           /*               ..             */
+extern u32 even_pixel_fmt_r;
+extern u32 odd_pixel_fmt_r;
 
 extern FIFO_TRIGGER_R          fifo_trigger_r;
 extern XFER_MODE_R             xfer_mode_r;
@@ -227,8 +222,8 @@ extern CSR1_R                       csr1_r;
 extern RETRY_WAIT_CNT_R                retry_wait_cnt_r;
 extern INT_CSR_R               int_csr_r;
 
-extern u_long even_fld_mask_r;
-extern u_long odd_fld_mask_r;
+extern u32 even_fld_mask_r;
+extern u32 odd_fld_mask_r;
 
 extern MASK_LENGTH_R           mask_length_r;
 extern FIFO_FLAG_CNT_R         fifo_flag_cnt_r;
@@ -352,7 +347,7 @@ extern u8                   i2c_pm_lut_data;
 
 /* access 8-bit IIC registers */
 
-extern int ReadI2C(u8 *lpReg, u_short wIregIndex, u8 *byVal);
-extern int WriteI2C(u8 *lpReg, u_short wIregIndex, u8 byVal);
+extern int ReadI2C(void __iomem *mmio, u_short wIregIndex, u8 *byVal);
+extern int WriteI2C(void __iomem *mmio, u_short wIregIndex, u8 byVal);
 
 #endif