summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu-An Chen <yu-an.chen@quanta.corp-partner.google.com>2022-11-11 15:06:38 +0800
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-11-14 23:07:40 +0000
commit425d70135bec0590518292cb1fdf83012c57986e (patch)
treed9b341d95dcf21300ef151a80b8ab79f42dae355
parent9e7107aeb41834a2d40f845f5644cf9c48fc3d1e (diff)
downloadchrome-ec-425d70135bec0590518292cb1fdf83012c57986e.tar.gz
evoker: Remove USB-A port
Evoker doesn't have USB-A. In here remove it. BUG=b:238571776 BRANCH=none TEST=check gpioget doesn't have USB-A related gpio name Signed-off-by: Yu-An Chen <yu-an.chen@quanta.corp-partner.google.com> Change-Id: I940d2d191683d14d748e014c2d2069aa02dd4d82 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4022556 Reviewed-by: Wai-Hong Tam <waihong@google.com> Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com> Commit-Queue: Wai-Hong Tam <waihong@google.com> Reviewed-by: Bob Moragues <moragues@chromium.org>
-rw-r--r--zephyr/program/herobrine/evoker/gpio.dtsi18
-rw-r--r--zephyr/program/herobrine/evoker/project.conf5
-rw-r--r--zephyr/program/herobrine/evoker/project.overlay7
3 files changed, 14 insertions, 16 deletions
diff --git a/zephyr/program/herobrine/evoker/gpio.dtsi b/zephyr/program/herobrine/evoker/gpio.dtsi
index bb693158fa..63225917c6 100644
--- a/zephyr/program/herobrine/evoker/gpio.dtsi
+++ b/zephyr/program/herobrine/evoker/gpio.dtsi
@@ -34,9 +34,6 @@
gpio_usb_c1_bc12_int_l: usb_c1_bc12_int_l {
gpios = <&gpio8 2 GPIO_INPUT_PULL_UP>;
};
- gpio_usb_a0_oc_odl: usb_a0_oc_odl {
- gpios = <&gpiof 4 GPIO_INPUT_PULL_UP>;
- };
gpio_chg_acok_od: chg_acok_od {
gpios = <&gpiod 2 GPIO_INPUT>;
enum-name = "GPIO_AC_PRESENT";
@@ -159,13 +156,6 @@
gpio_dp_hot_plug_det_r: dp_hot_plug_det_r {
gpios = <&gpio9 5 GPIO_OUTPUT_LOW>;
};
- gpio_en_usb_a_5v: en_usb_a_5v {
- gpios = <&gpiof 0 GPIO_OUTPUT_LOW>;
- enum-name = "GPIO_EN_USB_A_5V";
- };
- usb_a_cdp_ilim_en_l {
- gpios = <&gpio7 5 GPIO_OUTPUT_HIGH>;
- };
gpio_usb_c0_frs_en: usb_c0_frs_en {
gpios = <&gpioc 5 GPIO_OUTPUT_LOW>;
enum-name = "GPIO_USB_C0_FRS_EN";
@@ -238,11 +228,6 @@
};
};
- usba-port-enable-list {
- compatible = "cros-ec,usba-port-enable-pins";
- enable-pins = <&gpio_en_usb_a_5v>;
- };
-
gpio_id_sku: sku {
compatible = "cros-ec,gpio-id";
bits = <
@@ -288,6 +273,9 @@
<&gpioa 7 0>,
<&gpio5 0 0>,
<&gpio8 1 0>,
+ <&gpiof 0 0>,
+ <&gpio7 5 0>,
+ <&gpiof 4 0>,
<&gpiob 7 0>;
};
};
diff --git a/zephyr/program/herobrine/evoker/project.conf b/zephyr/program/herobrine/evoker/project.conf
index b4a5fce160..c2fecd48b5 100644
--- a/zephyr/program/herobrine/evoker/project.conf
+++ b/zephyr/program/herobrine/evoker/project.conf
@@ -13,4 +13,7 @@ CONFIG_PLATFORM_EC_ACCEL_BMA4XX=y
# ISL9238C disable the CMOUT latch function.
CONFIG_PLATFORM_EC_ISL9238C_DISABLE_CMOUT_LATCH=y
-CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_DUMP=y \ No newline at end of file
+CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_DUMP=y
+
+# Disable USB-A
+CONFIG_PLATFORM_EC_USBA=n
diff --git a/zephyr/program/herobrine/evoker/project.overlay b/zephyr/program/herobrine/evoker/project.overlay
index 04f6b2443d..61d3129f70 100644
--- a/zephyr/program/herobrine/evoker/project.overlay
+++ b/zephyr/program/herobrine/evoker/project.overlay
@@ -50,3 +50,10 @@
reg = <0x40>;
};
};
+
+/* interrupts overrides */
+/ {
+ gpio-interrupts {
+ /delete-node/ usb_a0_oc;
+ };
+};