diff options
| author | Ting Shen <phoenixshen@google.com> | 2022-04-11 16:55:06 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-04-12 07:42:37 +0000 |
| commit | e704d68437d67d03dd5f65fe58da0e9582815e7e (patch) | |
| tree | c071ec8b687831dff8d536bceeb58927540c64db | |
| parent | 7571b9cbe8994ea8694fcd08d7d1af01d6c4c4a3 (diff) | |
| download | chrome-ec-e704d68437d67d03dd5f65fe58da0e9582815e7e.tar.gz | |
krabby: rt9490: add irq pin
Move rt9490 interrupt handler from c code to device tree.
BUG=b:220814055
TEST=C1 BC1.2 works on krabby
BRANCH=none
Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: Ide64449e1c3dd23ecd2b06021ee39d746cb9b938
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3580113
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>
| -rw-r--r-- | zephyr/projects/corsola/interrupts_krabby.dts | 2 | ||||
| -rw-r--r-- | zephyr/projects/corsola/src/krabby/usbc_config.c | 11 | ||||
| -rw-r--r-- | zephyr/projects/corsola/usbc_krabby.dts | 1 |
3 files changed, 3 insertions, 11 deletions
diff --git a/zephyr/projects/corsola/interrupts_krabby.dts b/zephyr/projects/corsola/interrupts_krabby.dts index 2245c98c66..ddc9639d2b 100644 --- a/zephyr/projects/corsola/interrupts_krabby.dts +++ b/zephyr/projects/corsola/interrupts_krabby.dts @@ -104,7 +104,7 @@ int_usb_c1_bc12_charger: usb_c1_bc12_charger { irq-pin = <&usb_c1_bc12_charger_int_odl>; flags = <GPIO_INT_EDGE_FALLING>; - handler = "c1_bc12_interrupt"; + handler = "rt9490_bc12_dt_interrupt"; }; }; }; diff --git a/zephyr/projects/corsola/src/krabby/usbc_config.c b/zephyr/projects/corsola/src/krabby/usbc_config.c index b46a9edf8f..172fcef227 100644 --- a/zephyr/projects/corsola/src/krabby/usbc_config.c +++ b/zephyr/projects/corsola/src/krabby/usbc_config.c @@ -41,18 +41,9 @@ void c0_bc12_interrupt(enum gpio_signal signal) rt1739_interrupt(0); } -void c1_bc12_interrupt(enum gpio_signal signal) -{ - rt9490_interrupt(1); -} - - static void board_sub_bc12_init(void) { - if (corsola_get_db_type() == CORSOLA_DB_TYPEC) - gpio_enable_dt_interrupt( - GPIO_INT_FROM_NODELABEL(int_usb_c1_bc12_charger)); - else + if (corsola_get_db_type() == CORSOLA_DB_HDMI) /* If this is not a Type-C subboard, disable the task. */ task_disable_task(TASK_ID_USB_CHG_P1); } diff --git a/zephyr/projects/corsola/usbc_krabby.dts b/zephyr/projects/corsola/usbc_krabby.dts index 7ee4d2b8a5..8970ebc845 100644 --- a/zephyr/projects/corsola/usbc_krabby.dts +++ b/zephyr/projects/corsola/usbc_krabby.dts @@ -32,6 +32,7 @@ bc12 { compatible = "richtek,rt9490-bc12"; status = "okay"; + irq = <&int_usb_c1_bc12_charger>; }; ppc { compatible = "silergy,syv682x"; |