diff options
| author | Joel Kitching <kitching@chromium.org> | 2018-06-25 21:36:59 +0000 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2018-06-25 21:39:13 +0000 |
| commit | 71c28ac8f98ab49e826c88a3ea2b4c4068cf7454 (patch) | |
| tree | bb100c0ddf3d0a942000266645db3bb4be746272 | |
| parent | 4d2b8057e7265a6bf74a38c8fd7699a65f3f1d35 (diff) | |
| download | chrome-ec-71c28ac8f98ab49e826c88a3ea2b4c4068cf7454.tar.gz | |
Revert "ec_features / coral: Allow disabling keyboard backlight feature"
This reverts commit d5b068339e08b61864c4bd2ec1a89dad4e0da2de.
Reason for revert: Re-using 32-bit host events instead. See b/110292722
Original change's description:
> ec_features / coral: Allow disabling keyboard backlight feature
>
> Allow reporting that keyboard backlight doesn't exist even when the code
> is compiled in. Useful if there are multiple device models that should
> share firmware.
>
> BUG=b:64705535
> BRANCH=none
> TEST=none
>
> Change-Id: I700f87ab098f69c38dc538b66b720d70e23b278d
> Signed-off-by: Patrick Georgi <pgeorgi@google.com>
> Reviewed-on: https://chromium-review.googlesource.com/633926
> Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
> Tested-by: Patrick Georgi <pgeorgi@chromium.org>
> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
> (cherry picked from commit 09136dea764dbe482392c29b3c8d1763149df3e6)
> Reviewed-on: https://chromium-review.googlesource.com/989863
> Reviewed-by: Joel Kitching <kitching@chromium.org>
> Commit-Queue: Joel Kitching <kitching@chromium.org>
> Tested-by: Joel Kitching <kitching@chromium.org>
> Trybot-Ready: Joel Kitching <kitching@chromium.org>
Bug: b:64705535
Change-Id: I75db2a8e219205c8b00f208b31b08e49d2457724
Reviewed-on: https://chromium-review.googlesource.com/1113787
Reviewed-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Tested-by: Joel Kitching <kitching@chromium.org>
Trybot-Ready: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | board/coral/board.c | 24 | ||||
| -rw-r--r-- | board/coral/board.h | 1 | ||||
| -rw-r--r-- | common/ec_features.c | 14 | ||||
| -rw-r--r-- | include/board_config.h | 6 | ||||
| -rw-r--r-- | include/config.h | 6 |
5 files changed, 2 insertions, 49 deletions
diff --git a/board/coral/board.c b/board/coral/board.c index c87c504859..2179f57809 100644 --- a/board/coral/board.c +++ b/board/coral/board.c @@ -1133,27 +1133,3 @@ struct keyboard_scan_config keyscan_config = { 0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xca /* full set */ }, }; - -uint32_t board_override_feature_flags0(uint32_t flags0) -{ - uint32_t sku = system_get_sku_id(); - - /* - * We always compile in backlight support for coral, but only some - * models come with the hardware. Therefore, check if the current - * device is one of them and return the default value - with backlight - * here. - */ - if (sku == 8) - return flags0; - - // Report that there is no keyboard backlight - flags0 &= ~EC_FEATURE_MASK_0(EC_FEATURE_PWM_KEYB); - - return flags0; -} - -uint32_t board_override_feature_flags1(uint32_t flags1) -{ - return flags1; -} diff --git a/board/coral/board.h b/board/coral/board.h index ab135e7007..7397bb20ca 100644 --- a/board/coral/board.h +++ b/board/coral/board.h @@ -151,7 +151,6 @@ #define CONFIG_WLAN_POWER_ACTIVE_LOW #define WIRELESS_GPIO_WLAN_POWER GPIO_WIRELESS_GPIO_WLAN_POWER #define CONFIG_PWR_STATE_DISCHARGE_FULL -#define CONFIG_EC_FEATURE_BOARD_OVERRIDE /* * During shutdown sequence TPS65094x PMIC turns off the sensor rails diff --git a/common/ec_features.c b/common/ec_features.c index 01d666a9dc..9a630e6f17 100644 --- a/common/ec_features.c +++ b/common/ec_features.c @@ -6,13 +6,11 @@ /* Present Chrome EC device features to the outside world */ #include "common.h" -#include "config.h" #include "ec_commands.h" -#include "board_config.h" uint32_t get_feature_flags0(void) { - uint32_t result = 0 + return 0 #ifdef CONFIG_FW_LIMITED_IMAGE | EC_FEATURE_MASK_0(EC_FEATURE_LIMITED) #endif @@ -108,17 +106,9 @@ uint32_t get_feature_flags0(void) | EC_FEATURE_MASK_0(EC_FEATURE_DEVICE_EVENT) #endif ; -#ifdef CONFIG_EC_FEATURE_BOARD_OVERRIDE - result = board_override_feature_flags0(result); -#endif - return result; } uint32_t get_feature_flags1(void) { - uint32_t result = 0; -#ifdef CONFIG_EC_FEATURE_BOARD_OVERRIDE - result = board_override_feature_flags1(result); -#endif - return result; + return 0; } diff --git a/include/board_config.h b/include/board_config.h index 485cf4f353..6742573bc2 100644 --- a/include/board_config.h +++ b/include/board_config.h @@ -48,10 +48,4 @@ void board_config_post_gpio_init(void); void board_before_rsmrst(int rsmrst); #endif -#ifdef CONFIG_EC_FEATURE_BOARD_OVERRIDE -/* function for board specific overrides to default feature flags */ -uint32_t board_override_feature_flags0(uint32_t flags0); -uint32_t board_override_feature_flags1(uint32_t flags1); -#endif - #endif /* __CROS_EC_BOARD_CONFIG_H */ diff --git a/include/config.h b/include/config.h index 0395eb3b34..ccf4f2c84b 100644 --- a/include/config.h +++ b/include/config.h @@ -943,12 +943,6 @@ /* EC capable of sensor speeds up to 200000 mHz */ #define CONFIG_EC_MAX_SENSOR_FREQ_MILLIHZ 200000 -/* - * Allow board to override the feature bitmap provided through host command - * and ACPI. - */ -#undef CONFIG_EC_FEATURE_BOARD_OVERRIDE - /* Support EC chip internal data EEPROM */ #undef CONFIG_EEPROM |