diff options
| -rw-r--r-- | common/backlight_lid.c | 21 | ||||
| -rw-r--r-- | include/backlight.h | 5 | ||||
| -rw-r--r-- | include/config.h | 9 |
3 files changed, 31 insertions, 4 deletions
diff --git a/common/backlight_lid.c b/common/backlight_lid.c index 30b8b75eb7..9f2c984ec0 100644 --- a/common/backlight_lid.c +++ b/common/backlight_lid.c @@ -11,6 +11,19 @@ #include "host_command.h" #include "lid_switch.h" + +/** + * Activate/Deactivate the backlight GPIO pin considering active high or low. + */ +void enable_backlight(int enabled) +{ +#ifdef CONFIG_BACKLIGHT_LID_ACTIVE_LOW + gpio_set_level(GPIO_ENABLE_BACKLIGHT_L, !enabled); +#else + gpio_set_level(GPIO_ENABLE_BACKLIGHT, enabled); +#endif +} + /** * Update backlight state. */ @@ -18,14 +31,14 @@ static void update_backlight(void) { #ifdef CONFIG_BACKLIGHT_REQ_GPIO /* Enable the backlight if lid is open AND requested by AP */ - gpio_set_level(GPIO_ENABLE_BACKLIGHT, lid_is_open() && - gpio_get_level(CONFIG_BACKLIGHT_REQ_GPIO)); + enable_backlight(lid_is_open() && + gpio_get_level(CONFIG_BACKLIGHT_REQ_GPIO)); #else /* * Enable backlight if lid is open; this is AND'd with the request from * the AP in hardware. */ - gpio_set_level(GPIO_ENABLE_BACKLIGHT, lid_is_open()); + enable_backlight(lid_is_open()); #endif } DECLARE_HOOK(HOOK_LID_CHANGE, update_backlight, HOOK_PRIO_DEFAULT); @@ -60,7 +73,7 @@ static int switch_command_enable_backlight(struct host_cmd_handler_args *args) { const struct ec_params_switch_enable_backlight *p = args->params; - gpio_set_level(GPIO_ENABLE_BACKLIGHT, p->enabled); + enable_backlight(p->enabled); return EC_RES_SUCCESS; } diff --git a/include/backlight.h b/include/backlight.h index 4a11e15a4a..8cce6338fa 100644 --- a/include/backlight.h +++ b/include/backlight.h @@ -22,4 +22,9 @@ void backlight_interrupt(enum gpio_signal signal); static inline void backlight_interrupt(enum gpio_signal signal) { } #endif /* !CONFIG_BACKLIGHT_REQ_GPIO */ +/** + * Activate/Deactivate the backlight GPIO pin considering active high or low. + */ +void enable_backlight(int enabled); + #endif /* __CROS_EC_BACKLIGHT_H */ diff --git a/include/config.h b/include/config.h index cb2dc59f81..fb3b9bd54a 100644 --- a/include/config.h +++ b/include/config.h @@ -189,13 +189,22 @@ /* Allow proprietary communication protocols' extensions. */ #undef CONFIG_EXTENSION_COMMAND + /* * Support controlling the display backlight based on the state of the lid * switch. The EC will disable the backlight when the lid is closed. + * + * The GPIO should be named GPIO_BACKLIGHT_ENABLED if active high, or + * GPIO_BACKLIGHT_ENABLED_L if active low. See CONFIG_BACKLIGHT_LID_ACTIVE_LOW. */ #undef CONFIG_BACKLIGHT_LID /* + * The backlight GPIO pin is active low and named GPIO_BACKLIGHT_ENABLED_L + */ +#undef CONFIG_BACKLIGHT_LID_ACTIVE_LOW + +/* * If defined, EC will enable the backlight signal only if this GPIO is * asserted AND the lid is open. This supports passing the backlight-enable * signal from the AP through EC. |