Commit 7ea833df authored by Mike Rapoport's avatar Mike Rapoport Committed by Greg Kroah-Hartman

staging: sm750fb: change definition of CRT_FB_ADDRESS fields

Use stratight-forward definition of CRT_FB_ADDRESS register fields
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 d6a4cba7
......@@ -1367,13 +1367,9 @@
#define CRT_DISPLAY_CTRL_FORMAT_32 (0x2 << 0)
#define CRT_FB_ADDRESS 0x080204
#define CRT_FB_ADDRESS_STATUS 31:31
#define CRT_FB_ADDRESS_STATUS_CURRENT 0
#define CRT_FB_ADDRESS_STATUS_PENDING 1
#define CRT_FB_ADDRESS_EXT 27:27
#define CRT_FB_ADDRESS_EXT_LOCAL 0
#define CRT_FB_ADDRESS_EXT_EXTERNAL 1
#define CRT_FB_ADDRESS_ADDRESS 25:0
#define CRT_FB_ADDRESS_STATUS BIT(31)
#define CRT_FB_ADDRESS_EXT BIT(27)
#define CRT_FB_ADDRESS_ADDRESS_MASK 0x3ffffff
#define CRT_FB_WIDTH 0x080208
#define CRT_FB_WIDTH_WIDTH_SHIFT 16
......
......@@ -548,8 +548,8 @@ int hw_sm750_pan_display(struct lynxfb_crtc *crtc,
(total & PANEL_FB_ADDRESS_ADDRESS_MASK));
} else {
POKE32(CRT_FB_ADDRESS,
FIELD_VALUE(PEEK32(CRT_FB_ADDRESS),
CRT_FB_ADDRESS, ADDRESS, total));
PEEK32(CRT_FB_ADDRESS) |
(total & CRT_FB_ADDRESS_ADDRESS_MASK));
}
return 0;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment