[bsp][lpc55sxx] update spi driver (#6986)

* [bsp][lpc55sxx] update spi driver 1. update spi driver, fix pin driver 2. move DMA_Init to board.c * [bsp][lpc55sxx] formmat code * [bsp][lpc55sxx] format lpc55s69_nxp_evk board file
2026-08-18 20:48:41 +08:00 · 2023-02-27 18:27:42 -05:00
parent 7542f780e9
commit 8015b61fcb
13 changed files with 475 additions and 598 deletions
@@ -160,7 +160,6 @@ int rt_hw_i2c_init(void)
        lpc_obj[i].parent.ops = &i2c_ops;
        lpc_obj[i].sem = rt_sem_create("sem_i2c", 0, RT_IPC_FLAG_FIFO);

-        DMA_Init(lpc_obj[i].DMA);
        DMA_CreateHandle(&lpc_obj[i].dmaHandle, lpc_obj[i].DMA, lpc_obj[i].dma_chl);
        I2C_MasterTransferCreateHandleDMA(lpc_obj[i].I2C, &lpc_obj[i].i2c_mst_dma_handle, i2c_mst_dma_callback, &lpc_obj[i], &lpc_obj[i].dmaHandle);

@@ -132,7 +132,7 @@ struct rt_pin_irq_hdr pin_irq_hdr_tab[] =
    {-1, 0, RT_NULL, RT_NULL},
 };

-static void lpc_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
+static void lpc_pin_mode(rt_device_t dev, rt_base_t pin, rt_uint8_t mode)
 {
    int dir;
    uint32_t pin_cfg;
@@ -191,7 +191,7 @@ static void lpc_pin_mode(rt_device_t dev, rt_base_t pin, rt_base_t mode)
 }


