@@ -87,8 +87,8 @@ static const struct gd32_spi spi_bus_obj[] = {
87
87
88
88
#ifdef BSP_USING_SPI3
89
89
{
90
- SPI2 ,
91
- "spi2 " ,
90
+ SPI3 ,
91
+ "spi3 " ,
92
92
RCU_SPI3 ,
93
93
RCU_GPIOE ,
94
94
& spi_bus3 ,
@@ -146,7 +146,7 @@ static void gd32_spi_init(struct gd32_spi *gd32_spi)
146
146
gpio_af_set (gd32_spi -> spi_port , gd32_spi -> alt_func_num , gd32_spi -> sck_pin | gd32_spi -> mosi_pin | gd32_spi -> miso_pin );
147
147
148
148
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 );
150
150
#else
151
151
/* Init SPI SCK MOSI */
152
152
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
287
287
struct rt_spi_bus * gd32_spi_bus = (struct rt_spi_bus * )device -> bus ;
288
288
struct gd32_spi * spi_device = (struct gd32_spi * )gd32_spi_bus -> parent .user_data ;
289
289
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 ;
291
291
uint32_t spi_periph = spi_device -> spi_periph ;
292
292
293
293
RT_ASSERT (device != NULL );
@@ -296,7 +296,7 @@ static rt_ssize_t spixfer(struct rt_spi_device* device, struct rt_spi_message* m
296
296
/* take CS */
297
297
if (message -> cs_take )
298
298
{
299
- gpio_bit_reset ( gd32_spi_cs -> GPIOx , gd32_spi_cs -> GPIO_Pin );
299
+ rt_pin_write ( cs_pin , PIN_LOW );
300
300
LOG_D ("spi take cs\n" );
301
301
}
302
302
@@ -372,7 +372,7 @@ static rt_ssize_t spixfer(struct rt_spi_device* device, struct rt_spi_message* m
372
372
/* release CS */
373
373
if (message -> cs_release )
374
374
{
375
- gpio_bit_set ( gd32_spi_cs -> GPIOx , gd32_spi_cs -> GPIO_Pin );
375
+ rt_pin_write ( cs_pin , PIN_HIGH );
376
376
LOG_D ("spi release cs\n" );
377
377
}
378
378
0 commit comments