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

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

Replace complex defintion of VGA_CONFIGURATION register fields with BIT()
macro and use open-coded implementation for VGA_CONFIGURATION
manipulations.
Signed-off-by: default avatarMike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cf25a704
...@@ -211,8 +211,7 @@ int ddk750_initHw(initchip_param_t *pInitParam) ...@@ -211,8 +211,7 @@ int ddk750_initHw(initchip_param_t *pInitParam)
if (getChipType() != SM750LE) { if (getChipType() != SM750LE) {
/* set panel pll and graphic mode via mmio_88 */ /* set panel pll and graphic mode via mmio_88 */
reg = PEEK32(VGA_CONFIGURATION); reg = PEEK32(VGA_CONFIGURATION);
reg = FIELD_SET(reg, VGA_CONFIGURATION, PLL, PANEL); reg |= (VGA_CONFIGURATION_PLL | VGA_CONFIGURATION_MODE);
reg = FIELD_SET(reg, VGA_CONFIGURATION, MODE, GRAPHIC);
POKE32(VGA_CONFIGURATION, reg); POKE32(VGA_CONFIGURATION, reg);
} else { } else {
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
......
...@@ -548,12 +548,8 @@ ...@@ -548,12 +548,8 @@
#define VGA_CONFIGURATION 0x000088 #define VGA_CONFIGURATION 0x000088
#define VGA_CONFIGURATION_USER_DEFINE 5:4 #define VGA_CONFIGURATION_USER_DEFINE 5:4
#define VGA_CONFIGURATION_PLL 2:2 #define VGA_CONFIGURATION_PLL BIT(2)
#define VGA_CONFIGURATION_PLL_VGA 0 #define VGA_CONFIGURATION_MODE BIT(1)
#define VGA_CONFIGURATION_PLL_PANEL 1
#define VGA_CONFIGURATION_MODE 1:1
#define VGA_CONFIGURATION_MODE_TEXT 0
#define VGA_CONFIGURATION_MODE_GRAPHIC 1
#endif #endif
......
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