diff --git a/boards/arc/emsdp/emsdp-pinctrl.dtsi b/boards/arc/emsdp/emsdp-pinctrl.dtsi index 0873c798c40..e54541a7bf1 100644 --- a/boards/arc/emsdp/emsdp-pinctrl.dtsi +++ b/boards/arc/emsdp/emsdp-pinctrl.dtsi @@ -133,6 +133,6 @@ /* INNER_CONNECT, DUMMY MUX */ unmuxed_pin: unmuxed_pin { - pinmux = ; + pinmux = ; }; }; diff --git a/drivers/pinctrl/pinctrl_emsdp.c b/drivers/pinctrl/pinctrl_emsdp.c index 07f5df35473..c535c91728f 100644 --- a/drivers/pinctrl/pinctrl_emsdp.c +++ b/drivers/pinctrl/pinctrl_emsdp.c @@ -11,6 +11,12 @@ #include #include +/** + * Mux Control Register Index + */ +#define PMOD_MUX_CTRL 0 /*!< 32-bits, offset 0x0 */ +#define ARDUINO_MUX_CTRL 4 /*!< 32-bits, offset 0x4 */ + #define EMSDP_CREG_BASE DT_INST_REG_ADDR(0) #define EMSDP_CREG_PMOD_MUX_OFFSET (0x0030) @@ -103,7 +109,7 @@ static int pinctrl_emsdp_set(uint32_t pin, uint32_t type) const uint32_t mux_regs = (EMSDP_CREG_BASE + EMSDP_CREG_PMOD_MUX_OFFSET); uint32_t reg; - if (pin == INNER_CONNECT) { + if (pin == UNMUXED_PIN) { return 0; } diff --git a/include/zephyr/dt-bindings/pinctrl/emsdp-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/emsdp-pinctrl.h index f3cfc60ffa4..7ba0534784b 100644 --- a/include/zephyr/dt-bindings/pinctrl/emsdp-pinctrl.h +++ b/include/zephyr/dt-bindings/pinctrl/emsdp-pinctrl.h @@ -7,13 +7,6 @@ #ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_EMSDP_PINCTRL_H_ #define ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_EMSDP_PINCTRL_H_ -/** - * Mux Control Register Index - */ -#define PMOD_MUX_CTRL 0 /*!< 32-bits, offset 0x0 */ - -#define ARDUINO_MUX_CTRL 4 /*!< 32-bits, offset 0x4 */ - #define PMOD_A 0 #define PMOD_B 1 #define PMOD_C 2 @@ -37,7 +30,7 @@ #define ARDUINO_PIN_AD3 20 #define ARDUINO_PIN_AD4 21 #define ARDUINO_PIN_AD5 22 -#define INNER_CONNECT 23 +#define UNMUXED_PIN 23 #define PMOD_GPIO 0 #define PMOD_UARTA 1