diff options
Diffstat (limited to 'zephyr/include/drivers')
-rw-r--r-- | zephyr/include/drivers/cros_flash.h | 2 | ||||
-rw-r--r-- | zephyr/include/drivers/cros_kb_raw.h | 42 | ||||
-rw-r--r-- | zephyr/include/drivers/cros_rtc.h | 2 | ||||
-rw-r--r-- | zephyr/include/drivers/cros_shi.h | 2 | ||||
-rw-r--r-- | zephyr/include/drivers/cros_system.h | 2 |
5 files changed, 7 insertions, 43 deletions
diff --git a/zephyr/include/drivers/cros_flash.h b/zephyr/include/drivers/cros_flash.h index d7078cfb83..267649476b 100644 --- a/zephyr/include/drivers/cros_flash.h +++ b/zephyr/include/drivers/cros_flash.h @@ -16,8 +16,8 @@ #ifndef ZEPHYR_INCLUDE_DRIVERS_CROS_FLASH_H_ #define ZEPHYR_INCLUDE_DRIVERS_CROS_FLASH_H_ -#include <zephyr/device.h> #include <zephyr/kernel.h> +#include <zephyr/device.h> /** * @brief CROS Flash Driver APIs diff --git a/zephyr/include/drivers/cros_kb_raw.h b/zephyr/include/drivers/cros_kb_raw.h index 7b9255bb9f..d370a3bbde 100644 --- a/zephyr/include/drivers/cros_kb_raw.h +++ b/zephyr/include/drivers/cros_kb_raw.h @@ -22,11 +22,11 @@ #ifndef ZEPHYR_INCLUDE_DRIVERS_CROS_KB_RAW_H_ #define ZEPHYR_INCLUDE_DRIVERS_CROS_KB_RAW_H_ -#include "gpio_signal.h" - +#include <zephyr/kernel.h> #include <zephyr/device.h> #include <zephyr/drivers/gpio.h> -#include <zephyr/kernel.h> + +#include "gpio_signal.h" /* * When CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED is enabled, the keyboard @@ -60,17 +60,11 @@ typedef int (*cros_kb_raw_api_read_rows)(const struct device *dev); typedef int (*cros_kb_raw_api_enable_interrupt)(const struct device *dev, int enable); -typedef int (*cros_kb_raw_api_config_alt)(const struct device *dev, - bool enable); - __subsystem struct cros_kb_raw_driver_api { cros_kb_raw_api_init init; cros_kb_raw_api_drive_column drive_colum; cros_kb_raw_api_read_rows read_rows; cros_kb_raw_api_enable_interrupt enable_interrupt; -#ifdef CONFIG_PLATFORM_EC_KEYBOARD_FACTORY_TEST - cros_kb_raw_api_config_alt config_alt; -#endif }; /** @@ -180,36 +174,6 @@ static inline int z_impl_cros_kb_raw_enable_interrupt(const struct device *dev, } /** - * @brief Enable or disable keyboard alternative function. - * - * Enabling alternative function. - * - * @param dev Pointer to the device structure for the keyboard driver instance. - * @param enable If 1, enable keyboard function. Otherwise, disable it (as - * GPIO). - * - * @return 0 If successful. - * @retval -ENOTSUP Not supported api function. - */ - -#ifdef CONFIG_PLATFORM_EC_KEYBOARD_FACTORY_TEST -__syscall int cros_kb_raw_config_alt(const struct device *dev, bool enable); - -static inline int z_impl_cros_kb_raw_config_alt(const struct device *dev, - bool enable) -{ - const struct cros_kb_raw_driver_api *api = - (const struct cros_kb_raw_driver_api *)dev->api; - - if (!api->config_alt) { - return -ENOTSUP; - } - - return api->config_alt(dev, enable); -} -#endif - -/** * @brief Set the logical level of the keyboard column 2 output. * * When CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED is enabled, the column 2 diff --git a/zephyr/include/drivers/cros_rtc.h b/zephyr/include/drivers/cros_rtc.h index 540391aac6..3a0f332b98 100644 --- a/zephyr/include/drivers/cros_rtc.h +++ b/zephyr/include/drivers/cros_rtc.h @@ -16,8 +16,8 @@ #ifndef ZEPHYR_INCLUDE_DRIVERS_CROS_RTC_H_ #define ZEPHYR_INCLUDE_DRIVERS_CROS_RTC_H_ -#include <zephyr/device.h> #include <zephyr/kernel.h> +#include <zephyr/device.h> /** * @brief CROS Real-Time Clock (RTC) Driver APIs diff --git a/zephyr/include/drivers/cros_shi.h b/zephyr/include/drivers/cros_shi.h index 2ec2d2233a..3eb3038a45 100644 --- a/zephyr/include/drivers/cros_shi.h +++ b/zephyr/include/drivers/cros_shi.h @@ -18,8 +18,8 @@ * @{ */ -#include <zephyr/device.h> #include <zephyr/kernel.h> +#include <zephyr/device.h> /** * @cond INTERNAL_HIDDEN diff --git a/zephyr/include/drivers/cros_system.h b/zephyr/include/drivers/cros_system.h index c098c2cfcd..5105d97cc9 100644 --- a/zephyr/include/drivers/cros_system.h +++ b/zephyr/include/drivers/cros_system.h @@ -18,8 +18,8 @@ * @{ */ -#include <zephyr/device.h> #include <zephyr/kernel.h> +#include <zephyr/device.h> /** * @brief system_reset_cause enum |