diff options
| -rw-r--r-- | include/ioexpander.h | 5 | ||||
| -rw-r--r-- | zephyr/Kconfig.ioex | 19 | ||||
| -rw-r--r-- | zephyr/projects/brya/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/projects/intelrvp/adlrvp/prj.conf | 2 | ||||
| -rw-r--r-- | zephyr/projects/intelrvp/mtlrvp/prj.conf | 2 | ||||
| -rw-r--r-- | zephyr/projects/skyrim/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/shim/src/gpio.c | 7 |
7 files changed, 6 insertions, 31 deletions
diff --git a/include/ioexpander.h b/include/ioexpander.h index c3023a2236..21d7034303 100644 --- a/include/ioexpander.h +++ b/include/ioexpander.h @@ -124,11 +124,6 @@ inline const char *ioex_get_name(enum ioex_signal signal) return gpio_get_name(signal); } -inline int signal_is_ioex(int signal) -{ - return 0; -} - #else /* diff --git a/zephyr/Kconfig.ioex b/zephyr/Kconfig.ioex index ce020c4fbb..24a946777d 100644 --- a/zephyr/Kconfig.ioex +++ b/zephyr/Kconfig.ioex @@ -2,15 +2,13 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -menuconfig PLATFORM_EC_IOEX +menuconfig PLATFORM_EC_IOEX_CROS_DRV bool "IO expander support" depends on I2C help - Enable support for IO expanders subsystem. - This will allow to use CrOS EC calls to ioex_* functions. It supports - both CrOS EC ioex drivers and Zephyr GPIO drivers. + Enable support for CrOS EC ioex drivers. -if PLATFORM_EC_IOEX +if PLATFORM_EC_IOEX_CROS_DRV config PLATFORM_EC_IOEX_INIT_PRIORITY int "IO expander init priority" @@ -20,44 +18,33 @@ config PLATFORM_EC_IOEX_INIT_PRIORITY Sets the priority of function that initializes the IO expander subsystem -config PLATFORM_EC_IOEX_CROS_DRV - bool - help - Enable support for CrOS EC IO expander drivers - config PLATFORM_EC_IOEX_CCGXXF bool "Cypress CCGXXF" - select PLATFORM_EC_IOEX_CROS_DRV help Enables driver for Cypress CCGXXF IO expander (built inside PD chip) config PLATFORM_EC_IOEX_IT8801 bool "IT8801" - select PLATFORM_EC_IOEX_CROS_DRV help Enables support for IT8801 IO expander with keyboard matrix controller config PLATFORM_EC_IOEX_NCT38XX bool "Nuvoton NCT38xx" - select PLATFORM_EC_IOEX_CROS_DRV help Enables support for IO expander built inside Nuvoton NCT38xx TCPC config PLATFORM_EC_IOEX_PCA9675 bool "NXP PCA9675PW" - select PLATFORM_EC_IOEX_CROS_DRV help Enables support for NXP PCA9675PW IO expander config PLATFORM_EC_IOEX_PCAL6408 bool "NXP PCA(L)6408" - select PLATFORM_EC_IOEX_CROS_DRV help Enables support for NXP PCA(L)6408 IO expander config PLATFORM_EC_IOEX_TCA64XXA bool "TI TCA64xA" - select PLATFORM_EC_IOEX_CROS_DRV help Enables support for Texas Instruments TCA64xxA IO expanders family diff --git a/zephyr/projects/brya/prj.conf b/zephyr/projects/brya/prj.conf index 5d074e8111..931053c5f2 100644 --- a/zephyr/projects/brya/prj.conf +++ b/zephyr/projects/brya/prj.conf @@ -180,7 +180,6 @@ CONFIG_PWM=y CONFIG_PWM_SHELL=n #IOEX -CONFIG_PLATFORM_EC_IOEX=y CONFIG_GPIO_NCT38XX=y # TODO(b/188605676): bring these features up diff --git a/zephyr/projects/intelrvp/adlrvp/prj.conf b/zephyr/projects/intelrvp/adlrvp/prj.conf index c9493799ec..5b1a47ebf0 100644 --- a/zephyr/projects/intelrvp/adlrvp/prj.conf +++ b/zephyr/projects/intelrvp/adlrvp/prj.conf @@ -61,7 +61,7 @@ CONFIG_PLATFORM_EC_USBC_PPC_SN5S330=y CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB=y # IOEX -CONFIG_PLATFORM_EC_IOEX=y +CONFIG_PLATFORM_EC_IOEX_CROS_DRV=y CONFIG_PLATFORM_EC_IOEX_PCA9675=y CONFIG_GPIO_PCA95XX=y diff --git a/zephyr/projects/intelrvp/mtlrvp/prj.conf b/zephyr/projects/intelrvp/mtlrvp/prj.conf index bea2791efe..607bf3a9d1 100644 --- a/zephyr/projects/intelrvp/mtlrvp/prj.conf +++ b/zephyr/projects/intelrvp/mtlrvp/prj.conf @@ -24,7 +24,7 @@ CONFIG_PLATFORM_EC_USBC=n CONFIG_PLATFORM_EC_CHARGER=n # IOEX -CONFIG_PLATFORM_EC_IOEX=y +CONFIG_PLATFORM_EC_IOEX_CROS_DRV=y CONFIG_GPIO_PCA95XX=y CONFIG_GPIO_NCT38XX=y CONFIG_PLATFORM_EC_IOEX_IT8801=y diff --git a/zephyr/projects/skyrim/prj.conf b/zephyr/projects/skyrim/prj.conf index 5ad8a82718..aea666c234 100644 --- a/zephyr/projects/skyrim/prj.conf +++ b/zephyr/projects/skyrim/prj.conf @@ -128,7 +128,6 @@ CONFIG_TASK_PD_STACK_SIZE=1280 # IOEX CONFIG_GPIO_NCT38XX=y -CONFIG_PLATFORM_EC_IOEX=y # Hibernate and wake CONFIG_PLATFORM_EC_BOARD_RESET_AFTER_POWER_ON=y diff --git a/zephyr/shim/src/gpio.c b/zephyr/shim/src/gpio.c index 8f73d072b6..eb395813c8 100644 --- a/zephyr/shim/src/gpio.c +++ b/zephyr/shim/src/gpio.c @@ -154,16 +154,11 @@ void gpio_set_level_verbose(enum console_channel channel, void gpio_or_ioex_set_level(int signal, int value) { - if (IS_ENABLED(CONFIG_PLATFORM_EC_IOEX) && signal_is_ioex(signal)) - ioex_set_level(signal, value); - else - gpio_set_level(signal, value); + gpio_set_level(signal, value); } int gpio_or_ioex_get_level(int signal, int *value) { - if (IS_ENABLED(CONFIG_PLATFORM_EC_IOEX) && signal_is_ioex(signal)) - return ioex_get_level(signal, value); *value = gpio_get_level(signal); return EC_SUCCESS; } |