-static void lpc_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
+static void lpc_pin_write(rt_device_t dev, rt_base_t pin, rt_uint8_t value)
 {
    if ((pin > __ARRAY_LEN(lpc_pin_map)) || (pin == 0))
    {
@@ -201,7 +201,7 @@ static void lpc_pin_write(rt_device_t dev, rt_base_t pin, rt_base_t value)
    GPIO_PinWrite(lpc_pin_map[pin].gpio, lpc_pin_map[pin].gpio_port, lpc_pin_map[pin].gpio_pin, value);
 }

-static int lpc_pin_read(rt_device_t dev, rt_base_t pin)
+static rt_int8_t lpc_pin_read(rt_device_t dev, rt_base_t pin)
 {
    int value;
    if ((pin > __ARRAY_LEN(lpc_pin_map)) || (pin == 0))
@@ -259,8 +259,8 @@ void PIN_INT0_IRQHandler(void)
 }

 static rt_err_t lpc_pin_attach_irq(struct rt_device *device,
-                                   rt_int32_t pin,
-                                   rt_uint32_t mode,
+                                   rt_base_t pin,
+                                   rt_uint8_t mode,
                                   void (*hdr)(void *args),
                                   void *args)
 {
@@ -336,7 +336,7 @@ static rt_err_t lpc_pin_attach_irq(struct rt_device *device,
    return RT_EOK;
 }

-static rt_err_t lpc_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
+static rt_err_t lpc_pin_detach_irq(struct rt_device *device, rt_base_t pin)
 {
    int i;

@@ -359,7 +359,7 @@ static rt_err_t lpc_pin_detach_irq(struct rt_device *device, rt_int32_t pin)
    return RT_EOK;
 }

-static rt_err_t lpc_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint32_t enabled)
+static rt_err_t lpc_pin_irq_enable(struct rt_device *device, rt_base_t pin, rt_uint8_t enabled)
 {
    int irqn_type, i;

@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2006-2023, RT-Thread Development Team
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef __DRV_SPI_H__
-#define __DRV_SPI_H__
-
-#include <rtthread.h>
-#include <rtdevice.h>
-
-int rt_hw_spi_init(void);
-rt_err_t lpc_spi_bus_attach_device(const char *bus_name, const char *device_name, rt_uint32_t pin);
-
-#endif
@@ -192,7 +192,13 @@ CONFIG_RT_MMCSD_STACK_SIZE=1024
 CONFIG_RT_MMCSD_THREAD_PREORITY=22
 CONFIG_RT_MMCSD_MAX_PARTITION=16
 # CONFIG_RT_SDIO_DEBUG is not set
-# CONFIG_RT_USING_SPI is not set
+CONFIG_RT_USING_SPI=y
+# CONFIG_RT_USING_SPI_BITOPS is not set
+# CONFIG_RT_USING_QSPI is not set
+# CONFIG_RT_USING_SPI_MSD is not set
+# CONFIG_RT_USING_SFUD is not set
+# CONFIG_RT_USING_ENC28J60 is not set
+# CONFIG_RT_USING_SPI_WIFI is not set
 # CONFIG_RT_USING_WDT is not set
 # CONFIG_RT_USING_AUDIO is not set
 # CONFIG_RT_USING_SENSOR is not set
@@ -254,6 +260,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
 # CONFIG_RT_USING_ULOG is not set
 # CONFIG_RT_USING_UTEST is not set
 # CONFIG_RT_USING_VAR_EXPORT is not set
+# CONFIG_RT_USING_ADT is not set
 # CONFIG_RT_USING_RT_LINK is not set
 # CONFIG_RT_USING_VBUS is not set

@@ -446,6 +453,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
 # CONFIG_PKG_USING_EASYLOGGER is not set
 # CONFIG_PKG_USING_SYSTEMVIEW is not set
 # CONFIG_PKG_USING_SEGGER_RTT is not set
+# CONFIG_PKG_USING_RTT_AUTO_EXE_CMD is not set
 # CONFIG_PKG_USING_RDB is not set
 # CONFIG_PKG_USING_ULOG_EASYFLASH is not set
 # CONFIG_PKG_USING_LOGMGR is not set
@@ -625,6 +633,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
 # CONFIG_PKG_USING_CW2015 is not set
 # CONFIG_PKG_USING_ICM20608 is not set
 # CONFIG_PKG_USING_PAJ7620 is not set
+# CONFIG_PKG_USING_STHS34PF80 is not set

 #
 # touch drivers
@@ -763,6 +772,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
 # CONFIG_PKG_USING_TETRIS is not set
 # CONFIG_PKG_USING_DONUT is not set
 # CONFIG_PKG_USING_COWSAY is not set
+# CONFIG_PKG_USING_MORSE is not set
 # CONFIG_PKG_USING_LIBCSV is not set
 # CONFIG_PKG_USING_OPTPARSE is not set
 # CONFIG_PKG_USING_FASTLZ is not set
@@ -952,6 +962,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
 # Display
 #
 # CONFIG_PKG_USING_ARDUINO_U8G2 is not set
+# CONFIG_PKG_USING_ARDUINO_U8GLIB_ARDUINO is not set
 # CONFIG_PKG_USING_SEEED_TM1637 is not set

 #
@@ -981,10 +992,17 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
 # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_PCF8574 is not set
 # CONFIG_PKG_USING_ARDUINO_ADAFRUIT_PCA9685 is not set
 # CONFIG_PKG_USING_ARDUINO_SEEED_PCF85063TP is not set
+# CONFIG_PKG_USING_ARDUINO_ADAFRUIT_TPA2016 is not set
+# CONFIG_PKG_USING_ARDUINO_ADAFRUIT_DRV2605 is not set
+# CONFIG_PKG_USING_ARDUINO_ADAFRUIT_DS1841 is not set
+# CONFIG_PKG_USING_ARDUINO_ADAFRUIT_DS3502 is not set

 #
 # Other
 #
+# CONFIG_PKG_USING_ARDUINO_ADAFRUIT_MFRC630 is not set
+# CONFIG_PKG_USING_ARDUINO_ADAFRUIT_SI5351 is not set
+# CONFIG_PKG_USING_ARDUINO_RTCLIB is not set

 #
 # Signal IO
@@ -1016,13 +1034,16 @@ CONFIG_BSP_USING_UART=y
 CONFIG_BSP_USING_UART0=y
 # CONFIG_HW_UART0_BAUDRATE_9600 is not set
 CONFIG_HW_UART0_BAUDRATE_115200=y
+# CONFIG_BSP_USING_UART1 is not set
 # CONFIG_BSP_USING_UART2 is not set
 CONFIG_BSP_USING_I2C=y
 # CONFIG_BSP_USING_I2C1 is not set
 CONFIG_BSP_USING_I2C4=y
 CONFIG_HW_I2C4_BAUDRATE_100kHZ=y
 # CONFIG_HW_I2C4_BAUDRATE_400kHZ is not set
-# CONFIG_BSP_USING_SPI is not set
+CONFIG_BSP_USING_SPI=y
+CONFIG_BSP_USING_SPI3=y
+CONFIG_BSP_USING_SPI8=y
 # CONFIG_BSP_USING_ADC is not set
 CONFIG_BSP_USING_SDIO=y
 CONFIG_BSP_USING_RTC=y
@@ -1037,6 +1058,7 @@ CONFIG_BSP_USING_LED=y
 CONFIG_BSP_USING_KEY=y
 CONFIG_BSP_USING_MMA8562=y
 CONFIG_BSP_USING_MMA8562I2C="i2c4"
+# CONFIG_BSP_USING_ARDUINO is not set

 #
 # Board extended module Drivers
@@ -124,11 +124,11 @@ menu "On-chip Peripheral Drivers"
            default y

            if BSP_USING_SPI
-                config BSP_USING_SPIBUS3
+                config BSP_USING_SPI3
                    bool "Enable Flexcomm3 as SPI"
                    default n

-                config BSP_USING_SPIBUS8
+                config BSP_USING_SPI8
                    bool "Enable Flexcomm8 as High Speed SPI"
                    default y
            endif
@@ -203,7 +203,7 @@ void BOARD_BootClockPLL100M(void)
    /*!< Set up PLL */
    CLOCK_AttachClk(kEXT_CLK_to_PLL0);                    /*!< Switch PLL0CLKSEL to EXT_CLK */
    POWER_DisablePD(kPDRUNCFG_PD_PLL0);                  /* Ensure PLL is on  */
-    POWER_DisablePD(kPDRUNCFG_PD_PLL0_SSCG);                                       
+    POWER_DisablePD(kPDRUNCFG_PD_PLL0_SSCG);
    const pll_setup_t pll0Setup = {
        .pllctrl = SYSCON_PLL0CTRL_CLKEN_MASK | SYSCON_PLL0CTRL_SELI(54U) | SYSCON_PLL0CTRL_SELP(26U),
        .pllndec = SYSCON_PLL0NDEC_NDIV(4U),
@@ -276,7 +276,7 @@ void BOARD_BootClockPLL150M(void)
    /*!< Set up PLL */
    CLOCK_AttachClk(kEXT_CLK_to_PLL0);                    /*!< Switch PLL0CLKSEL to EXT_CLK */
    POWER_DisablePD(kPDRUNCFG_PD_PLL0);                  /* Ensure PLL is on  */
-    POWER_DisablePD(kPDRUNCFG_PD_PLL0_SSCG);                                       
+    POWER_DisablePD(kPDRUNCFG_PD_PLL0_SSCG);
    const pll_setup_t pll0Setup = {
        .pllctrl = SYSCON_PLL0CTRL_CLKEN_MASK | SYSCON_PLL0CTRL_SELI(53U) | SYSCON_PLL0CTRL_SELP(31U),
        .pllndec = SYSCON_PLL0NDEC_NDIV(8U),
@@ -318,12 +318,23 @@ void BOARD_InitPins(void)
                        /* Select Digital mode.
                         * : Digital mode, digital input is enabled. */
                        | IOCON_PIO_DIGIMODE(PIO1_7_DIGIMODE_DIGITAL));
-                        
-              
+
+
    /* I2C4 */
    IOCON_PinMuxSet(IOCON, 1U, 20, 5 | IOCON_PIO_MODE_INACT | IOCON_PIO_SLEW_STANDARD | IOCON_PIO_INV_DI | IOCON_PIO_DIGITAL_EN | IOCON_PIO_OPENDRAIN_DI);
    IOCON_PinMuxSet(IOCON, 1U, 21, 5 | IOCON_PIO_MODE_INACT | IOCON_PIO_SLEW_STANDARD | IOCON_PIO_INV_DI | IOCON_PIO_DIGITAL_EN | IOCON_PIO_OPENDRAIN_DI);
-                        
+
+    /* FC3 SPI */
+    IOCON_PinMuxSet(IOCON, 0, 2, 1 | IOCON_PIO_MODE_INACT | IOCON_PIO_SLEW_STANDARD | IOCON_PIO_INV_DI | IOCON_PIO_DIGITAL_EN | IOCON_PIO_OPENDRAIN_DI); /* MISO */
+    IOCON_PinMuxSet(IOCON, 0, 3, 1 | IOCON_PIO_MODE_INACT | IOCON_PIO_SLEW_STANDARD | IOCON_PIO_INV_DI | IOCON_PIO_DIGITAL_EN | IOCON_PIO_OPENDRAIN_DI); /* MOSI */
+   // IOCON_PinMuxSet(IOCON, 0, 4, 8 | IOCON_PIO_MODE_INACT | IOCON_PIO_SLEW_STANDARD | IOCON_PIO_INV_DI | IOCON_PIO_DIGITAL_EN | IOCON_PIO_OPENDRAIN_DI); /* CS */
+    IOCON_PinMuxSet(IOCON, 0, 6, 1 | IOCON_PIO_MODE_INACT | IOCON_PIO_SLEW_STANDARD | IOCON_PIO_INV_DI | IOCON_PIO_DIGITAL_EN | IOCON_PIO_OPENDRAIN_DI); /* SCK */
+
+
+    /* FC8 SPI */
+    IOCON_PinMuxSet(IOCON, 1, 3,  6 | IOCON_PIO_MODE_INACT | IOCON_PIO_SLEW_STANDARD | IOCON_PIO_INV_DI | IOCON_PIO_DIGITAL_EN | IOCON_PIO_OPENDRAIN_DI); /* MISO */
+    IOCON_PinMuxSet(IOCON, 0, 26, 9 | IOCON_PIO_MODE_INACT | IOCON_PIO_SLEW_STANDARD | IOCON_PIO_INV_DI | IOCON_PIO_DIGITAL_EN | IOCON_PIO_OPENDRAIN_DI); /* MOSI */
+    IOCON_PinMuxSet(IOCON, 1, 2,  6 | IOCON_PIO_MODE_INACT | IOCON_PIO_SLEW_STANDARD | IOCON_PIO_INV_DI | IOCON_PIO_DIGITAL_EN | IOCON_PIO_OPENDRAIN_DI); /* SCK */
 }
 /***********************************************************************************************************************
 * EOF
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2023, RT-Thread Development Team
 * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
 *
 * SPDX-License-Identifier: Apache-2.0
@@ -52,6 +52,9 @@ void rt_hw_board_init()
    GPIO_PortInit(GPIO, 0);
    GPIO_PortInit(GPIO, 1);

+    DMA_Init(DMA0);
+    DMA_Init(DMA1);
+
    /* NVIC Configuration */
 #define NVIC_VTOR_MASK              0x3FFFFF80
 #ifdef  VECT_TAB_RAM
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2021, RT-Thread Development Team
+ * Copyright (c) 2006-2023, RT-Thread Development Team
 *
 * SPDX-License-Identifier: Apache-2.0
 *
@@ -25,6 +25,7 @@
 #include "fsl_gpio.h"
 #include "fsl_iocon.h"
 #include "pin_mux.h"
+#include "fsl_dma.h"

 // <RDTConfigurator URL="http://www.rt-thread.com/eclipse">

@@ -48,25 +49,6 @@ extern int __HeapLimit;

 void rt_hw_board_init(void);

-#define BOARD_SDIF_BASEADDR SDIF
-#define BOARD_SDIF_CLKSRC kCLOCK_SDio
-#define BOARD_SDIF_CLK_FREQ CLOCK_GetFreq(kCLOCK_SDio)
-#define BOARD_SDIF_CLK_ATTACH kMAIN_CLK_to_SDIO_CLK
-#define BOARD_SDIF_IRQ SDIO_IRQn
-#define BOARD_MMC_VCC_SUPPLY kMMC_VoltageWindows270to360
-#define BOARD_SD_CARD_DETECT_PIN 17
-#define BOARD_SD_CARD_DETECT_PORT 0
-#define BOARD_SD_CARD_DETECT_GPIO GPIO
-#define BOARD_SD_DETECT_TYPE kSDMMCHOST_DetectCardByHostCD
-
-#define BOARD_SDIF_CD_GPIO_INIT()                                                                    \
-    {                                                                                                \
-        CLOCK_EnableClock(kCLOCK_Gpio2);                                                             \
-        GPIO_PinInit(BOARD_SD_CARD_DETECT_GPIO, BOARD_SD_CARD_DETECT_PORT, BOARD_SD_CARD_DETECT_PIN, \
-                     &(gpio_pin_config_t){kGPIO_DigitalInput, 0U});                                  \
-    }
-#define BOARD_SDIF_CD_STATUS() \
-    GPIO_PinRead(BOARD_SD_CARD_DETECT_GPIO, BOARD_SD_CARD_DETECT_PORT, BOARD_SD_CARD_DETECT_PIN)

 #endif

@@ -340,7 +340,7 @@
              <MiscControls>--target=arm-arm-none-eabi</MiscControls>
              <Define>__STDC_LIMIT_MACROS, RT_USING_ARMLIBC, RT_USING_LIBC, __CLK_TCK=RT_TICK_PER_SECOND, __RTTHREAD__, DEBUG</Define>
              <Undefine></Undefine>
-              <IncludePath>..\..\..\components\libc\posix\ipc;board;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board\MCUX_Config\board;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\Libraries\LPC55S6X\middleware\sdmmc\port;..\..\..\components\drivers\include;..\Libraries\drivers;..\..\..\components\dfs\include;..\..\..\components\libc\posix\io\poll;..\Libraries\drivers\config;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\finsh;..\..\..\components\dfs\filesystems\elmfat;..\..\..\components\libc\compilers\common\include;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\Libraries\LPC55S6X\middleware\sdmmc\inc;..\..\..\components\libc\posix\io\stdio;..\..\..\components\utilities\libadt;applications;..\Libraries\CMSIS\Core\Include;..\Libraries\LPC55S6X\components\codec;.;..\..\..\components\libc\compilers\common\extension;..\Libraries\LPC55S6X\LPC55S6X;..\Libraries\LPC55S6X\LPC55S6X\drivers;..\..\..\components\drivers\include;..\..\..\include</IncludePath>
+              <IncludePath>..\..\..\components\libc\posix\ipc;board;..\Libraries\LPC55S6X\middleware\sdmmc\port;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board\MCUX_Config\board;..\..\..\components\libc\compilers\common\extension\fcntl\octal;..\..\..\include;..\..\..\components\drivers\include;..\Libraries\drivers;..\..\..\components\dfs\include;..\..\..\components\libc\posix\io\poll;.;..\..\..\components\dfs\filesystems\devfs;..\..\..\components\libc\compilers\common\extension;..\..\..\components\finsh;..\..\..\components\dfs\filesystems\elmfat;..\..\..\components\libc\compilers\common\include;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m33;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\Libraries\LPC55S6X\middleware\sdmmc\inc;..\..\..\components\libc\posix\io\stdio;applications;..\Libraries\CMSIS\Core\Include;..\Libraries\LPC55S6X\components\codec;..\Libraries\drivers\config;..\..\..\components\drivers\spi;..\Libraries\LPC55S6X\LPC55S6X;..\Libraries\LPC55S6X\LPC55S6X\drivers;..\..\..\components\drivers\include;..\..\..\components\drivers\include</IncludePath>
            </VariousControls>
          </Cads>
          <Aads>
@@ -381,16 +381,6 @@
        </TargetArmAds>
      </TargetOption>
      <Groups>
-        <Group>
-          <GroupName>ADT</GroupName>
-          <Files>
-            <File>
-              <FileName>avl.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\components\utilities\libadt\avl.c</FilePath>
-            </File>
-          </Files>
-        </Group>
        <Group>
          <GroupName>Applications</GroupName>
          <Files>
@@ -574,6 +564,16 @@
              <FileType>1</FileType>
              <FilePath>..\..\..\components\drivers\serial\serial.c</FilePath>
            </File>
+            <File>
+              <FileName>spi_core.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\components\drivers\spi\spi_core.c</FilePath>
+            </File>
+            <File>
+              <FileName>spi_dev.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\components\drivers\spi\spi_dev.c</FilePath>
+            </File>
          </Files>
        </Group>
        <Group>
@@ -629,6 +629,11 @@
              <FileType>1</FileType>
              <FilePath>..\Libraries\drivers\drv_sdif.c</FilePath>
            </File>
+            <File>
+              <FileName>drv_spi.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Libraries\drivers\drv_spi.c</FilePath>
+            </File>
            <File>
              <FileName>drv_uart.c</FileName>
              <FileType>1</FileType>
@@ -113,6 +113,7 @@
 #define RT_MMCSD_STACK_SIZE 1024
 #define RT_MMCSD_THREAD_PREORITY 22
 #define RT_MMCSD_MAX_PARTITION 16
+#define RT_USING_SPI

 /* Using USB */

@@ -249,6 +250,7 @@

 /* Other */

+
 /* Signal IO */


@@ -267,6 +269,9 @@
 #define BSP_USING_I2C
 #define BSP_USING_I2C4
 #define HW_I2C4_BAUDRATE_100kHZ
+#define BSP_USING_SPI
+#define BSP_USING_SPI3
+#define BSP_USING_SPI8
 #define BSP_USING_SDIO
 #define BSP_USING_RTC