Commit 0f23be70 authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman
Browse files

staging: sm750fb: use BIT macro for DMA_ABORT_INTERRUPT single-bit fields 



Replace complex definition of DMA_ABORT_INTERRUPT register fields with
BIT() macro and use open-coded implementation for register manipulation

Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27b047bb

drivers/staging/sm750fb/ddk750_chip.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ int ddk750_initHw(initchip_param_t *pInitParam) 


		/* Disable DMA Channel, if a former application left it on */

		reg = PEEK32(DMA_ABORT_INTERRUPT);

		reg = FIELD_SET(reg, DMA_ABORT_INTERRUPT, ABORT_1, ABORT);

		reg |= DMA_ABORT_INTERRUPT_ABORT_1;

		POKE32(DMA_ABORT_INTERRUPT, reg);



		/* Disable DMA Power, if a former application left it on */

drivers/staging/sm750fb/ddk750_reg.h

+4 −16
Original line number Diff line number Diff line
@@ -1973,22 +1973,10 @@ 
#define DMA_1_SIZE_CONTROL_SIZE                         23:0



#define DMA_ABORT_INTERRUPT                             0x0D0020

#define DMA_ABORT_INTERRUPT_ABORT_1                     5:5

#define DMA_ABORT_INTERRUPT_ABORT_1_ENABLE              0

#define DMA_ABORT_INTERRUPT_ABORT_1_ABORT               1

#define DMA_ABORT_INTERRUPT_ABORT_0                     4:4

#define DMA_ABORT_INTERRUPT_ABORT_0_ENABLE              0

#define DMA_ABORT_INTERRUPT_ABORT_0_ABORT               1

#define DMA_ABORT_INTERRUPT_INT_1                       1:1

#define DMA_ABORT_INTERRUPT_INT_1_CLEAR                 0

#define DMA_ABORT_INTERRUPT_INT_1_FINISHED              1

#define DMA_ABORT_INTERRUPT_INT_0                       0:0

#define DMA_ABORT_INTERRUPT_INT_0_CLEAR                 0

#define DMA_ABORT_INTERRUPT_INT_0_FINISHED              1









#define DMA_ABORT_INTERRUPT_ABORT_1                     BIT(5)

#define DMA_ABORT_INTERRUPT_ABORT_0                     BIT(4)

#define DMA_ABORT_INTERRUPT_INT_1                       BIT(1)

#define DMA_ABORT_INTERRUPT_INT_0                       BIT(0)



/* Default i2c CLK and Data GPIO. These are the default i2c pins */

#define DEFAULT_I2C_SCL                     30