michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/can: stm32: use new pinctrl API

Browse source 
Use the new pinctrl API to configure pins.

Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
This commit is contained in:
Erwan Gouriou 2021-11-05 15:21:13 +01:00 • committed by Carles Cufí
commit 337c9b96e9
3 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
drivers/can/can_stm32.c
View file

@ -6,7 +6,7 @@
#include <drivers/clock_control/stm32_clock_control.h> #include <drivers/clock_control/stm32_clock_control.h>
#include <drivers/clock_control.h> #include <drivers/clock_control.h>
#include <pinmux/pinmux_stm32.h> #include <drivers/pinctrl.h>
#include <sys/util.h> #include <sys/util.h>
#include <string.h> #include <string.h>
#include <kernel.h> #include <kernel.h>
@ -454,9 +454,7 @@ static int can_stm32_init(const struct device *dev)
} }
/* Configure dt provided device signals when available */ /* Configure dt provided device signals when available */
ret = stm32_dt_pinctrl_configure(cfg->pinctrl, ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
cfg->pinctrl_len,
(uint32_t)cfg->can);
if (ret < 0) { if (ret < 0) {
LOG_ERR("CAN pinctrl setup failed (%d)", ret); LOG_ERR("CAN pinctrl setup failed (%d)", ret);
return ret; return ret;
@ -1133,8 +1131,7 @@ static const struct can_driver_api can_api_funcs = {
static void config_can_1_irq(CAN_TypeDef *can); static void config_can_1_irq(CAN_TypeDef *can);
static const struct soc_gpio_pinctrl pins_can_1[] = PINCTRL_DT_DEFINE(DT_NODELABEL(can1))
ST_STM32_DT_PINCTRL(can1, 0);
static const struct can_stm32_config can_stm32_cfg_1 = { static const struct can_stm32_config can_stm32_cfg_1 = {
.can = (CAN_TypeDef *)DT_REG_ADDR(DT_NODELABEL(can1)), .can = (CAN_TypeDef *)DT_REG_ADDR(DT_NODELABEL(can1)),
@ -1150,8 +1147,7 @@ static const struct can_stm32_config can_stm32_cfg_1 = {
.bus = DT_CLOCKS_CELL(DT_NODELABEL(can1), bus), .bus = DT_CLOCKS_CELL(DT_NODELABEL(can1), bus),
}, },
.config_irq = config_can_1_irq, .config_irq = config_can_1_irq,
.pinctrl = pins_can_1, .pcfg = PINCTRL_DT_DEV_CONFIG_GET(DT_NODELABEL(can1))
.pinctrl_len = ARRAY_SIZE(pins_can_1)
}; };
static struct can_stm32_data can_stm32_dev_data_1; static struct can_stm32_data can_stm32_dev_data_1;
@ -1231,8 +1227,7 @@ NET_DEVICE_INIT(socket_can_stm32_1, SOCKET_CAN_NAME_1, socket_can_init_1,
static void config_can_2_irq(CAN_TypeDef *can); static void config_can_2_irq(CAN_TypeDef *can);
static const struct soc_gpio_pinctrl pins_can_2[] = PINCTRL_DT_DEFINE(DT_NODELABEL(can2))
ST_STM32_DT_PINCTRL(can2, 0);
static const struct can_stm32_config can_stm32_cfg_2 = { static const struct can_stm32_config can_stm32_cfg_2 = {
.can = (CAN_TypeDef *)DT_REG_ADDR(DT_NODELABEL(can2)), .can = (CAN_TypeDef *)DT_REG_ADDR(DT_NODELABEL(can2)),
@ -1249,8 +1244,7 @@ static const struct can_stm32_config can_stm32_cfg_2 = {
.bus = DT_CLOCKS_CELL(DT_NODELABEL(can2), bus), .bus = DT_CLOCKS_CELL(DT_NODELABEL(can2), bus),
}, },
.config_irq = config_can_2_irq, .config_irq = config_can_2_irq,
.pinctrl = pins_can_2, .pcfg = PINCTRL_DT_DEV_CONFIG_GET(DT_NODELABEL(can2))
.pinctrl_len = ARRAY_SIZE(pins_can_2)
}; };
static struct can_stm32_data can_stm32_dev_data_2; static struct can_stm32_data can_stm32_dev_data_2;

3
drivers/can/can_stm32.h
View file

@ -77,8 +77,7 @@ struct can_stm32_config {
uint8_t ts2; uint8_t ts2;
struct stm32_pclken pclken; struct stm32_pclken pclken;
void (*config_irq)(CAN_TypeDef *can); void (*config_irq)(CAN_TypeDef *can);
const struct soc_gpio_pinctrl *pinctrl; const struct pinctrl_dev_config *pcfg;
size_t pinctrl_len;
}; };
#endif /*ZEPHYR_DRIVERS_CAN_STM32_CAN_H_*/ #endif /*ZEPHYR_DRIVERS_CAN_STM32_CAN_H_*/

11
dts/bindings/can/st,stm32-can.yaml
View file

@ -2,7 +2,7 @@ description: STM32 CAN controller
compatible: "st,stm32-can" compatible: "st,stm32-can"
include: can-controller.yaml include: [can-controller.yaml, pinctrl-device.yaml]
properties: properties:
reg: reg:
@ -14,15 +14,6 @@ properties:
clocks: clocks:
required: true required: true
pinctrl-0:
type: phandles
required: false
description: |
GPIO pin configuration for CAN RX and TX. The phandles are
expected to reference pinctrl nodes, e.g.
pinctrl-0 = <&can1_rx_pa11 &can1_tx_pa12>;
master-can-reg: master-can-reg:
type: int type: int
required: false required: false