Skip to content

Commit a574dd6

Browse files
Dimatchermysterywolf
authored andcommitted
[fix][bsp] GD32: fixed SPI adn SPI flash drivers
1 parent 983f021 commit a574dd6

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

bsp/gd32/arm/libraries/gd32_drivers/drv_spi.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ static const struct gd32_spi spi_bus_obj[] = {
8787

8888
#ifdef BSP_USING_SPI3
8989
{
90-
SPI2,
91-
"spi2",
90+
SPI3,
91+
"spi3",
9292
RCU_SPI3,
9393
RCU_GPIOE,
9494
&spi_bus3,
@@ -146,7 +146,7 @@ static void gd32_spi_init(struct gd32_spi *gd32_spi)
146146
gpio_af_set(gd32_spi->spi_port, gd32_spi->alt_func_num, gd32_spi->sck_pin | gd32_spi->mosi_pin | gd32_spi->miso_pin);
147147

148148
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);
149-
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);
149+
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);
150150
#else
151151
/* Init SPI SCK MOSI */
152152
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
287287
struct rt_spi_bus * gd32_spi_bus = (struct rt_spi_bus *)device->bus;
288288
struct gd32_spi *spi_device = (struct gd32_spi *)gd32_spi_bus->parent.user_data;
289289
struct rt_spi_configuration * config = &device->config;
290-
struct gd32_spi_cs * gd32_spi_cs = device->parent.user_data;
290+
rt_base_t cs_pin = (rt_base_t)device->parent.user_data;
291291
uint32_t spi_periph = spi_device->spi_periph;
292292

293293
RT_ASSERT(device != NULL);
@@ -296,7 +296,7 @@ static rt_ssize_t spixfer(struct rt_spi_device* device, struct rt_spi_message* m
296296
/* take CS */
297297
if(message->cs_take)
298298
{
299-
gpio_bit_reset(gd32_spi_cs->GPIOx, gd32_spi_cs->GPIO_Pin);
299+
rt_pin_write(cs_pin, PIN_LOW);
300300
LOG_D("spi take cs\n");
301301
}
302302

@@ -372,7 +372,7 @@ static rt_ssize_t spixfer(struct rt_spi_device* device, struct rt_spi_message* m
372372
/* release CS */
373373
if(message->cs_release)
374374
{
375-
gpio_bit_set(gd32_spi_cs->GPIOx, gd32_spi_cs->GPIO_Pin);
375+
rt_pin_write(cs_pin, PIN_HIGH);
376376
LOG_D("spi release cs\n");
377377
}
378378

bsp/gd32/arm/libraries/gd32_drivers/drv_spi_flash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static int rt_hw_spi_flash_with_sfud_init(void)
6767

6868
return RT_EOK;
6969
}
70-
INIT_COMPONENT_EXPORT(rt_hw_spi_flash_with_sfud_init)
70+
INIT_COMPONENT_EXPORT(rt_hw_spi_flash_with_sfud_init);
7171
#endif
7272

7373
#ifdef RT_USING_DFS

0 commit comments

Comments
 (0)