From d0e9df082fbd4f20e96b00d205f66f28e61fb8b9 Mon Sep 17 00:00:00 2001
From: "jianzhen.guo" <jianzhen.guo@ingenic.com>
Date: Fri, 24 Feb 2023 11:42:40 +0800
Subject: [PATCH] [Update] Update x2000 lcd driver.

---
 hardware/chip/x1600/hal/lcd/drv_dpu.c       |  3 ---
 hardware/chip/x2000/hal/lcd/display/fw050.c | 12 ++++++------
 hardware/chip/x2000/hal/lcd/drv_dpu.c       | 10 ++++------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/hardware/chip/x1600/hal/lcd/drv_dpu.c b/hardware/chip/x1600/hal/lcd/drv_dpu.c
index 28148cdc..5cd27014 100644
--- a/hardware/chip/x1600/hal/lcd/drv_dpu.c
+++ b/hardware/chip/x1600/hal/lcd/drv_dpu.c
@@ -50,9 +50,6 @@ int8_t ingenic_dpu_init(void)
     /*使能时钟*/
     CPM_CGU_LCD_Start(CPM_Instance, &LcdCguConfig);
     CPM_GATE_Enable(CPM_Instance, CPM_CLKID_LCD);
-#ifdef HAL_LCD_X2000_ENABLED
-    CPM_GATE_Enable(CPM_Instance, CPM_CLKID_MIPI_DSI);
-#endif
 
     ll_request_irq(IRQ_INTC0_LCD, lcdc_irq_handler, (void *)&LCD_Handle);
 
diff --git a/hardware/chip/x2000/hal/lcd/display/fw050.c b/hardware/chip/x2000/hal/lcd/display/fw050.c
index 72c34c94..a81b59d4 100644
--- a/hardware/chip/x2000/hal/lcd/display/fw050.c
+++ b/hardware/chip/x2000/hal/lcd/display/fw050.c
@@ -294,18 +294,18 @@ static void fw050_init(void)
 
 static void fw050_power_on(void)
 {
-    LL_GPIO_setPinMode(GPIOC_Instance, 3, GPIO_MODE_OUTPUT0);//power en
-    LL_GPIO_setPinMode(GPIOC_Instance, 1, GPIO_MODE_OUTPUT1);//pwm1
+    LL_GPIO_setPinMode(PC_Instance, 3, GPIO_MODE_OUTPUT0);//power en
+    LL_GPIO_setPinMode(PC_Instance, 1, GPIO_MODE_OUTPUT1);//pwm1
 
-    LL_GPIO_setPinMode(GPIOC_Instance, 4, GPIO_MODE_OUTPUT0);//reset
+    LL_GPIO_setPinMode(PC_Instance, 4, GPIO_MODE_OUTPUT0);//reset
     lcd_delay(20000000);
-    LL_GPIO_setPinMode(GPIOC_Instance, 4, GPIO_MODE_OUTPUT1);
+    LL_GPIO_setPinMode(PC_Instance, 4, GPIO_MODE_OUTPUT1);
     lcd_delay(500000);
 }
 
 static void fw050_power_off(void)
 {
-    LL_GPIO_setPinMode(GPIOC_Instance, 3, GPIO_MODE_OUTPUT1);
-    LL_GPIO_setPinMode(GPIOC_Instance, 1, GPIO_MODE_OUTPUT0);
+    LL_GPIO_setPinMode(PC_Instance, 3, GPIO_MODE_OUTPUT1);
+    LL_GPIO_setPinMode(PC_Instance, 1, GPIO_MODE_OUTPUT0);
 }
 
diff --git a/hardware/chip/x2000/hal/lcd/drv_dpu.c b/hardware/chip/x2000/hal/lcd/drv_dpu.c
index a4511518..b36b0a31 100644
--- a/hardware/chip/x2000/hal/lcd/drv_dpu.c
+++ b/hardware/chip/x2000/hal/lcd/drv_dpu.c
@@ -7,9 +7,9 @@
 #include <string.h>
 #include <sys/ioctl.h>
 
-#include <x16xx_hal.h>
-#include <x16xx_sysclk_conf.h>
-#include <x16xx_hal_lcd.h>
+#include <x2000_hal.h>
+#include <x2000_sysclk_conf.h>
+#include <x2000_hal_lcd.h>
 
 HAL_LockTypeDef lcd_lock;
 LCD_HandleTypeDef LCD_Handle;
@@ -43,16 +43,14 @@ int8_t ingenic_dpu_init(void)
     LCD_Handle.lock = &lcd_lock;
 
     for(i = 0; i < lcdc_data.frame_mem * MAX_SRDMA_DESC_NUM; i++){
-         framebuffer[i] = 0xffffff;
+         framebuffer[i] = 0xff0000;
     }
     CleanDCache_by_Addr((unsigned long*)framebuffer, lcdc_data.frame_size);
 
     /*使能时钟*/
     CPM_CGU_LCD_Start(CPM_Instance, &LcdCguConfig);
     CPM_GATE_Enable(CPM_Instance, CPM_CLKID_LCD);
-#ifdef HAL_LCD_X2000_ENABLED
     CPM_GATE_Enable(CPM_Instance, CPM_CLKID_MIPI_DSI);
-#endif
 
     ll_request_irq(IRQ_INTC0_LCD, lcdc_irq_handler, (void *)&LCD_Handle);
 
-- 
Gitee