diff options
| author | Keith Short <keithshort@chromium.org> | 2022-05-19 11:06:23 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-05-23 21:47:32 +0000 |
| commit | a6ec853ac67443170e2ded02efc9b2d405569b01 (patch) | |
| tree | af3e8458c25929f88b1f1246b0c946468ad596d5 /zephyr/boards/arm/npcx9 | |
| parent | ac169aac50a52937341191014d51550b49a49380 (diff) | |
| download | chrome-ec-a6ec853ac67443170e2ded02efc9b2d405569b01.tar.gz | |
zephyr: npcx: update common board code for pinctrl
Update the common board code for npcx7, npcx9m3f, and npcx9m7f to use
the pinctrl driver instead of the pinmux driver.
BUG=b:232543902
BRANCH=none
TEST=zmake testall
Cq-Depend: chromium:3655283, chromium:3658768
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I83cfc24ac5e7c8901d3ca4ed9fda86b92313d6ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3655282
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Diffstat (limited to 'zephyr/boards/arm/npcx9')
| -rw-r--r-- | zephyr/boards/arm/npcx9/npcx9.dtsi | 4 | ||||
| -rw-r--r-- | zephyr/boards/arm/npcx9/npcx9m3f_defconfig | 3 | ||||
| -rw-r--r-- | zephyr/boards/arm/npcx9/npcx9m7f_defconfig | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/zephyr/boards/arm/npcx9/npcx9.dtsi b/zephyr/boards/arm/npcx9/npcx9.dtsi index 9b907ce80a..fa4fb6809f 100644 --- a/zephyr/boards/arm/npcx9/npcx9.dtsi +++ b/zephyr/boards/arm/npcx9/npcx9.dtsi @@ -4,6 +4,7 @@ */ #include <dt-bindings/gpio_defines.h> +#include <nuvoton/npcx/npcx9/npcx9-pinctrl.dtsi> / { model = "NPCX9"; @@ -41,7 +42,8 @@ &uart1 { status = "okay"; current-speed = <115200>; - pinctrl-0 = <&altj_cr_sin1_sl2 &altj_cr_sout1_sl2>; + pinctrl-0 = <&uart1_2_sin_gp64 &uart1_2_sout_gp65>; + pinctrl-names = "default"; }; &cros_kb_raw { diff --git a/zephyr/boards/arm/npcx9/npcx9m3f_defconfig b/zephyr/boards/arm/npcx9/npcx9m3f_defconfig index 18790143b0..f35fa4564b 100644 --- a/zephyr/boards/arm/npcx9/npcx9m3f_defconfig +++ b/zephyr/boards/arm/npcx9/npcx9m3f_defconfig @@ -20,6 +20,9 @@ CONFIG_UART_CONSOLE=y # Pinmux Driver CONFIG_PINMUX=y +# Pinctrl Driver +CONFIG_PINCTRL=y + # GPIO Controller CONFIG_GPIO=y diff --git a/zephyr/boards/arm/npcx9/npcx9m7f_defconfig b/zephyr/boards/arm/npcx9/npcx9m7f_defconfig index 4fcd8a3f00..b2015041f4 100644 --- a/zephyr/boards/arm/npcx9/npcx9m7f_defconfig +++ b/zephyr/boards/arm/npcx9/npcx9m7f_defconfig @@ -20,6 +20,9 @@ CONFIG_UART_CONSOLE=y # Pinmux Driver CONFIG_PINMUX=y +# Pinctrl Driver +CONFIG_PINCTRL=y + # GPIO Controller CONFIG_GPIO=y |