diff options
| author | Mike Rapoport | 2016-02-10 17:34:12 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-02-12 04:52:37 +0100 |
| commit | 26a3cc907c324261e3d0f76869f856d1273528d5 (patch) | |
| tree | b71b19d7e88e0beba33024ee671e5d25adfce8fe /drivers/staging/sm750fb | |
| parent | staging: sm750fb: change definition of PANEL_FB_ADDRESS fields (diff) | |
| download | kernel-qcow2-linux-26a3cc907c324261e3d0f76869f856d1273528d5.tar.gz kernel-qcow2-linux-26a3cc907c324261e3d0f76869f856d1273528d5.tar.xz kernel-qcow2-linux-26a3cc907c324261e3d0f76869f856d1273528d5.zip | |
staging: sm750fb: change definition of PANEL_FB_WIDTH fields
Use stratight-forward defintion of PANEL_FB_WIDTH register fields and use
open-coded implementation for register manipulations
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/sm750fb')
| -rw-r--r-- | drivers/staging/sm750fb/ddk750_reg.h | 5 | ||||
| -rw-r--r-- | drivers/staging/sm750fb/sm750_hw.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/staging/sm750fb/ddk750_reg.h b/drivers/staging/sm750fb/ddk750_reg.h index 1b96af3f475d..7e0cc95ae290 100644 --- a/drivers/staging/sm750fb/ddk750_reg.h +++ b/drivers/staging/sm750fb/ddk750_reg.h @@ -833,8 +833,9 @@ #define PANEL_FB_ADDRESS_ADDRESS_MASK 0x1ffffff #define PANEL_FB_WIDTH 0x080010 -#define PANEL_FB_WIDTH_WIDTH 29:16 -#define PANEL_FB_WIDTH_OFFSET 13:0 +#define PANEL_FB_WIDTH_WIDTH_SHIFT 16 +#define PANEL_FB_WIDTH_WIDTH_MASK (0x3fff << 16) +#define PANEL_FB_WIDTH_OFFSET_MASK 0x3fff #define PANEL_WINDOW_WIDTH 0x080014 #define PANEL_WINDOW_WIDTH_WIDTH 27:16 diff --git a/drivers/staging/sm750fb/sm750_hw.c b/drivers/staging/sm750fb/sm750_hw.c index 938ea7262646..9e350b459e9a 100644 --- a/drivers/staging/sm750fb/sm750_hw.c +++ b/drivers/staging/sm750fb/sm750_hw.c @@ -313,10 +313,10 @@ int hw_sm750_crtc_setMode(struct lynxfb_crtc *crtc, reg = var->xres * (var->bits_per_pixel >> 3); /* crtc->channel is not equal to par->index on numeric,be aware of that */ reg = ALIGN(reg, crtc->line_pad); - - POKE32(PANEL_FB_WIDTH, - FIELD_VALUE(0, PANEL_FB_WIDTH, WIDTH, reg)| - FIELD_VALUE(0, PANEL_FB_WIDTH, OFFSET, fix->line_length)); + reg = (reg << PANEL_FB_WIDTH_WIDTH_SHIFT) & + PANEL_FB_WIDTH_WIDTH_MASK; + reg |= (fix->line_length & PANEL_FB_WIDTH_OFFSET_MASK); + POKE32(PANEL_FB_WIDTH, reg); POKE32(PANEL_WINDOW_WIDTH, FIELD_VALUE(0, PANEL_WINDOW_WIDTH, WIDTH, var->xres - 1)| |