diff --git a/drivers/spi/spi_rv32m1_lpspi.c b/drivers/spi/spi_rv32m1_lpspi.c index e674d071515..ca70cfb8377 100644 --- a/drivers/spi/spi_rv32m1_lpspi.c +++ b/drivers/spi/spi_rv32m1_lpspi.c @@ -12,6 +12,9 @@ #include #include #include +#ifdef CONFIG_PINCTRL +#include +#endif #define LOG_LEVEL CONFIG_SPI_LOG_LEVEL #include @@ -29,6 +32,9 @@ struct spi_mcux_config { clock_ip_name_t clock_ip_name; uint32_t clock_ip_src; void (*irq_config_func)(const struct device *dev); +#ifdef CONFIG_PINCTRL + const struct pinctrl_dev_config *pincfg; +#endif }; struct spi_mcux_data { @@ -274,6 +280,13 @@ static int spi_mcux_init(const struct device *dev) return err; } +#ifdef CONFIG_PINCTRL + err = pinctrl_apply_state(config->pincfg, PINCTRL_STATE_DEFAULT); + if (err != 0) { + return err; + } +#endif + spi_context_unlock_unconditionally(&data->ctx); return 0; @@ -287,7 +300,17 @@ static const struct spi_driver_api spi_mcux_driver_api = { .release = spi_mcux_release, }; +#ifdef CONFIG_PINCTRL +#define PINCTRL_INIT(n) .pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), +#define PINCTRL_DEFINE(n) PINCTRL_DT_INST_DEFINE(n); +#else +#define PINCTRL_DEFINE(n) +#define PINCTRL_INIT(n) +#endif + #define SPI_RV32M1_INIT(n) \ + PINCTRL_DEFINE(n) \ + \ static void spi_mcux_config_func_##n(const struct device *dev); \ \ static const struct spi_mcux_config spi_mcux_config_##n = { \ @@ -298,6 +321,7 @@ static const struct spi_driver_api spi_mcux_driver_api = { .irq_config_func = spi_mcux_config_func_##n, \ .clock_ip_name = INST_DT_CLOCK_IP_NAME(n), \ .clock_ip_src = kCLOCK_IpSrcFircAsync, \ + PINCTRL_INIT(n) \ }; \ \ static struct spi_mcux_data spi_mcux_data_##n = { \ diff --git a/dts/bindings/spi/openisa,rv32m1-lpspi.yaml b/dts/bindings/spi/openisa,rv32m1-lpspi.yaml index 935c8ee2f0e..85d4a594bb7 100644 --- a/dts/bindings/spi/openisa,rv32m1-lpspi.yaml +++ b/dts/bindings/spi/openisa,rv32m1-lpspi.yaml @@ -5,7 +5,7 @@ description: OpenISA LPSPI controller compatible: "openisa,rv32m1-lpspi" -include: spi-controller.yaml +include: [spi-controller.yaml, pinctrl-device.yaml] properties: reg: