diff options
| author | Keith Short <keithshort@chromium.org> | 2022-02-10 17:26:31 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-02-25 21:11:16 +0000 |
| commit | a321a231a85662deec5b4b707ea4eea94c7a846e (patch) | |
| tree | c682cf282e7d1ccde5530fb756664d3e057ff036 | |
| parent | 258b8b1f495388014852661a49d34e5a72b60aba (diff) | |
| download | chrome-ec-a321a231a85662deec5b4b707ea4eea94c7a846e.tar.gz | |
zephyr: Fix GPIO includes for skyrim
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: Ib809dbbd438ce53482bc32a3c14603e11ebad82d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3489250
Reviewed-by: Aaron Massey <aaronmassey@google.com>
| -rw-r--r-- | zephyr/projects/skyrim/led.c | 1 | ||||
| -rw-r--r-- | zephyr/projects/skyrim/power_signals.c | 3 | ||||
| -rw-r--r-- | zephyr/projects/skyrim/power_signals_guybrush.c | 6 | ||||
| -rw-r--r-- | zephyr/projects/skyrim/usb_pd_policy.c | 3 | ||||
| -rw-r--r-- | zephyr/projects/skyrim/usbc_config.c | 3 |
5 files changed, 11 insertions, 5 deletions
diff --git a/zephyr/projects/skyrim/led.c b/zephyr/projects/skyrim/led.c index 6a2a2e4609..c8a6fefb7c 100644 --- a/zephyr/projects/skyrim/led.c +++ b/zephyr/projects/skyrim/led.c @@ -8,7 +8,6 @@ #include "common.h" #include "led_onoff_states.h" #include "led_common.h" -#include "gpio.h" #include "hooks.h" #include "pwm.h" diff --git a/zephyr/projects/skyrim/power_signals.c b/zephyr/projects/skyrim/power_signals.c index be85dfddd8..23037d8331 100644 --- a/zephyr/projects/skyrim/power_signals.c +++ b/zephyr/projects/skyrim/power_signals.c @@ -5,13 +5,14 @@ #include "chipset.h" #include "config.h" -#include "gpio.h" +#include "gpio_signal.h" #include "gpio/gpio_int.h" #include "hooks.h" #include "power.h" #include "timer.h" /* Power Signal Input List */ +/* TODO: b/218904113: Convert to using Zephyr GPIOs */ const struct power_signal_info power_signal_list[] = { [X86_SLP_S3_N] = { .gpio = GPIO_PCH_SLP_S3_L, diff --git a/zephyr/projects/skyrim/power_signals_guybrush.c b/zephyr/projects/skyrim/power_signals_guybrush.c index 94d2c267e5..68f29e7e9a 100644 --- a/zephyr/projects/skyrim/power_signals_guybrush.c +++ b/zephyr/projects/skyrim/power_signals_guybrush.c @@ -3,15 +3,18 @@ * found in the LICENSE file. */ +#include <drivers/gpio.h> + #include "chipset.h" #include "config.h" -#include "gpio.h" +#include "gpio_signal.h" #include "gpio/gpio_int.h" #include "hooks.h" #include "power.h" #include "timer.h" /* Wake Sources */ +/* TODO: b/218904113: Convert to using Zephyr GPIOs */ const enum gpio_signal hibernate_wake_pins[] = { GPIO_LID_OPEN, GPIO_AC_PRESENT, @@ -20,6 +23,7 @@ const enum gpio_signal hibernate_wake_pins[] = { const int hibernate_wake_pins_used = ARRAY_SIZE(hibernate_wake_pins); /* Power Signal Input List */ +/* TODO: b/218904113: Convert to using Zephyr GPIOs */ const struct power_signal_info power_signal_list[] = { [X86_SLP_S0_N] = { .gpio = GPIO_PCH_SLP_S0_L, diff --git a/zephyr/projects/skyrim/usb_pd_policy.c b/zephyr/projects/skyrim/usb_pd_policy.c index 4fe2ce2666..0e4a75126e 100644 --- a/zephyr/projects/skyrim/usb_pd_policy.c +++ b/zephyr/projects/skyrim/usb_pd_policy.c @@ -5,13 +5,14 @@ /* Shared USB-C policy for Zork boards */ +#include <drivers/gpio.h> + #include "charge_manager.h" #include "chipset.h" #include "common.h" #include "compile_time_macros.h" #include "console.h" #include "ec_commands.h" -#include "gpio.h" #include "ioexpander.h" #include "system.h" #include "usb_mux.h" diff --git a/zephyr/projects/skyrim/usbc_config.c b/zephyr/projects/skyrim/usbc_config.c index b8adb2c2f9..8fb932f1fd 100644 --- a/zephyr/projects/skyrim/usbc_config.c +++ b/zephyr/projects/skyrim/usbc_config.c @@ -5,6 +5,8 @@ /* Guybrush family-specific USB-C configuration */ +#include <drivers/gpio.h> + #include "cros_board_info.h" #include "battery_fuel_gauge.h" #include "charge_manager.h" @@ -22,7 +24,6 @@ #include "driver/tcpm/nct38xx.h" #include "driver/usb_mux/anx7451.h" #include "driver/usb_mux/amd_fp6.h" -#include "gpio.h" #include "gpio/gpio_int.h" #include "hooks.h" #include "ioexpander.h" |