zephyr: Fix GPIO includes for trogdor

Use the Zephyr driver GPIO include for Zephyr shim code instead of the
legacy EC GPIO header.

BUG=b:218856245
BRANCH=none
TEST=zmake testall

Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I0db2fc70e2d918c4c2a8b28e8e9f70f095fc6bf3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3489251
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>

7 files changed, 9 insertions, 27 deletions

diff --git a/zephyr/projects/trogdor/lazor/include/usbc_config.h b/zephyr/projects/trogdor/lazor/include/usbc_config.h
deleted file mode 100644
index a3ceb6694e..0000000000
--- a/zephyr/projects/trogdor/lazor/include/usbc_config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2022 The Chromium OS Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-/* lazor board-specific USB-C configuration */
-
-#ifndef __ZEPHYR_LAZOR_USBC_CONFIG_H
-#define __ZEPHYR_LAZOR_USBC_CONFIG_H
-
-#include "gpio.h"
-
-void tcpc_alert_event(enum gpio_signal signal);
-void usb0_evt(enum gpio_signal signal);
-void usb1_evt(enum gpio_signal signal);
-void usba_oc_interrupt(enum gpio_signal signal);
-void ppc_interrupt(enum gpio_signal signal);
-void board_connect_c0_sbu(enum gpio_signal s);
-
-#endif /* __ZEPHYR_LAZOR_USBC_CONFIG_H */
diff --git a/zephyr/projects/trogdor/lazor/src/led.c b/zephyr/projects/trogdor/lazor/src/led.c
index a35eb042f9..2d49d3ce59 100644
--- a/zephyr/projects/trogdor/lazor/src/led.c
+++ b/zephyr/projects/trogdor/lazor/src/led.c
@@ -5,12 +5,13 @@
  * Power and battery LED control.
  */
 
+#include <drivers/gpio.h>
+
 #include "battery.h"
 #include "charge_manager.h"
 #include "charge_state.h"
 #include "chipset.h"
 #include "ec_commands.h"
-#include "gpio.h"
 #include "hooks.h"
 #include "host_command.h"
 #include "led_common.h"
diff --git a/zephyr/projects/trogdor/lazor/src/power.c b/zephyr/projects/trogdor/lazor/src/power.c
index a14b8fc7eb..e3f0fc3c68 100644
--- a/zephyr/projects/trogdor/lazor/src/power.c
+++ b/zephyr/projects/trogdor/lazor/src/power.c
@@ -3,7 +3,8 @@
  * found in the LICENSE file.
  */
 
-#include "gpio.h"
+#include <drivers/gpio.h>
+
 #include "hooks.h"
 #include "power.h"
 #include "task.h"
diff --git a/zephyr/projects/trogdor/lazor/src/sku.c b/zephyr/projects/trogdor/lazor/src/sku.c
index d98f8342be..4f27b7dd32 100644
--- a/zephyr/projects/trogdor/lazor/src/sku.c
+++ b/zephyr/projects/trogdor/lazor/src/sku.c
@@ -8,7 +8,6 @@
 #include "console.h"
 #include "driver/ln9310.h"
 #include "tcpm/ps8xxx_public.h"
-#include "gpio.h"
 #include "hooks.h"
 #include "sku.h"
 #include "system.h"
diff --git a/zephyr/projects/trogdor/lazor/src/switchcap.c b/zephyr/projects/trogdor/lazor/src/switchcap.c
index 9c97a0f960..ed1f8a4284 100644
--- a/zephyr/projects/trogdor/lazor/src/switchcap.c
+++ b/zephyr/projects/trogdor/lazor/src/switchcap.c
@@ -3,11 +3,12 @@
  * found in the LICENSE file.
  */
 
+#include <drivers/gpio.h>
+
 #include "common.h"
 #include "config.h"
 #include "console.h"
 #include "driver/ln9310.h"
-#include "gpio.h"
 #include "gpio/gpio_int.h"
 #include "hooks.h"
 #include "i2c.h"
diff --git a/zephyr/projects/trogdor/lazor/src/usb_pd_policy.c b/zephyr/projects/trogdor/lazor/src/usb_pd_policy.c
index 108e3827b3..300bf46287 100644
--- a/zephyr/projects/trogdor/lazor/src/usb_pd_policy.c
+++ b/zephyr/projects/trogdor/lazor/src/usb_pd_policy.c
@@ -3,10 +3,11 @@
  * found in the LICENSE file.
  */
 
+#include <drivers/gpio.h>
+
 #include "charge_manager.h"
 #include "chipset.h"
 #include "console.h"
-#include "gpio.h"
 #include "system.h"
 #include "usb_mux.h"
 #include "usbc_ppc.h"
diff --git a/zephyr/projects/trogdor/lazor/src/usbc_config.c b/zephyr/projects/trogdor/lazor/src/usbc_config.c
index 8e402d2097..1206f86cc3 100644
--- a/zephyr/projects/trogdor/lazor/src/usbc_config.c
+++ b/zephyr/projects/trogdor/lazor/src/usbc_config.c
@@ -14,7 +14,7 @@
 #include "common.h"
 #include "config.h"
 #include "driver/ln9310.h"
-#include "gpio.h"
+#include "gpio_signal.h"
 #include "gpio/gpio_int.h"
 #include "hooks.h"
 #include "ppc/sn5s330_public.h"
@@ -23,7 +23,6 @@
 #include "tcpm/tcpci.h"
 #include "timer.h"
 #include "usb_pd.h"
-#include "usbc_config.h"
 #include "usb_mux.h"
 #include "usbc_ocp.h"
 #include "usbc_ppc.h"