summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Hurst <shurst@google.com>2022-02-09 18:44:59 -0800
committerCommit Bot <commit-bot@chromium.org>2022-02-12 05:10:54 +0000
commit93278d73feea420d22b3532f744be2f9d42c797f (patch)
treed08ad44d6d7a0ac70c5062731760c5d70c1ef88d
parenta15b02fa95a59bee86b07293a4633c8e91d4749d (diff)
downloadchrome-ec-93278d73feea420d22b3532f744be2f9d42c797f.tar.gz
zephyr: Add USBA for herobrine_npcx9 to device tree
This patch removes custom USBA logic and uses device tree implementation instead. BRANCH=main BUG=b:194432779 TEST=zmake configure -b herobrine_npcx9 Signed-off-by: Sam Hurst <shurst@google.org> Change-Id: I2c75c325822ada4f06be173f3ac7c5d687c50f9c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3451517 Tested-by: Sam Hurst <shurst@google.com> Reviewed-by: Wai-Hong Tam <waihong@google.com> Commit-Queue: Sam Hurst <shurst@google.com>
-rw-r--r--zephyr/projects/herobrine/gpio.dts7
-rw-r--r--zephyr/projects/herobrine/src/usbc_config.c4
2 files changed, 6 insertions, 5 deletions
diff --git a/zephyr/projects/herobrine/gpio.dts b/zephyr/projects/herobrine/gpio.dts
index 772bff5d5b..635608776a 100644
--- a/zephyr/projects/herobrine/gpio.dts
+++ b/zephyr/projects/herobrine/gpio.dts
@@ -166,7 +166,7 @@
gpio_dp_hot_plug_det_r: dp_hot_plug_det_r {
gpios = <&gpio9 5 GPIO_OUT_LOW>;
};
- en_usb_a_5v {
+ gpio_en_usb_a_5v: en_usb_a_5v {
gpios = <&gpiof 0 GPIO_OUT_LOW>;
enum-name = "GPIO_EN_USB_A_5V";
};
@@ -243,6 +243,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/herobrine/src/usbc_config.c b/zephyr/projects/herobrine/src/usbc_config.c
index be63e1bfd9..c8dc4381ff 100644
--- a/zephyr/projects/herobrine/src/usbc_config.c
+++ b/zephyr/projects/herobrine/src/usbc_config.c
@@ -146,10 +146,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,
-};
-
/* Initialize board USC-C things */
static void board_init_usbc(void)
{