michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: pinctrl_emsdp: fix definition location

Browse source 
Mux Control Register Index are internals of driver, now
moved from dt-binding header to driver itself.

Signed-off-by: Siyuan Cheng <siyuanc@synopsys.com>
This commit is contained in:
Siyuan Cheng 2023-06-05 14:56:36 +08:00 • committed by Anas Nashif
commit 24efa6720d
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boards/arc/emsdp/emsdp-pinctrl.dtsi
View file

@ -133,6 +133,6 @@
/* INNER_CONNECT, DUMMY MUX */ /* INNER_CONNECT, DUMMY MUX */
unmuxed_pin: unmuxed_pin { unmuxed_pin: unmuxed_pin {
pinmux = <INNER_CONNECT NOT_PINMUX>; pinmux = <UNMUXED_PIN NOT_PINMUX>;
}; };
}; };

8
drivers/pinctrl/pinctrl_emsdp.c
View file

@ -11,6 +11,12 @@
#include <zephyr/drivers/pinctrl.h> #include <zephyr/drivers/pinctrl.h>
#include <zephyr/dt-bindings/pinctrl/emsdp-pinctrl.h> #include <zephyr/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 EMSDP_CREG_BASE DT_INST_REG_ADDR(0) #define EMSDP_CREG_BASE DT_INST_REG_ADDR(0)
#define EMSDP_CREG_PMOD_MUX_OFFSET (0x0030) #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); const uint32_t mux_regs = (EMSDP_CREG_BASE + EMSDP_CREG_PMOD_MUX_OFFSET);
uint32_t reg; uint32_t reg;
if (pin == INNER_CONNECT) { if (pin == UNMUXED_PIN) {
return 0; return 0;
} }

9
include/zephyr/dt-bindings/pinctrl/emsdp-pinctrl.h
View file

@ -7,13 +7,6 @@
#ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_EMSDP_PINCTRL_H_ #ifndef ZEPHYR_INCLUDE_DT_BINDINGS_PINCTRL_EMSDP_PINCTRL_H_
#define 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_A 0
#define PMOD_B 1 #define PMOD_B 1
#define PMOD_C 2 #define PMOD_C 2
@ -37,7 +30,7 @@
#define ARDUINO_PIN_AD3 20 #define ARDUINO_PIN_AD3 20
#define ARDUINO_PIN_AD4 21 #define ARDUINO_PIN_AD4 21
#define ARDUINO_PIN_AD5 22 #define ARDUINO_PIN_AD5 22
#define INNER_CONNECT 23 #define UNMUXED_PIN 23
#define PMOD_GPIO 0 #define PMOD_GPIO 0
#define PMOD_UARTA 1 #define PMOD_UARTA 1