summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy <[email protected]>2025-03-03 10:47:57 +0300
committerMeco Man <[email protected]>2025-03-12 20:45:28 -0400
commita574dd63571ea573ad4a1e860ceae670615a7c13 (patch)
tree13a32e1f101dbcc37e40016c5fbb400468d46c27
parent983f02151af42c5ef8ac5718bda0cf39795652a9 (diff)
[fix][bsp] GD32: fixed SPI adn SPI flash drivers
-rw-r--r--bsp/gd32/arm/libraries/gd32_drivers/drv_spi.c12
-rw-r--r--bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/bsp/gd32/arm/libraries/gd32_drivers/drv_spi.c b/bsp/gd32/arm/libraries/gd32_drivers/drv_spi.c
index 0b4f7d8ba0..d62ecc9122 100644
--- a/bsp/gd32/arm/libraries/gd32_drivers/drv_spi.c
+++ b/bsp/gd32/arm/libraries/gd32_drivers/drv_spi.c
@@ -87,8 +87,8 @@ static const struct gd32_spi spi_bus_obj[] = {
#ifdef BSP_USING_SPI3
{
- SPI2,
- "spi2",
+ SPI3,
+ "spi3",
RCU_SPI3,
RCU_GPIOE,
&spi_bus3,
@@ -146,7 +146,7 @@ static void gd32_spi_init(struct gd32_spi *gd32_spi)
gpio_af_set(gd32_spi->spi_port, gd32_spi->alt_func_num, gd32_spi->sck_pin | gd32_spi->mosi_pin | gd32_spi->miso_pin);
gpio_mode_set(gd32_spi->spi_port, GPIO_MODE_AF, GPIO_PUPD_NONE, gd32_spi->sck_pin | gd32_spi->mosi_pin | gd32_spi->miso_pin);
- gpio_output_options_set(gd32_spi->spi_port, GPIO_OTYPE_PP, GPIO_OSPEED_200MHZ, gd32_spi->sck_pin | gd32_spi->mosi_pin | gd32_spi->miso_pin);
+ gpio_output_options_set(gd32_spi->spi_port, GPIO_OTYPE_PP, GPIO_OSPEED_MAX, gd32_spi->sck_pin | gd32_spi->mosi_pin | gd32_spi->miso_pin);
#else
/* Init SPI SCK MOSI */
gpio_init(gd32_spi->spi_port, GPIO_MODE_AF_PP, GPIO_OSPEED_50MHZ, gd32_spi->sck_pin | gd32_spi->mosi_pin);
@@ -287,7 +287,7 @@ static rt_ssize_t spixfer(struct rt_spi_device* device, struct rt_spi_message* m
struct rt_spi_bus * gd32_spi_bus = (struct rt_spi_bus *)device->bus;
struct gd32_spi *spi_device = (struct gd32_spi *)gd32_spi_bus->parent.user_data;
struct rt_spi_configuration * config = &device->config;
- struct gd32_spi_cs * gd32_spi_cs = device->parent.user_data;
+ rt_base_t cs_pin = (rt_base_t)device->parent.user_data;
uint32_t spi_periph = spi_device->spi_periph;
RT_ASSERT(device != NULL);
@@ -296,7 +296,7 @@ static rt_ssize_t spixfer(struct rt_spi_device* device, struct rt_spi_message* m
/* take CS */
if(message->cs_take)
{
- gpio_bit_reset(gd32_spi_cs->GPIOx, gd32_spi_cs->GPIO_Pin);
+ rt_pin_write(cs_pin, PIN_LOW);
LOG_D("spi take cs\n");
}
@@ -372,7 +372,7 @@ static rt_ssize_t spixfer(struct rt_spi_device* device, struct rt_spi_message* m
/* release CS */
if(message->cs_release)
{
- gpio_bit_set(gd32_spi_cs->GPIOx, gd32_spi_cs->GPIO_Pin);
+ rt_pin_write(cs_pin, PIN_HIGH);
LOG_D("spi release cs\n");
}
diff --git a/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c b/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c
index f844bd2ddc..5645322026 100644
--- a/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c
+++ b/bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c
@@ -67,7 +67,7 @@ static int rt_hw_spi_flash_with_sfud_init(void)
return RT_EOK;
}
-INIT_COMPONENT_EXPORT(rt_hw_spi_flash_with_sfud_init)
+INIT_COMPONENT_EXPORT(rt_hw_spi_flash_with_sfud_init);
#endif
#ifdef RT_USING_DFS