bsps/arm: Fix PL111 register define re-definition

Close #3502.
This commit is contained in:
Sebastian Huber
2018-08-20 08:35:26 +02:00
parent dcaea71741
commit 2cd3716103
2 changed files with 2 additions and 2 deletions

View File

@@ -89,7 +89,7 @@ typedef struct {
#define PL111_LCD_CONTROL_LCD_BPP_8 0x03U
#define PL111_LCD_CONTROL_LCD_BPP_16 0x04U
#define PL111_LCD_CONTROL_LCD_BPP_24 0x05U
#define PL111_LCD_CONTROL_LCD_BPP_16 0x06U
#define PL111_LCD_CONTROL_LCD_BPP_16_5_6_5 0x06U
#define PL111_LCD_CONTROL_LCD_BPP_12 0x07U
#define PL111_LCD_CONTROL_LCD_BW BSP_BIT32(4)
#define PL111_LCD_CONTROL_LCD_TFT BSP_BIT32(5)

View File

@@ -117,7 +117,7 @@ static const pl111_fb_config fb_config = {
| PL111_LCD_TIMING2_PCD_HI(0x0),
.timing3 = 0x0,
.control = PL111_LCD_CONTROL_LCD_TFT
| PL111_LCD_CONTROL_LCD_BPP(PL111_LCD_CONTROL_LCD_BPP_16)
| PL111_LCD_CONTROL_LCD_BPP(PL111_LCD_CONTROL_LCD_BPP_16_5_6_5)
| PL111_LCD_CONTROL_BGR,
.power_delay_in_us = 100000,