diff options
| author | Dawid Niedzwiecki <dn@semihalf.com> | 2022-04-05 09:08:25 +0200 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-04-06 17:03:10 +0000 |
| commit | abf28671f03d7944d9504c0da786baf542a940aa (patch) | |
| tree | 217d6059c3f116eaf9bbd0c4171c2703f9a664f7 | |
| parent | 716aa07c72fc7f8bb03c56e9fcd336bf13e765c7 (diff) | |
| download | chrome-ec-abf28671f03d7944d9504c0da786baf542a940aa.tar.gz | |
zephyr: move usb-a configuration to DTS
Lazor and Brya define the usb_port_enable array in the board-specific
code. Add the "cros-ec,usba-port-enable-pins" node to device-tree which
generates the array automatically.
This shouldn't affect the output binary.
BUG=b:227472576
TEST=zmake testall && make buildall
BRANCH=main
Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com>
Change-Id: Ib11e45fc41ec5b33bbe2d792802395d9cba1a80c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3569771
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | board/brya/usbc_config.c | 2 | ||||
| -rw-r--r-- | zephyr/projects/brya/gpio.dts | 6 | ||||
| -rw-r--r-- | zephyr/projects/trogdor/lazor/gpio.dts | 7 | ||||
| -rw-r--r-- | zephyr/projects/trogdor/lazor/src/usbc_config.c | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/board/brya/usbc_config.c b/board/brya/usbc_config.c index 038bf3459f..a252559bb0 100644 --- a/board/brya/usbc_config.c +++ b/board/brya/usbc_config.c @@ -89,9 +89,11 @@ BUILD_ASSERT(CONFIG_USB_PD_PORT_MAX_COUNT == USBC_PORT_COUNT); /******************************************************************************/ /* USB-A charging control */ +#ifndef CONFIG_ZEPHYR const int usb_port_enable[USB_PORT_COUNT] = { GPIO_EN_PP5000_USBA_R, }; +#endif BUILD_ASSERT(ARRAY_SIZE(usb_port_enable) == USB_PORT_COUNT); /******************************************************************************/ diff --git a/zephyr/projects/brya/gpio.dts b/zephyr/projects/brya/gpio.dts index 9bf93035e8..2df6e38164 100644 --- a/zephyr/projects/brya/gpio.dts +++ b/zephyr/projects/brya/gpio.dts @@ -239,7 +239,7 @@ gpios = <&gpio8 3 GPIO_INPUT>; enum-name = "GPIO_USB_C2_BC12_INT_ODL"; }; - en_pp5000_usba_r { + gpio_en_pp5000_usba_r: en_pp5000_usba_r { gpios = <&gpiod 7 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PP5000_USBA_R"; }; @@ -300,6 +300,10 @@ }; }; + usba-port-enable-list { + compatible = "cros-ec,usba-port-enable-pins"; + enable-pins = <&gpio_en_pp5000_usba_r>; + }; }; &i2c1_0 { diff --git a/zephyr/projects/trogdor/lazor/gpio.dts b/zephyr/projects/trogdor/lazor/gpio.dts index 4758456c5f..3a20dc865f 100644 --- a/zephyr/projects/trogdor/lazor/gpio.dts +++ b/zephyr/projects/trogdor/lazor/gpio.dts @@ -180,7 +180,7 @@ gpio_dp_hot_plug_det: dp_hot_plug_det { gpios = <&gpio9 5 GPIO_OUTPUT_LOW>; }; - en_usb_a_5v { + gpio_en_usb_a_5v: en_usb_a_5v { gpios = <&gpio8 6 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_USB_A_5V"; }; @@ -224,6 +224,11 @@ }; }; + usba-port-enable-list { + compatible = "cros-ec,usba-port-enable-pins"; + enable-pins = <&gpio_en_usb_a_5v>; + }; + def-lvol-io-list { compatible = "nuvoton,npcx-lvolctrl-def"; lvol-io-pads = < diff --git a/zephyr/projects/trogdor/lazor/src/usbc_config.c b/zephyr/projects/trogdor/lazor/src/usbc_config.c index 057453b343..09b2776c20 100644 --- a/zephyr/projects/trogdor/lazor/src/usbc_config.c +++ b/zephyr/projects/trogdor/lazor/src/usbc_config.c @@ -158,10 +158,6 @@ const struct usb_mux usb_muxes[CONFIG_USB_PD_PORT_MAX_COUNT] = { } }; -const int usb_port_enable[USB_PORT_COUNT] = { - GPIO_EN_USB_A_5V, -}; - __override int board_get_default_battery_type(void) { /* |