michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: spi: esp32: use pinctrl API

Browse source 
and removes references/usage of old pinmux properties.

Signed-off-by: Glauber Maroto Ferreira <glauber.ferreira@espressif.com>
This commit is contained in:
Glauber Maroto Ferreira 2022-02-09 19:14:29 -03:00 • committed by Carles Cufí
commit 40a80d236e
2 changed files with 11 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

95
drivers/spi/spi_esp32_spim.c
View file

@ -20,22 +20,12 @@ LOG_MODULE_REGISTER(esp32_spi, CONFIG_SPI_LOG_LEVEL);
#else #else
#include <drivers/interrupt_controller/intc_esp32c3.h> #include <drivers/interrupt_controller/intc_esp32c3.h>
#endif #endif
#include <drivers/gpio/gpio_esp32.h>
#include <drivers/clock_control.h> #include <drivers/clock_control.h>
#include "spi_context.h" #include "spi_context.h"
#include "spi_esp32_spim.h" #include "spi_esp32_spim.h"
/* pins, signals and interrupts shall be placed into dts */ /* pins, signals and interrupts shall be placed into dts */
#if defined(CONFIG_SOC_ESP32) #if defined(CONFIG_SOC_ESP32S2)
#define MISO_IDX_2 HSPIQ_IN_IDX
#define MISO_IDX_3 VSPIQ_IN_IDX
#define MOSI_IDX_2 HSPID_OUT_IDX
#define MOSI_IDX_3 VSPID_OUT_IDX
#define SCLK_IDX_2 HSPICLK_OUT_IDX
#define SCLK_IDX_3 VSPICLK_OUT_IDX
#define CSEL_IDX_2 HSPICS0_OUT_IDX
#define CSEL_IDX_3 VSPICS0_OUT_IDX
#elif defined(CONFIG_SOC_ESP32S2)
#define MISO_IDX_2 FSPIQ_IN_IDX #define MISO_IDX_2 FSPIQ_IN_IDX
#define MISO_IDX_3 SPI3_Q_IN_IDX #define MISO_IDX_3 SPI3_Q_IN_IDX
#define MOSI_IDX_2 FSPID_OUT_IDX #define MOSI_IDX_2 FSPID_OUT_IDX
@ -157,42 +147,6 @@ static int spi_esp32_init(const struct device *dev)
return 0; return 0;
} }
static int spi_esp32_configure_pin(gpio_pin_t pin, int pin_sig,
bool use_iomux,
gpio_flags_t pin_mode)
{
const char *device_name = gpio_esp32_get_gpio_for_pin(pin);
const struct device *gpio;
int ret;
if (!device_name) {
LOG_ERR("Could not find GPIO node on devicetree");
return -EINVAL;
}
gpio = device_get_binding(device_name);
if (!gpio) {
LOG_ERR("Could not bind to GPIO device");
return -EIO;
}
if (use_iomux) {
ret = gpio_pin_configure(gpio, pin, pin_mode);
if (ret < 0) {
LOG_ERR("SPI pin configuration failed");
return ret;
}
}
if (pin_mode == GPIO_INPUT) {
esp_rom_gpio_matrix_in(pin, pin_sig, false);
} else {
esp_rom_gpio_matrix_out(pin, pin_sig, false, false);
}
return 0;
}
static inline spi_ll_io_mode_t spi_esp32_get_io_mode(uint16_t operation) static inline spi_ll_io_mode_t spi_esp32_get_io_mode(uint16_t operation)
{ {
if (IS_ENABLED(CONFIG_SPI_EXTENDED_MODES)) { if (IS_ENABLED(CONFIG_SPI_EXTENDED_MODES)) {
@ -252,31 +206,7 @@ static int IRAM_ATTR spi_esp32_configure(const struct device *dev,
return -ENOTSUP; return -ENOTSUP;
} }
spi_esp32_configure_pin(cfg->pins.miso, int ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
cfg->signals.miso_s,
cfg->use_iomux,
GPIO_INPUT);
spi_esp32_configure_pin(cfg->pins.mosi,
cfg->signals.mosi_s,
cfg->use_iomux,
GPIO_OUTPUT_LOW);
spi_esp32_configure_pin(cfg->pins.sclk,
cfg->signals.sclk_s,
cfg->use_iomux,
GPIO_OUTPUT);
if (ctx->config->cs == NULL) {
hal_dev->cs_setup = 1;
hal_dev->cs_hold = 1;
hal_dev->cs_pin_id = 0;
spi_esp32_configure_pin(cfg->pins.csel,
cfg->signals.csel_s,
cfg->use_iomux,
GPIO_OUTPUT | GPIO_ACTIVE_LOW);
}
/* input parameters to calculate timing configuration */ /* input parameters to calculate timing configuration */
spi_hal_timing_param_t timing_param = { spi_hal_timing_param_t timing_param = {
@ -421,7 +351,12 @@ static const struct spi_driver_api spi_api = {
#define GET_AS_CS(idx) #define GET_AS_CS(idx)
#endif #endif
#define SPI2_PINSTATE_IDX 0
#define SPI3_PINSTATE_IDX 1
#define ESP32_SPI_INIT(idx) \ #define ESP32_SPI_INIT(idx) \
\
PINCTRL_DT_INST_DEFINE(SPI##idx##_PINSTATE_IDX); \
\ \
static struct spi_esp32_data spi_data_##idx = { \ static struct spi_esp32_data spi_data_##idx = { \
SPI_CONTEXT_INIT_LOCK(spi_data_##idx, ctx), \ SPI_CONTEXT_INIT_LOCK(spi_data_##idx, ctx), \
@ -446,21 +381,7 @@ static const struct spi_driver_api spi_api = {
.duty_cycle = 0, \ .duty_cycle = 0, \
.input_delay_ns = 0, \ .input_delay_ns = 0, \
.irq_source = DT_IRQN(DT_NODELABEL(spi##idx)), \ .irq_source = DT_IRQN(DT_NODELABEL(spi##idx)), \
.use_iomux = DT_PROP(DT_NODELABEL(spi##idx), use_iomux), \ .pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(SPI##idx##_PINSTATE_IDX), \
.signals = { \
.miso_s = MISO_IDX_##idx, \
.mosi_s = MOSI_IDX_##idx, \
.sclk_s = SCLK_IDX_##idx, \
.csel_s = CSEL_IDX_##idx \
}, \
\
.pins = { \
.miso = DT_PROP(DT_NODELABEL(spi##idx), miso_pin), \
.mosi = DT_PROP(DT_NODELABEL(spi##idx), mosi_pin), \
.sclk = DT_PROP(DT_NODELABEL(spi##idx), sclk_pin), \
.csel = DT_PROP(DT_NODELABEL(spi##idx), csel_pin) \
}, \
\
.clock_subsys = \ .clock_subsys = \
(clock_control_subsys_t)DT_CLOCKS_CELL( \ (clock_control_subsys_t)DT_CLOCKS_CELL( \
DT_NODELABEL(spi##idx), offset), \ DT_NODELABEL(spi##idx), offset), \

19
drivers/spi/spi_esp32_spim.h
View file

@ -7,6 +7,8 @@
#ifndef ZEPHYR_DRIVERS_SPI_ESP32_SPIM_H_ #ifndef ZEPHYR_DRIVERS_SPI_ESP32_SPIM_H_
#define ZEPHYR_DRIVERS_SPI_ESP32_SPIM_H_ #define ZEPHYR_DRIVERS_SPI_ESP32_SPIM_H_
#include <drivers/pinctrl.h>
#define SPI_MASTER_FREQ_8M (APB_CLK_FREQ/10) #define SPI_MASTER_FREQ_8M (APB_CLK_FREQ/10)
#define SPI_MASTER_FREQ_9M (APB_CLK_FREQ/9) /* 8.89MHz */ #define SPI_MASTER_FREQ_9M (APB_CLK_FREQ/9) /* 8.89MHz */
#define SPI_MASTER_FREQ_10M (APB_CLK_FREQ/8) /* 10MHz */ #define SPI_MASTER_FREQ_10M (APB_CLK_FREQ/8) /* 10MHz */
@ -24,23 +26,8 @@ struct spi_esp32_config {
int duty_cycle; int duty_cycle;
int input_delay_ns; int input_delay_ns;
int irq_source; int irq_source;
bool use_iomux; const struct pinctrl_dev_config *pcfg;
clock_control_subsys_t clock_subsys; clock_control_subsys_t clock_subsys;
struct {
int miso_s;
int mosi_s;
int sclk_s;
int csel_s;
} signals;
struct {
int miso;
int mosi;
int sclk;
int csel;
} pins;
}; };
struct spi_esp32_data { struct spi_esp32_data {