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

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

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/sm750fb/ddk750_display.c b/drivers/staging/sm750fb/ddk750_display.c
index fb5523c445ce739ed0e1d7267c76fc44ecdd2c5a..7bb6fd4276080e98c40f98b595900a741d9de153 100644 (file)
--- a/drivers/staging/sm750fb/ddk750_display.c
+++ b/drivers/staging/sm750fb/ddk750_display.c
@@ -155,7 +155,7 @@ void ddk750_setLogicalDispOut(disp_output_t output)
                reg = PEEK32(CRT_DISPLAY_CTRL);
                reg = FIELD_VALUE(reg, CRT_DISPLAY_CTRL, SELECT, (output & CRT_2_MASK)>>CRT_2_OFFSET);
                /*se blank off */
-               reg = FIELD_SET(reg, CRT_DISPLAY_CTRL, BLANK, OFF);
+               reg &= ~CRT_DISPLAY_CTRL_BLANK;
                POKE32(CRT_DISPLAY_CTRL, reg);
 
        }

diff --git a/drivers/staging/sm750fb/ddk750_mode.c b/drivers/staging/sm750fb/ddk750_mode.c
index 1edb235305919eaa8b584a01b4d9055ca005b78c..96fd4bfb34948995f4f782c42ddc08f9cf8f49d1 100644 (file)
--- a/drivers/staging/sm750fb/ddk750_mode.c
+++ b/drivers/staging/sm750fb/ddk750_mode.c
@@ -61,8 +61,7 @@ static unsigned long displayControlAdjust_SM750LE(mode_parameter_t *pModeParam,
        dispControl = FIELD_SET(dispControl, CRT_DISPLAY_CTRL, CLK, PLL25);
 
        /* Set bit 25:24 of display controller */
-       dispControl = FIELD_SET(dispControl, CRT_DISPLAY_CTRL, CRTSELECT, CRT);
-       dispControl = FIELD_SET(dispControl, CRT_DISPLAY_CTRL, RGBBIT, 24BIT);
+       dispControl |= (CRT_DISPLAY_CTRL_CRTSELECT | CRT_DISPLAY_CTRL_RGBBIT);
 
        /* Set bit 14 of display controller */
        dispControl = DISPLAY_CTRL_CLOCK_PHASE;

diff --git a/drivers/staging/sm750fb/ddk750_reg.h b/drivers/staging/sm750fb/ddk750_reg.h
index 73f3c34c236ed639017af68e650d554fb909309e..446bb85e55e0181908561a42802a89dbb2f18d8e 100644 (file)
--- a/drivers/staging/sm750fb/ddk750_reg.h
+++ b/drivers/staging/sm750fb/ddk750_reg.h
@@ -1331,38 +1331,19 @@
 #define CRT_DISPLAY_CTRL_CLK_PLL80                    5
 #define CRT_DISPLAY_CTRL_CLK_PLL108                   6
 #define CRT_DISPLAY_CTRL_CLK_RESERVED                 7
-#define CRT_DISPLAY_CTRL_SHIFT_VGA_DAC                26:26
-#define CRT_DISPLAY_CTRL_SHIFT_VGA_DAC_DISABLE        1
-#define CRT_DISPLAY_CTRL_SHIFT_VGA_DAC_ENABLE         0
+#define CRT_DISPLAY_CTRL_SHIFT_VGA_DAC                BIT(26)
 
 /* SM750LE definition */
-#define CRT_DISPLAY_CTRL_CRTSELECT                    25:25
-#define CRT_DISPLAY_CTRL_CRTSELECT_VGA                0
-#define CRT_DISPLAY_CTRL_CRTSELECT_CRT                1
-#define CRT_DISPLAY_CTRL_RGBBIT                       24:24
-#define CRT_DISPLAY_CTRL_RGBBIT_24BIT                 0
-#define CRT_DISPLAY_CTRL_RGBBIT_12BIT                 1
+#define CRT_DISPLAY_CTRL_CRTSELECT                    BIT(25)
+#define CRT_DISPLAY_CTRL_RGBBIT                       BIT(24)
 
 #ifndef VALIDATION_CHIP
-    #define CRT_DISPLAY_CTRL_SHIFT_VGA_DAC            26:26
-    #define CRT_DISPLAY_CTRL_SHIFT_VGA_DAC_DISABLE    1
-    #define CRT_DISPLAY_CTRL_SHIFT_VGA_DAC_ENABLE     0
-    #define CRT_DISPLAY_CTRL_CENTERING                24:24
-    #define CRT_DISPLAY_CTRL_CENTERING_DISABLE        0
-    #define CRT_DISPLAY_CTRL_CENTERING_ENABLE         1
+    #define CRT_DISPLAY_CTRL_CENTERING                BIT(24)
 #endif
-#define CRT_DISPLAY_CTRL_LOCK_TIMING                  23:23
-#define CRT_DISPLAY_CTRL_LOCK_TIMING_DISABLE          0
-#define CRT_DISPLAY_CTRL_LOCK_TIMING_ENABLE           1
-#define CRT_DISPLAY_CTRL_EXPANSION                    22:22
-#define CRT_DISPLAY_CTRL_EXPANSION_DISABLE            0
-#define CRT_DISPLAY_CTRL_EXPANSION_ENABLE             1
-#define CRT_DISPLAY_CTRL_VERTICAL_MODE                21:21
-#define CRT_DISPLAY_CTRL_VERTICAL_MODE_REPLICATE      0
-#define CRT_DISPLAY_CTRL_VERTICAL_MODE_INTERPOLATE    1
-#define CRT_DISPLAY_CTRL_HORIZONTAL_MODE              20:20
-#define CRT_DISPLAY_CTRL_HORIZONTAL_MODE_REPLICATE    0
-#define CRT_DISPLAY_CTRL_HORIZONTAL_MODE_INTERPOLATE  1
+#define CRT_DISPLAY_CTRL_LOCK_TIMING                  BIT(23)
+#define CRT_DISPLAY_CTRL_EXPANSION                    BIT(22)
+#define CRT_DISPLAY_CTRL_VERTICAL_MODE                BIT(21)
+#define CRT_DISPLAY_CTRL_HORIZONTAL_MODE              BIT(20)
 #define CRT_DISPLAY_CTRL_SELECT                       19:18
 #define CRT_DISPLAY_CTRL_SELECT_PANEL                 0
 #define CRT_DISPLAY_CTRL_SELECT_VGA                   1
@@ -1372,9 +1353,7 @@
 #define CRT_DISPLAY_CTRL_FIFO_3                       1
 #define CRT_DISPLAY_CTRL_FIFO_7                       2
 #define CRT_DISPLAY_CTRL_FIFO_11                      3
-#define CRT_DISPLAY_CTRL_BLANK                        10:10
-#define CRT_DISPLAY_CTRL_BLANK_OFF                    0
-#define CRT_DISPLAY_CTRL_BLANK_ON                     1
+#define CRT_DISPLAY_CTRL_BLANK                        BIT(10)
 #define CRT_DISPLAY_CTRL_PIXEL                        7:4
 #define CRT_DISPLAY_CTRL_FORMAT                       1:0
 #define CRT_DISPLAY_CTRL_FORMAT_8                     0

diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c
index 5951d1a03c29abb522b1fd719240bd15f6ed066e..ce08e6c13f03b3d88908236ef93b3408c55e3692 100644 (file)
--- a/drivers/staging/sm750fb/sm750_hw.c
+++ b/drivers/staging/sm750fb/sm750_hw.c
@@ -378,31 +378,35 @@ int hw_sm750le_setBLANK(struct lynxfb_output *output, int blank)
        switch (blank) {
        case FB_BLANK_UNBLANK:
                dpms = CRT_DISPLAY_CTRL_DPMS_0;
-               crtdb = CRT_DISPLAY_CTRL_BLANK_OFF;
+               crtdb = 0;
                break;
        case FB_BLANK_NORMAL:
                dpms = CRT_DISPLAY_CTRL_DPMS_0;
-               crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
+               crtdb = CRT_DISPLAY_CTRL_BLANK;
                break;
        case FB_BLANK_VSYNC_SUSPEND:
                dpms = CRT_DISPLAY_CTRL_DPMS_2;
-               crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
+               crtdb = CRT_DISPLAY_CTRL_BLANK;
                break;
        case FB_BLANK_HSYNC_SUSPEND:
                dpms = CRT_DISPLAY_CTRL_DPMS_1;
-               crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
+               crtdb = CRT_DISPLAY_CTRL_BLANK;
                break;
        case FB_BLANK_POWERDOWN:
                dpms = CRT_DISPLAY_CTRL_DPMS_3;
-               crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
+               crtdb = CRT_DISPLAY_CTRL_BLANK;
                break;
        default:
                return -EINVAL;
        }
 
        if (output->paths & sm750_crt) {
+               unsigned int val;
+
                POKE32(CRT_DISPLAY_CTRL, FIELD_VALUE(PEEK32(CRT_DISPLAY_CTRL), CRT_DISPLAY_CTRL, DPMS, dpms));
-               POKE32(CRT_DISPLAY_CTRL, FIELD_VALUE(PEEK32(CRT_DISPLAY_CTRL), CRT_DISPLAY_CTRL, BLANK, crtdb));
+
+               val = PEEK32(CRT_DISPLAY_CTRL) & ~CRT_DISPLAY_CTRL_BLANK;
+               POKE32(CRT_DISPLAY_CTRL, val | crtdb);
        }
        return 0;
 }
