diff options
| author | Mike Rapoport | 2016-02-15 18:53:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-02-16 03:26:17 +0100 |
| commit | aed4b787b080a5d26ec6afc9acf40a9b219d8949 (patch) | |
| tree | bd4d675d2d15bc648e941d491b49ea45702c0e3f /drivers/staging/sm750fb | |
| parent | staging: sm750fb: change definition of CRT_AUTO_CENTERING_TL fields (diff) | |
| download | kernel-qcow2-linux-aed4b787b080a5d26ec6afc9acf40a9b219d8949.tar.gz kernel-qcow2-linux-aed4b787b080a5d26ec6afc9acf40a9b219d8949.tar.xz kernel-qcow2-linux-aed4b787b080a5d26ec6afc9acf40a9b219d8949.zip | |
staging: sm750fb: change definition of CRT_AUTO_CENTERING_BR fields
Use stratight-forward definition of CRT_AUTO_CENTERING_BR 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 | 5 | ||||
| -rw-r--r-- | drivers/staging/sm750fb/ddk750_reg.h | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/staging/sm750fb/ddk750_mode.c b/drivers/staging/sm750fb/ddk750_mode.c index 9e762183e3f3..6c6a5c9cc50c 100644 --- a/drivers/staging/sm750fb/ddk750_mode.c +++ b/drivers/staging/sm750fb/ddk750_mode.c @@ -28,8 +28,9 @@ static unsigned long displayControlAdjust_SM750LE(mode_parameter_t *pModeParam, POKE32(CRT_AUTO_CENTERING_TL, 0); POKE32(CRT_AUTO_CENTERING_BR, - FIELD_VALUE(0, CRT_AUTO_CENTERING_BR, BOTTOM, y - 1) - | FIELD_VALUE(0, CRT_AUTO_CENTERING_BR, RIGHT, x - 1)); + (((y - 1) << CRT_AUTO_CENTERING_BR_BOTTOM_SHIFT) & + CRT_AUTO_CENTERING_BR_BOTTOM_MASK) | + ((x - 1) & CRT_AUTO_CENTERING_BR_RIGHT_MASK)); /* Assume common fields in dispControl have been properly set before calling this function. diff --git a/drivers/staging/sm750fb/ddk750_reg.h b/drivers/staging/sm750fb/ddk750_reg.h index 1d8d577c6a73..990d4e301b88 100644 --- a/drivers/staging/sm750fb/ddk750_reg.h +++ b/drivers/staging/sm750fb/ddk750_reg.h @@ -1481,8 +1481,9 @@ #define CRT_AUTO_CENTERING_TL_LEFT_MASK 0x7ff #define CRT_AUTO_CENTERING_BR 0x080284 - #define CRT_AUTO_CENTERING_BR_BOTTOM 26:16 - #define CRT_AUTO_CENTERING_BR_RIGHT 10:0 + #define CRT_AUTO_CENTERING_BR_BOTTOM_MASK (0x7ff << 16) + #define CRT_AUTO_CENTERING_BR_BOTTOM_SHIFT 16 + #define CRT_AUTO_CENTERING_BR_RIGHT_MASK 0x7ff #endif /* sm750le new register to control panel output */ |