Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 14:27:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arch/esp32s3: The MISO, MOSI and C/S are optional

Browse Source 
The MISO or MOSI pin is optional.
The C/S pin is unnecessary when `ESP32S3_SPI_UDCS` is enabled.

Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
This commit is contained in:
wangjianyu3
2025-03-27 19:08:23 +08:00
committed by Lup Yuen Lee
parent bd628883ab
commit cc23e06ea2
2 changed files with 97 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/xtensa/src/esp32s3/Kconfig
+6 -6
View File
@@ -1163,7 +1163,7 @@ config ESP32S3_SPI_SLAVE_BUFSIZE
config ESP32S3_SPI2_CSPIN config ESP32S3_SPI2_CSPIN
int "SPI2 CS Pin" int "SPI2 CS Pin"
default 10 default 10
range 0 48 range -1 48
config ESP32S3_SPI2_CLKPIN config ESP32S3_SPI2_CLKPIN
int "SPI2 CLK Pin" int "SPI2 CLK Pin"
@@ -1173,12 +1173,12 @@ config ESP32S3_SPI2_CLKPIN
config ESP32S3_SPI2_MOSIPIN config ESP32S3_SPI2_MOSIPIN
int "SPI2 MOSI Pin" int "SPI2 MOSI Pin"
default 11 default 11
range 0 48 range -1 48
config ESP32S3_SPI2_MISOPIN config ESP32S3_SPI2_MISOPIN
int "SPI2 MISO Pin" int "SPI2 MISO Pin"
default 13 default 13
range 0 48 range -1 48
config ESP32S3_SPI2_IO2PIN config ESP32S3_SPI2_IO2PIN
int "SPI2 IO2 Pin" int "SPI2 IO2 Pin"
@@ -1195,7 +1195,7 @@ config ESP32S3_SPI2_IO3PIN
config ESP32S3_SPI3_CSPIN config ESP32S3_SPI3_CSPIN
int "SPI3 CS Pin" int "SPI3 CS Pin"
default 10 default 10
range 0 48 range -1 48
config ESP32S3_SPI3_CLKPIN config ESP32S3_SPI3_CLKPIN
int "SPI3 CLK Pin" int "SPI3 CLK Pin"
@@ -1205,12 +1205,12 @@ config ESP32S3_SPI3_CLKPIN
config ESP32S3_SPI3_MOSIPIN config ESP32S3_SPI3_MOSIPIN
int "SPI3 MOSI Pin" int "SPI3 MOSI Pin"
default 7 default 7
range 0 48 range -1 48
config ESP32S3_SPI3_MISOPIN config ESP32S3_SPI3_MISOPIN
int "SPI3 MISO Pin" int "SPI3 MISO Pin"
default 2 default 2
range 0 48 range -1 48
config ESP32S3_SPI3_IO2PIN config ESP32S3_SPI3_IO2PIN
int "SPI3 IO2 Pin" int "SPI3 IO2 Pin"
arch/xtensa/src/esp32s3/esp32s3_spi.c
+91 -19
View File
@@ -493,11 +493,16 @@ static inline bool esp32s3_spi_iomux(struct esp32s3_spi_priv_s *priv)
if (cfg->id == 2) if (cfg->id == 2)
{ {
if (cfg->mosi_pin == SPI2_IOMUX_MOSIPIN && if (
#if CONFIG_ESP32S3_SPI2_MOSIPIN >= 0
cfg->mosi_pin == SPI2_IOMUX_MOSIPIN &&
#endif
#ifndef CONFIG_ESP32S3_SPI_SWCS #ifndef CONFIG_ESP32S3_SPI_SWCS
cfg->cs_pin == SPI2_IOMUX_CSPIN && cfg->cs_pin == SPI2_IOMUX_CSPIN &&
#endif #endif
#if CONFIG_ESP32S3_SPI2_MISOPIN >= 0
cfg->miso_pin == SPI2_IOMUX_MISOPIN && cfg->miso_pin == SPI2_IOMUX_MISOPIN &&
#endif
cfg->clk_pin == SPI2_IOMUX_CLKPIN) cfg->clk_pin == SPI2_IOMUX_CLKPIN)
{ {
mapped = true; mapped = true;
@@ -590,7 +595,10 @@ static void esp32s3_spi_select(struct spi_dev_s *dev,
#if SPI_HAVE_SWCS #if SPI_HAVE_SWCS
struct esp32s3_spi_priv_s *priv = (struct esp32s3_spi_priv_s *)dev; struct esp32s3_spi_priv_s *priv = (struct esp32s3_spi_priv_s *)dev;
esp32s3_gpiowrite(priv->config->cs_pin, !selected); if (priv->config->cs_pin >= 0)
{
esp32s3_gpiowrite(priv->config->cs_pin, !selected);
}
#endif #endif
spiinfo("devid: %08" PRIx32 " CS: %s\n", spiinfo("devid: %08" PRIx32 " CS: %s\n",
@@ -1415,14 +1423,57 @@ static int esp32s3_spi_init(struct spi_dev_s *dev)
const struct esp32s3_spi_config_s *config = priv->config; const struct esp32s3_spi_config_s *config = priv->config;
uint32_t regval; uint32_t regval;
esp32s3_gpiowrite(config->cs_pin, true); if (config->cs_pin >= 0)
esp32s3_gpiowrite(config->mosi_pin, true); {
esp32s3_gpiowrite(config->miso_pin, true); esp32s3_gpiowrite(config->cs_pin, true);
}
#ifdef CONFIG_ESP32S3_SPI_UDCS
#ifdef CONFIG_ESP32S3_SPI2
else if (config->id == ESP32S3_SPI2)
{
esp32s3_spi2_select(dev, config->id, false);
}
#endif
#ifdef CONFIG_ESP32S3_SPI3
else if (config->id == ESP32S3_SPI3)
{
esp32s3_spi3_select(dev, config->id, false);
}
#endif
#endif
if (config->mosi_pin >= 0)
{
esp32s3_gpiowrite(config->mosi_pin, true);
}
if (config->miso_pin >= 0)
{
esp32s3_gpiowrite(config->miso_pin, true);
}
esp32s3_gpiowrite(config->clk_pin, true); esp32s3_gpiowrite(config->clk_pin, true);
#if SPI_HAVE_SWCS #if SPI_HAVE_SWCS
esp32s3_configgpio(config->cs_pin, OUTPUT_FUNCTION_1); if (config->cs_pin >= 0)
esp32s3_gpio_matrix_out(config->cs_pin, SIG_GPIO_OUT_IDX, 0, 0); {
esp32s3_configgpio(config->cs_pin, OUTPUT_FUNCTION_1);
esp32s3_gpio_matrix_out(config->cs_pin, SIG_GPIO_OUT_IDX, 0, 0);
}
#ifdef CONFIG_ESP32S3_SPI_UDCS
#ifdef CONFIG_ESP32S3_SPI2
else if (config->id == ESP32S3_SPI2)
{
esp32s3_spi2_select(dev, config->id, false);
}
#endif
#ifdef CONFIG_ESP32S3_SPI3
else if (config->id == ESP32S3_SPI3)
{
esp32s3_spi3_select(dev, config->id, false);
}
#endif
#endif
#endif #endif
/* SPI3 doesn't have IOMUX, if SPI3 is enabled use GPIO Matrix for both */ /* SPI3 doesn't have IOMUX, if SPI3 is enabled use GPIO Matrix for both */
@@ -1430,14 +1481,24 @@ static int esp32s3_spi_init(struct spi_dev_s *dev)
if (esp32s3_spi_iomux(priv)) if (esp32s3_spi_iomux(priv))
{ {
#if !SPI_HAVE_SWCS #if !SPI_HAVE_SWCS
esp32s3_configgpio(config->cs_pin, OUTPUT_FUNCTION_5); if (config->cs_pin >= 0)
esp32s3_gpio_matrix_out(config->cs_pin, SIG_GPIO_OUT_IDX, 0, 0); {
esp32s3_configgpio(config->cs_pin, OUTPUT_FUNCTION_5);
esp32s3_gpio_matrix_out(config->cs_pin, SIG_GPIO_OUT_IDX, 0, 0);
}
#endif #endif
esp32s3_configgpio(config->mosi_pin, OUTPUT_FUNCTION_5);
esp32s3_gpio_matrix_out(config->mosi_pin, SIG_GPIO_OUT_IDX, 0, 0);
esp32s3_configgpio(config->miso_pin, INPUT_FUNCTION_5 | PULLUP); if (config->mosi_pin >= 0)
esp32s3_gpio_matrix_out(config->miso_pin, SIG_GPIO_OUT_IDX, 0, 0); {
esp32s3_configgpio(config->mosi_pin, OUTPUT_FUNCTION_5);
esp32s3_gpio_matrix_out(config->mosi_pin, SIG_GPIO_OUT_IDX, 0, 0);
}
if (config->miso_pin >= 0)
{
esp32s3_configgpio(config->miso_pin, INPUT_FUNCTION_5 | PULLUP);
esp32s3_gpio_matrix_out(config->miso_pin, SIG_GPIO_OUT_IDX, 0, 0);
}
esp32s3_configgpio(config->clk_pin, OUTPUT_FUNCTION_5); esp32s3_configgpio(config->clk_pin, OUTPUT_FUNCTION_5);
esp32s3_gpio_matrix_out(config->clk_pin, SIG_GPIO_OUT_IDX, 0, 0); esp32s3_gpio_matrix_out(config->clk_pin, SIG_GPIO_OUT_IDX, 0, 0);
@@ -1445,14 +1506,25 @@ static int esp32s3_spi_init(struct spi_dev_s *dev)
else else
{ {
#if !SPI_HAVE_SWCS #if !SPI_HAVE_SWCS
esp32s3_configgpio(config->cs_pin, OUTPUT); if (config->cs_pin >= 0)
esp32s3_gpio_matrix_out(config->cs_pin, config->cs_outsig, 0, 0); {
esp32s3_configgpio(config->cs_pin, OUTPUT);
esp32s3_gpio_matrix_out(config->cs_pin, config->cs_outsig, 0, 0);
}
#endif #endif
esp32s3_configgpio(config->mosi_pin, OUTPUT);
esp32s3_gpio_matrix_out(config->mosi_pin, config->mosi_outsig, 0, 0);
esp32s3_configgpio(config->miso_pin, INPUT | PULLUP); if (config->mosi_pin >= 0)
esp32s3_gpio_matrix_in(config->miso_pin, config->miso_insig, 0); {
esp32s3_configgpio(config->mosi_pin, OUTPUT);
esp32s3_gpio_matrix_out(config->mosi_pin,
config->mosi_outsig, 0, 0);
}
if (config->miso_pin >= 0)
{
esp32s3_configgpio(config->miso_pin, INPUT | PULLUP);
esp32s3_gpio_matrix_in(config->miso_pin, config->miso_insig, 0);
}
esp32s3_configgpio(config->clk_pin, OUTPUT); esp32s3_configgpio(config->clk_pin, OUTPUT);
esp32s3_gpio_matrix_out(config->clk_pin, config->clk_outsig, 0, 0); esp32s3_gpio_matrix_out(config->clk_pin, config->clk_outsig, 0, 0);