@@ -418,24 +422,23 @@ int hw_sm750_setBLANK(struct lynxfb_output *output, int blank)
                pr_debug("flag = FB_BLANK_UNBLANK\n");
                dpms = SYSTEM_CTRL_DPMS_VPHP;
                pps = PANEL_DISPLAY_CTRL_DATA;
-               crtdb = CRT_DISPLAY_CTRL_BLANK_OFF;
                break;
        case FB_BLANK_NORMAL:
                pr_debug("flag = FB_BLANK_NORMAL\n");
                dpms = SYSTEM_CTRL_DPMS_VPHP;
-               crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
+               crtdb = CRT_DISPLAY_CTRL_BLANK;
                break;
        case FB_BLANK_VSYNC_SUSPEND:
                dpms = SYSTEM_CTRL_DPMS_VNHP;
-               crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
+               crtdb = CRT_DISPLAY_CTRL_BLANK;
                break;
        case FB_BLANK_HSYNC_SUSPEND:
                dpms = SYSTEM_CTRL_DPMS_VPHN;
-               crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
+               crtdb = CRT_DISPLAY_CTRL_BLANK;
                break;
        case FB_BLANK_POWERDOWN:
                dpms = SYSTEM_CTRL_DPMS_VNHN;
-               crtdb = CRT_DISPLAY_CTRL_BLANK_ON;
+               crtdb = CRT_DISPLAY_CTRL_BLANK;
                break;
        }
 
@@ -443,7 +446,9 @@ int hw_sm750_setBLANK(struct lynxfb_output *output, int blank)
                unsigned int val = PEEK32(SYSTEM_CTRL) & ~SYSTEM_CTRL_DPMS_MASK;
 
                POKE32(SYSTEM_CTRL, val | dpms);
-               POKE32(CRT_DISPLAY_CTRL, FIELD_VALUE(PEEK32(CRT_DISPLAY_CTRL), CRT_DISPLAY_CTRL, BLANK, crtdb));
+
+               val = PEEK32(CRT_DISPLAY_CTRL) & ~CRT_DISPLAY_CTRL_BLANK;
+               POKE32(CRT_DISPLAY_CTRL, val | crtdb);
        }
 
        if (output->paths & sm750_panel) {