diff options
Diffstat (limited to 'drivers/staging/dt3155/dt3155_io.h')
| -rw-r--r-- | drivers/staging/dt3155/dt3155_io.h | 58 |
1 files changed, 2 insertions, 56 deletions
diff --git a/drivers/staging/dt3155/dt3155_io.h b/drivers/staging/dt3155/dt3155_io.h index d1a25100169f..1c7d4d73950a 100644 --- a/drivers/staging/dt3155/dt3155_io.h +++ b/drivers/staging/dt3155/dt3155_io.h @@ -34,11 +34,6 @@ MA 02111-1307 USA #ifndef DT3155_IO_INC #define DT3155_IO_INC -/* macros to access registers */ - -#define WriteMReg(Address, Data) (*((u32 *)(Address)) = Data) -#define ReadMReg(Address, Data) (Data = *((u32 *)(Address))) - /***************** 32 bit register globals **************/ /* offsets for 32-bit memory mapped registers */ @@ -211,35 +206,6 @@ typedef union dma_upper_lmt_tag { } DMA_UPPER_LMT_R; -/* - * Global declarations of local copies of boards' 32 bit registers - */ -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; -extern CSR1_R csr1_r; -extern RETRY_WAIT_CNT_R retry_wait_cnt_r; -extern INT_CSR_R int_csr_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; -extern IIC_CLK_DUR_R iic_clk_dur_r; -extern IIC_CSR1_R iic_csr1_r; -extern IIC_CSR2_R iic_csr2_r; -extern DMA_UPPER_LMT_R even_dma_upper_lmt_r; -extern DMA_UPPER_LMT_R odd_dma_upper_lmt_r; - - - /***************** 8 bit I2C register globals ***********/ #define CSR2 0x010 /* indices of 8-bit I2C mapped reg's*/ #define EVEN_CSR 0x011 @@ -330,29 +296,9 @@ typedef union i2c_ad_cmd_tag { } I2C_AD_CMD; -/***** Global declarations of local copies of boards' 8 bit I2C registers ***/ - -extern I2C_CSR2 i2c_csr2; -extern I2C_EVEN_CSR i2c_even_csr; -extern I2C_ODD_CSR i2c_odd_csr; -extern I2C_CONFIG i2c_config; -extern u8 i2c_dt_id; -extern u8 i2c_x_clip_start; -extern u8 i2c_y_clip_start; -extern u8 i2c_x_clip_end; -extern u8 i2c_y_clip_end; -extern u8 i2c_ad_addr; -extern u8 i2c_ad_lut; -extern I2C_AD_CMD i2c_ad_cmd; -extern u8 i2c_dig_out; -extern u8 i2c_pm_lut_addr; -extern u8 i2c_pm_lut_data; - -/* Functions for Global use */ - /* 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 |