[Renesas]Add ra6m4-cpk lvgl for spi-lcd support and update rt_spi_bus_attach_device_cspin function

bsp/renesas/libraries/HAL_Drivers/drv_spi.c

@@ -88,11 +88,11 @@ static rt_err_t ra_wait_complete(rt_event_t event, const char bus_name[RT_NAME_M
 static spi_bit_width_t ra_width_shift(rt_uint8_t data_width)
 {
     spi_bit_width_t bit_width = SPI_BIT_WIDTH_8_BITS;
-    if(data_width == 1)
+    if (data_width == 1)
         bit_width = SPI_BIT_WIDTH_8_BITS;
-    else if(data_width == 2)
+    else if (data_width == 2)
         bit_width = SPI_BIT_WIDTH_16_BITS;
-    else if(data_width == 4)
+    else if (data_width == 4)
         bit_width = SPI_BIT_WIDTH_32_BITS;
 
     return bit_width;
@@ -101,7 +101,6 @@ static spi_bit_width_t ra_width_shift(rt_uint8_t data_width)
 static rt_err_t ra_write_message(struct rt_spi_device *device, const void *send_buf, const rt_size_t len)
 {
     RT_ASSERT(device != NULL);
-    RT_ASSERT(device->parent.user_data != NULL);
     RT_ASSERT(send_buf != NULL);
     RT_ASSERT(len > 0);
     rt_err_t err = RT_EOK;
@@ -172,7 +171,6 @@ static rt_err_t ra_hw_spi_configure(struct rt_spi_device *device,
     rt_err_t err = RT_EOK;
 
     struct ra_spi *spi_dev =  rt_container_of(device->bus, struct ra_spi, bus);
-    spi_dev->cs_pin = (rt_uint32_t)device->parent.user_data;
 
     /**< data_width : 1 -> 8 bits , 2 -> 16 bits, 4 -> 32 bits, default 32 bits*/
     rt_uint8_t data_width = configuration->data_width / 8;
@@ -183,7 +181,7 @@ static rt_err_t ra_hw_spi_configure(struct rt_spi_device *device,
     spi_extended_cfg_t *spi_cfg = (spi_extended_cfg_t *)spi_dev->ra_spi_handle_t->spi_cfg_t->p_extend;
 
     /**< Configure Select Line */
-    rt_pin_write(spi_dev->cs_pin, PIN_HIGH);
+    rt_pin_write(device->cs_pin, PIN_HIGH);
 
     /**< config bitrate */
     R_SPI_CalculateBitrate(spi_dev->rt_spi_cfg_t->max_hz, &spi_cfg->spck_div);
@@ -199,7 +197,7 @@ static rt_err_t ra_hw_spi_configure(struct rt_spi_device *device,
     return RT_EOK;
 }
 
-static rt_uint32_t ra_spixfer(struct rt_spi_device *device, struct rt_spi_message *message)
+static rt_ssize_t ra_spixfer(struct rt_spi_device *device, struct rt_spi_message *message)
 {
     RT_ASSERT(device != RT_NULL);
     RT_ASSERT(device->bus != RT_NULL);
@@ -207,14 +205,13 @@ static rt_uint32_t ra_spixfer(struct rt_spi_device *device, struct rt_spi_messag
 
     rt_err_t err = RT_EOK;
     struct ra_spi *spi_dev =  rt_container_of(device->bus, struct ra_spi, bus);
-    spi_dev->cs_pin = (rt_uint32_t)device->parent.user_data;
 
-    if (message->cs_take && !(device->config.mode & RT_SPI_NO_CS))
+    if (message->cs_take && !(device->config.mode & RT_SPI_NO_CS) && (device->cs_pin != PIN_NONE))
     {
         if (device->config.mode & RT_SPI_CS_HIGH)
-            rt_pin_write(spi_dev->cs_pin, PIN_HIGH);
+            rt_pin_write(device->cs_pin, PIN_HIGH);
         else
-            rt_pin_write(spi_dev->cs_pin, PIN_LOW);
+            rt_pin_write(device->cs_pin, PIN_LOW);
     }
 
     if (message->length > 0)
@@ -236,7 +233,7 @@ static rt_uint32_t ra_spixfer(struct rt_spi_device *device, struct rt_spi_messag
         }
     }
 
-    if (message->cs_release && !(device->config.mode & RT_SPI_NO_CS))
+    if (message->cs_release && !(device->config.mode & RT_SPI_NO_CS) && (device->cs_pin != PIN_NONE))
     {
         if (device->config.mode & RT_SPI_CS_HIGH)
             rt_pin_write(spi_dev->cs_pin, PIN_LOW);
@@ -276,17 +273,31 @@ int ra_hw_spi_init(void)
 }
 INIT_BOARD_EXPORT(ra_hw_spi_init);
 #endif
-void rt_hw_spi_device_attach(struct rt_spi_device *device, const char *device_name, const char *bus_name, void *user_data)
+/**
+  * Attach the spi device to SPI bus, this function must be used after initialization.
+  */
+rt_err_t rt_hw_spi_device_attach(const char *bus_name, const char *device_name, rt_base_t cs_pin, void *user_data)
 {
-    RT_ASSERT(device != NULL);
-    RT_ASSERT(device_name != NULL);
-    RT_ASSERT(bus_name != NULL);
-    RT_ASSERT(user_data != NULL);
+    RT_ASSERT(bus_name != RT_NULL);
+    RT_ASSERT(device_name != RT_NULL);
 
-    rt_err_t err = rt_spi_bus_attach_device(device, device_name, bus_name, user_data);
-    if (RT_EOK != err)
+    rt_err_t result;
+    struct rt_spi_device *spi_device;
+
+    /* attach the device to spi bus*/
+    spi_device = (struct rt_spi_device *)rt_malloc(sizeof(struct rt_spi_device));
+    RT_ASSERT(spi_device != RT_NULL);
+
+    result = rt_spi_bus_attach_device_cspin(spi_device, device_name, bus_name, cs_pin, user_data);
+    if (result != RT_EOK)
     {
-        LOG_E("%s attach failed.", bus_name);
+        LOG_E("%s attach to %s faild, %d\n", device_name, bus_name, result);
     }
+
+    RT_ASSERT(result == RT_EOK);
+
+    LOG_D("%s attach to %s done", device_name, bus_name);
+
+    return result;
 }
 #endif /* RT_USING_SPI */

bsp/renesas/libraries/HAL_Drivers/drv_spi.h

@@ -40,7 +40,7 @@ struct ra_spi
 };
 #endif
 
-void rt_hw_spi_device_attach(struct rt_spi_device *device, const char *device_name, const char *bus_name, void *user_data);
+rt_err_t rt_hw_spi_device_attach(const char *bus_name, const char *device_name, rt_base_t cs_pin, void *user_data);
 
 #ifdef __cplusplus
 }

bsp/renesas/ra6m3-ek/board/ports/ili9341/lcd_ili9341.c

@@ -23,24 +23,11 @@
 _lcd_dev lcddev;
 static struct rt_spi_device *lcd_dev;
 
-static void rt_hw_spi_device_attach(const char *bus_name, const char *device_name, void *cs_Pin)
-{
-    struct rt_spi_device *spi_device;
-    RT_ASSERT(device_name != NULL && bus_name != NULL);
-    spi_device = (struct rt_spi_device *)rt_malloc(sizeof(struct rt_spi_device));
-    RT_ASSERT(spi_device != RT_NULL);
-    rt_err_t err = rt_spi_bus_attach_device(spi_device, device_name, bus_name, cs_Pin);
-    if (RT_EOK != err)
-    {
-        rt_kprintf("%s attach failed.", bus_name);
-    }
-}
-
 rt_err_t spi_lcd_init(void)
 {
     rt_err_t res = RT_EOK;
 
-    rt_hw_spi_device_attach("spi0", "spi30", (void *)LCD_CS_PIN);
+    rt_hw_spi_device_attach("spi0", "spi30", LCD_CS_PIN, RT_NULL);
     lcd_dev = (struct rt_spi_device *)rt_device_find("spi30");
     if (lcd_dev != RT_NULL)
     {
@@ -59,7 +46,6 @@ rt_err_t spi_lcd_init(void)
 
     return res;
 }
-MSH_CMD_EXPORT(spi_lcd_init, lcd_spi_init);
 
 void LCD_RESET(void)
 {

bsp/renesas/ra6m4-cpk/board/Kconfig

@@ -448,6 +448,31 @@ menu "Hardware Drivers Config"
                     default n
             endif
 
+        config BSP_USING_SPI_LCD
+            bool "Enable SPI LCD"
+            select BSP_USING_GPIO
+            select BSP_USING_SPI
+            select BSP_USING_SPI1
+            default n
+
+            menuconfig BSP_USING_LVGL
+                bool "Enable LVGL for LCD"
+                select PKG_USING_LVGL
+                default n
+                if BSP_USING_LVGL      
+                    config BSP_USING_LCD_ILI9431
+                        bool "Enable LVGL for LCD_ILI9431"
+                        select BSP_USING_SPI_LCD
+                        default n
+                endif
+
+            if BSP_USING_LVGL
+                config BSP_USING_LVGL_DEMO
+                    bool "Enable LVGL demo"
+                    select PKG_USING_LV_MUSIC_DEMO
+                    default y
+            endif
+
     endmenu
 
     menu "Board extended module Drivers"

bsp/renesas/ra6m4-cpk/board/lvgl/SConscript

@@ -0,0 +1,16 @@
+from building import *
+import os
+
+cwd = GetCurrentDir()
+group = []
+src = Glob('*.c')
+CPPPATH = [cwd]
+
+list = os.listdir(cwd)
+for d in list:
+    path = os.path.join(cwd, d)
+    if os.path.isfile(os.path.join(path, 'SConscript')):
+        group = group + SConscript(os.path.join(d, 'SConscript'))
+
+group = group + DefineGroup('LVGL-port', src, depend = ['BSP_USING_LVGL'], CPPPATH = CPPPATH)
+Return('group')

bsp/renesas/ra6m4-cpk/board/lvgl/demo/SConscript

@@ -0,0 +1,17 @@
+from building import *
+import os
+
+cwd = GetCurrentDir()
+group = []
+src = Glob('*.c')
+CPPPATH = [cwd]
+
+list = os.listdir(cwd)
+for d in list:
+    path = os.path.join(cwd, d)
+    if os.path.isfile(os.path.join(path, 'SConscript')):
+        group = group + SConscript(os.path.join(d, 'SConscript'))
+
+group = group + DefineGroup('LVGL-demo', src, depend = ['BSP_USING_LVGL', 'BSP_USING_LVGL_DEMO'], CPPPATH = CPPPATH)
+
+Return('group')

bsp/renesas/ra6m4-cpk/board/lvgl/demo/lv_demo.c

@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2006-2023, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author        Notes
+ * 2021-10-17     Meco Man      First version
+ * 2022-05-10     Meco Man      improve rt-thread initialization process
+ */
+
+void lv_user_gui_init(void)
+{
+    /* display demo; you may replace with your LVGL application at here */
+    extern void lv_demo_music(void);
+    lv_demo_music();
+}

bsp/renesas/ra6m4-cpk/board/lvgl/lv_conf.h

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2006-2023, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author        Notes
+ * 2023-02-22     Rbb666        First version
+ */
+
+#ifndef LV_CONF_H
+#define LV_CONF_H
+
+#include <rtconfig.h>
+
+#define LV_USE_PERF_MONITOR         1
+#define LV_COLOR_DEPTH              16
+
+#ifdef BSP_USING_SPI_LCD
+    #define LV_HOR_RES_MAX          240
+    #define LV_VER_RES_MAX          320
+    #define LV_COLOR_16_SWAP        1
+    #define LV_DPI_DEF              99
+#endif
+
+#ifdef PKG_USING_LV_MUSIC_DEMO
+/* music player demo */
+#define LV_USE_DEMO_RTT_MUSIC       1
+#define LV_DEMO_RTT_MUSIC_AUTO_PLAY 1
+#define LV_FONT_MONTSERRAT_12       1
+#define LV_FONT_MONTSERRAT_16       1
+#define LV_COLOR_SCREEN_TRANSP      0
+#endif /* PKG_USING_LV_MUSIC_DEMO */
+
+#endif

bsp/renesas/ra6m4-cpk/board/lvgl/lv_port_disp.c

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2006-2023, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2021-11-24     Rbb666       The first version
+ */
+#include <lvgl.h>
+#include "hal_data.h"
+
+#ifdef BSP_USING_SPI_LCD
+    #include "lcd_ili9341.h"
+#endif
+
+#define COLOR_BUFFER  (LV_HOR_RES_MAX * LV_VER_RES_MAX / 4)
+
+/*A static or global variable to store the buffers*/
+static lv_disp_draw_buf_t disp_buf;
+
+/*Descriptor of a display driver*/
+static lv_disp_drv_t disp_drv;
+
+/*Static or global buffer(s). The second buffer is optional*/
+// 0x1FFE0000    0x20040000
+static lv_color_t buf_1[COLOR_BUFFER];
+static lv_color_t buf_2[COLOR_BUFFER];
+
+static void disp_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p)
+{
+#ifdef BSP_USING_SPI_LCD
+    lcd_fill_array_spi(area->x1, area->y1, area->x2, area->y2, color_p);
+#endif
+    lv_disp_flush_ready(disp_drv);
+}
+
+void lv_port_disp_init(void)
+{
+#ifdef BSP_USING_SPI_LCD
+    spi_lcd_init();
+#endif
+    /*Initialize `disp_buf` with the buffer(s). With only one buffer use NULL instead buf_2 */
+    lv_disp_draw_buf_init(&disp_buf, buf_1, buf_2, COLOR_BUFFER);
+
+    lv_disp_drv_init(&disp_drv); /*Basic initialization*/
+
+    /*Set the resolution of the display*/
+    disp_drv.hor_res = LV_HOR_RES_MAX;
+    disp_drv.ver_res = LV_VER_RES_MAX;
+
+    /*Set a display buffer*/
+    disp_drv.draw_buf = &disp_buf;
+
+    /*Used to copy the buffer's content to the display*/
+    disp_drv.flush_cb = disp_flush;
+
+    /*Finally register the driver*/
+    lv_disp_drv_register(&disp_drv);
+}

bsp/renesas/ra6m4-cpk/board/lvgl/lv_port_indev.c

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2006-2023, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2021-10-18     Meco Man     The first version
+ */
+#include <lvgl.h>
+#include <rtdevice.h>
+
+void lv_port_indev_init(void)
+{
+}

bsp/renesas/ra6m4-cpk/board/ports/SConscript

@@ -1,9 +1,10 @@
 
 from building import *
 import rtconfig
+import os
 
 cwd     = GetCurrentDir()
-
+objs = []
 src = []
 
 if GetDepend(['BSP_USING_RW007']):
@@ -16,7 +17,12 @@ if rtconfig.PLATFORM in ['gcc', 'armclang']:
     LOCAL_CFLAGS += ' -std=c99'
 elif rtconfig.PLATFORM in ['armcc']:
     LOCAL_CFLAGS += ' --c99'
+objs = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
 
-group = DefineGroup('Drivers', src, depend = [], CPPPATH = CPPPATH, LOCAL_CFLAGS = LOCAL_CFLAGS)
+list = os.listdir(cwd)
+for item in list:
+    if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
+        objs = objs + SConscript(os.path.join(item, 'SConscript'))
+
+Return('objs')
 
-Return('group')

bsp/renesas/ra6m4-cpk/board/ports/drv_rw007.c

@@ -37,7 +37,7 @@ int wifi_spi_device_init(void)
     uint32_t cs_pin = RA_RW007_CS_PIN;
 
     rw007_gpio_init();
-    rt_hw_spi_device_attach(&rw007_dev, "wspi", RA_RW007_SPI_BUS_NAME, (void *)cs_pin);
+    rt_hw_spi_device_attach(RA_RW007_SPI_BUS_NAME, "wspi", cs_pin, RT_NULL);
     rt_hw_wifi_init("wspi");
 
     rt_wlan_set_mode(RT_WLAN_DEVICE_STA_NAME, RT_WLAN_STATION);

bsp/renesas/ra6m4-cpk/board/ports/ili9341/SConscript

@@ -0,0 +1,22 @@
+
+from building import *
+import rtconfig
+
+cwd = GetCurrentDir()
+
+src = []
+
+if GetDepend(['BSP_USING_SPI_LCD']):
+    src += Glob('lcd_ili9341.c')
+
+CPPPATH = [cwd]
+LOCAL_CFLAGS = ''
+
+if rtconfig.PLATFORM in ['gcc', 'armclang']:
+    LOCAL_CFLAGS += ' -std=c99'
+elif rtconfig.PLATFORM in ['armcc']:
+    LOCAL_CFLAGS += ' --c99'
+
+group = DefineGroup('ili9341', src, depend = [], CPPPATH = CPPPATH, LOCAL_CFLAGS = LOCAL_CFLAGS)
+
+Return('group')

bsp/renesas/ra6m4-cpk/board/ports/ili9341/lcd_ili9341.h

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2006-2023, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author        Notes
+ * 2023-02-23     Rbb666        First version
+ */
+#ifndef __LCD_ILI9341_H__
+#define __LCD_ILI9341_H__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+#include "hal_data.h"
+#include <stdint.h>
+#include <rtthread.h>
+
+typedef struct
+{
+    uint16_t width;   /* LCD width */
+    uint16_t height;  /* LCD high */
+    uint32_t id;      /* LCD ID */
+    uint8_t dir;      /* 0:Vertical | 1:Vertical */
+    uint16_t wramcmd; /* gram cmd */
+    uint16_t setxcmd; /* set x cmd */
+    uint16_t setycmd; /* set y cmd */
+} _lcd_dev;
+
+/* LCD param */
+extern _lcd_dev lcddev;
+
+#define USE_HORIZONTAL 0 /* 0-0째|1-90째|2-180째|-270째 */
+
+/* lcd size */
+#define LCD_W 240
+#define LCD_H 320
+
+#define WHITE 0xFFFF
+#define BLACK 0x0000
+#define BLUE 0x001F
+#define BRED 0XF81F
+#define GRED 0XFFE0
+#define GBLUE 0X07FF
+#define RED 0xF800
+#define MAGENTA 0xF81F
+#define GREEN 0x07E0
+#define CYAN 0x7FFF
+#define YELLOW 0xFFE0
+#define BROWN 0XBC40
+#define BRRED 0XFC07
+#define GRAY 0X8430
+
+#define LCD_DC_PIN  BSP_IO_PORT_04_PIN_15
+#define LCD_RES_PIN BSP_IO_PORT_06_PIN_11
+#define LCD_CS_PIN  BSP_IO_PORT_04_PIN_13
+
+#define LCD_DC_CLR  rt_pin_write(LCD_DC_PIN, PIN_LOW)
+#define LCD_DC_SET  rt_pin_write(LCD_DC_PIN, PIN_HIGH)
+#define LCD_RES_CLR rt_pin_write(LCD_RES_PIN, PIN_LOW)
+#define LCD_RES_SET rt_pin_write(LCD_RES_PIN, PIN_HIGH)
+#define DELAY       rt_thread_mdelay
+
+/* res pin  -> P6_11 */
+/* d/c pin  -> P4_15 */
+/* cs pin   -> P4_13 */
+
+void LCD_RESET(void);
+void LCD_WR_REG(uint8_t reg);
+void LCD_WR_DATA(uint8_t data);
+void LCD_WriteReg(uint8_t reg, uint16_t regdata);
+void LCD_WriteRAM_Prepare(void);
+void LCD_WriteData_16Bit(uint16_t Data);
+void LCD_direction(uint8_t direction);
+void LCD_SetWindows(uint16_t xStar, uint16_t yStar, uint16_t xEnd, uint16_t yEnd);
+void LCD_SetCursor(uint16_t Xpos, uint16_t Ypos);
+void LCD_Clear(uint16_t Color);
+void LCD_Fill(uint16_t xsta, uint16_t ysta, uint16_t xend, uint16_t yend, uint16_t color);
+void lcd_fill_array_spi(uint16_t x_start, uint16_t y_start, uint16_t x_end, uint16_t y_end, void *pcolor);
+
+void LCD_Init(void);
+rt_err_t spi_lcd_init(void);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

bsp/renesas/ra6m4-cpk/board/ports/lcd_port.h

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2006-2023, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author         Notes
+ * 2018-07-28     liu2guang      the first version for STM32F469NI-Discovery.
+ */
+
+#ifndef __DRV_LCD_H_
+#define __DRV_LCD_H_
+
+#include <rtthread.h>
+#include <rtdevice.h>
+#include <board.h>
+
+typedef enum
+{
+    ROTATION_ZERO = 0,
+    ROTATION_090 = 90,
+    ROTATION_180 = 180,
+    ROTATION_270 = 270,
+} bsp_rotation;
+
+#define LCD_WIDTH           DISPLAY_HSIZE_INPUT0
+#define LCD_HEIGHT          DISPLAY_VSIZE_INPUT0
+#define LCD_BITS_PER_PIXEL  DISPLAY_BITS_PER_PIXEL_INPUT1
+#define LCD_PIXEL_FORMAT    RTGRAPHIC_PIXEL_FORMAT_RGB565
+#define LCD_BUF_SIZE        (LCD_WIDTH * LCD_HEIGHT * LCD_BITS_PER_PIXEL / 8)
+
+#define LCD_BL_PIN  BSP_IO_PORT_06_PIN_03
+
+#endif

bsp/renesas/ra6m4-cpk/ra_cfg/fsp_cfg/bsp/board_cfg.h

@@ -1,5 +0,0 @@
-/* generated configuration header file - do not edit */
-#ifndef BOARD_CFG_H_
-#define BOARD_CFG_H_
-#include "../../../ra/board/ra6m4_cpk/board.h"
-#endif /* BOARD_CFG_H_ */

bsp/renesas/ra6m4-cpk/ra_cfg/fsp_cfg/bsp/bsp_cfg.h

@@ -3,7 +3,6 @@
 #define BSP_CFG_H_
 #include "bsp_clock_cfg.h"
             #include "bsp_mcu_family_cfg.h"
-            #include "board_cfg.h"
             #define RA_NOT_DEFINED 0
             #ifndef BSP_CFG_RTOS
              #if (RA_NOT_DEFINED) != (RA_NOT_DEFINED)