Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 672f75b0 authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman
Browse files

staging: sm750fb: change definition of HWC_ADDRESS fields 



Use BIT() macro for single-bit fields of HWC_ADDRESS register and
define HWC_ADDRESS_ADDRESS_MASK for masking the address bits.

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

drivers/staging/sm750fb/sm750_cursor.c

+5 −13
Original line number Diff line number Diff line
@@ -28,16 +28,10 @@ writel((data), cursor->mmio + (addr)) 


/* cursor control for voyager and 718/750*/

#define HWC_ADDRESS                         0x0

#define HWC_ADDRESS_ENABLE                  31:31

#define HWC_ADDRESS_ENABLE_DISABLE          0

#define HWC_ADDRESS_ENABLE_ENABLE           1

#define HWC_ADDRESS_EXT                     27:27

#define HWC_ADDRESS_EXT_LOCAL               0

#define HWC_ADDRESS_EXT_EXTERNAL            1

#define HWC_ADDRESS_CS                      26:26

#define HWC_ADDRESS_CS_0                    0

#define HWC_ADDRESS_CS_1                    1

#define HWC_ADDRESS_ADDRESS                 25:0

#define HWC_ADDRESS_ENABLE                  BIT(31)

#define HWC_ADDRESS_EXT                     BIT(27)

#define HWC_ADDRESS_CS                      BIT(26)

#define HWC_ADDRESS_ADDRESS_MASK            0x3ffffff



#define HWC_LOCATION                        0x4

#define HWC_LOCATION_TOP                    27:27
@@ -62,9 +56,7 @@ void hw_cursor_enable(struct lynx_cursor *cursor) 
{

	u32 reg;



	reg = FIELD_VALUE(0, HWC_ADDRESS, ADDRESS, cursor->offset)|

			FIELD_SET(0, HWC_ADDRESS, EXT, LOCAL)|

			FIELD_SET(0, HWC_ADDRESS, ENABLE, ENABLE);

	reg = (cursor->offset & HWC_ADDRESS_ADDRESS_MASK) | HWC_ADDRESS_ENABLE;

	POKE32(HWC_ADDRESS, reg);

}

void hw_cursor_disable(struct lynx_cursor *cursor)