From 15b2feb60dc4841a612625da3ab7f2bcb188a5a3 Mon Sep 17 00:00:00 2001 From: armink Date: Sat, 24 Nov 2018 15:02:53 +0800 Subject: [PATCH] [DeviceDriver] Update QSPI driver framework. --- components/drivers/Kconfig | 4 ++++ components/drivers/include/drivers/spi.h | 4 ++-- components/drivers/spi/SConscript | 2 +- components/drivers/spi/qspi_core.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/components/drivers/Kconfig b/components/drivers/Kconfig index 94af352410..8c54fff033 100755 --- a/components/drivers/Kconfig +++ b/components/drivers/Kconfig @@ -185,6 +185,10 @@ config RT_USING_SPI config RT_SFUD_USING_FLASH_INFO_TABLE bool "Using defined supported flash chip information table" default y + + config RT_SFUD_USING_QSPI + bool "Using QSPI mode support" + default n config RT_DEBUG_SFUD bool "Show more SFUD debug information" diff --git a/components/drivers/include/drivers/spi.h b/components/drivers/include/drivers/spi.h index 7394710581..04a65421a5 100644 --- a/components/drivers/include/drivers/spi.h +++ b/components/drivers/include/drivers/spi.h @@ -144,8 +144,8 @@ struct rt_qspi_configuration rt_uint32_t medium_size; /* double data rate mode */ rt_uint8_t ddr_mode; - /* the number of lines connected to the hardware */ - rt_uint8_t qspi_hw_lines; + /* the data lines max width which QSPI bus supported, such as 1, 2, 4 */ + rt_uint8_t qspi_dl_width ; }; struct rt_qspi_device diff --git a/components/drivers/spi/SConscript b/components/drivers/spi/SConscript index ee423c33db..0343fb8d13 100644 --- a/components/drivers/spi/SConscript +++ b/components/drivers/spi/SConscript @@ -2,7 +2,7 @@ from building import * import rtconfig cwd = GetCurrentDir() -src = ['spi_core.c', 'spi_dev.c'] +src = ['spi_core.c', 'spi_dev.c', 'qspi_core.c'] CPPPATH = [cwd, cwd + '/../include'] LOCAL_CCFLAGS = '' diff --git a/components/drivers/spi/qspi_core.c b/components/drivers/spi/qspi_core.c index 7676764b59..c9ff6a9637 100644 --- a/components/drivers/spi/qspi_core.c +++ b/components/drivers/spi/qspi_core.c @@ -25,7 +25,7 @@ rt_err_t rt_qspi_configure(struct rt_qspi_device *device, struct rt_qspi_configu qspi_device->config.parent.reserved = cfg->parent.reserved; qspi_device->config.medium_size = cfg->medium_size; qspi_device->config.ddr_mode = cfg->ddr_mode; - qspi_device->config.qspi_hw_lines = cfg->qspi_hw_lines; + qspi_device->config.qspi_dl_width = cfg->qspi_dl_width; result = rt_spi_configure(&device->parent, &cfg->parent); -- GitLab