diff options
| author | Mike Rapoport | 2016-02-15 18:53:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-02-16 03:26:17 +0100 |
| commit | 3d5158d3e3d307f0d3cd76305bce5ddc9f4b5628 (patch) | |
| tree | 84dcb15af50285e2475a9d6683c576b2782fe8ea /drivers/staging/sm750fb | |
| parent | staging: sm750fb: change definition of CRT_HORIZONTAL_SYNC fields (diff) | |
| download | kernel-qcow2-linux-3d5158d3e3d307f0d3cd76305bce5ddc9f4b5628.tar.gz kernel-qcow2-linux-3d5158d3e3d307f0d3cd76305bce5ddc9f4b5628.tar.xz kernel-qcow2-linux-3d5158d3e3d307f0d3cd76305bce5ddc9f4b5628.zip | |
staging: sm750fb: change definition of CRT_VERTICAL_TOTAL fields
Use stratight-forward definition of CRT_VERTICAL_TOTAL register fields
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>
Diffstat (limited to 'drivers/staging/sm750fb')
| -rw-r--r-- | drivers/staging/sm750fb/ddk750_mode.c | 7 | ||||
| -rw-r--r-- | drivers/staging/sm750fb/ddk750_reg.h | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/drivers/staging/sm750fb/ddk750_mode.c b/drivers/staging/sm750fb/ddk750_mode.c index d425ea1bbe76..c8862e844a54 100644 --- a/drivers/staging/sm750fb/ddk750_mode.c +++ b/drivers/staging/sm750fb/ddk750_mode.c @@ -97,8 +97,11 @@ static int programModeRegisters(mode_parameter_t *pModeParam, pll_value_t *pll) CRT_HORIZONTAL_SYNC_START_MASK)); POKE32(CRT_VERTICAL_TOTAL, - FIELD_VALUE(0, CRT_VERTICAL_TOTAL, TOTAL, pModeParam->vertical_total - 1) - | FIELD_VALUE(0, CRT_VERTICAL_TOTAL, DISPLAY_END, pModeParam->vertical_display_end - 1)); + (((pModeParam->vertical_total - 1) << + CRT_VERTICAL_TOTAL_TOTAL_SHIFT) & + CRT_VERTICAL_TOTAL_TOTAL_MASK) | + ((pModeParam->vertical_display_end - 1) & + CRT_VERTICAL_TOTAL_DISPLAY_END_MASK)); POKE32(CRT_VERTICAL_SYNC, FIELD_VALUE(0, CRT_VERTICAL_SYNC, HEIGHT, pModeParam->vertical_sync_height) diff --git a/drivers/staging/sm750fb/ddk750_reg.h b/drivers/staging/sm750fb/ddk750_reg.h index fc6fa2349ebc..7b076a554a97 100644 --- a/drivers/staging/sm750fb/ddk750_reg.h +++ b/drivers/staging/sm750fb/ddk750_reg.h @@ -1387,8 +1387,9 @@ #define CRT_HORIZONTAL_SYNC_START_MASK 0xfff #define CRT_VERTICAL_TOTAL 0x080214 -#define CRT_VERTICAL_TOTAL_TOTAL 26:16 -#define CRT_VERTICAL_TOTAL_DISPLAY_END 10:0 +#define CRT_VERTICAL_TOTAL_TOTAL_SHIFT 16 +#define CRT_VERTICAL_TOTAL_TOTAL_MASK (0x7ff << 16) +#define CRT_VERTICAL_TOTAL_DISPLAY_END_MASK (0x7ff) #define CRT_VERTICAL_SYNC 0x080218 #define CRT_VERTICAL_SYNC_HEIGHT 21:16 |