diff options
| author | Joel Kitching <kitching@google.com> | 2019-03-27 18:26:28 +0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-03-28 06:43:21 +0000 |
| commit | 1d94849e743806caf313fac701f65c49c97e351d (patch) | |
| tree | 52f676e9c4bbf1f8183d69fcbf88cd330884a3a0 /src | |
| parent | f84c103825e6999138bf97ce199657c6416ae226 (diff) | |
chromeos: remove remaining dev switch references
As part of chromium:942901, physical dev switch functionality
is being deprecated.
Remove remaining references as well as helper macros.
BUG=chromium:942901
TEST=Build locally
TEST=make clean && make test-abuild
BRANCH=none
Change-Id: Ib4eec083eb76d41b47685701f9394c684ddc6b37
Signed-off-by: Joel Kitching <kitching@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32064
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainboard/google/butterfly/chromeos.c | 1 | ||||
| -rw-r--r-- | src/mainboard/google/parrot/chromeos.c | 1 | ||||
| -rw-r--r-- | src/mainboard/intel/baskingridge/chromeos.c | 1 | ||||
| -rw-r--r-- | src/mainboard/intel/emeraldlake2/chromeos.c | 1 | ||||
| -rw-r--r-- | src/mainboard/intel/wtm2/chromeos.c | 1 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/chromeos.h | 12 |
6 files changed, 2 insertions, 15 deletions
diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c index a956e2869b..2301d3eec4 100644 --- a/src/mainboard/google/butterfly/chromeos.c +++ b/src/mainboard/google/butterfly/chromeos.c @@ -90,7 +90,6 @@ int get_recovery_mode_switch(void) static const struct cros_gpio cros_gpios[] = { CROS_GPIO_REC_AH(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME), - CROS_GPIO_DEV_AH(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME), CROS_GPIO_WP_AL(WP_GPIO, CROS_GPIO_DEVICE_NAME), }; diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c index 99fc76439b..f17b6a64e1 100644 --- a/src/mainboard/google/parrot/chromeos.c +++ b/src/mainboard/google/parrot/chromeos.c @@ -83,7 +83,6 @@ int parrot_ec_running_ro(void) static const struct cros_gpio cros_gpios[] = { CROS_GPIO_REC_AH(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME), - CROS_GPIO_DEV_AH(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME), CROS_GPIO_WP_AL(70, CROS_GPIO_DEVICE_NAME), }; diff --git a/src/mainboard/intel/baskingridge/chromeos.c b/src/mainboard/intel/baskingridge/chromeos.c index 875578fed4..0c8d0b22ab 100644 --- a/src/mainboard/intel/baskingridge/chromeos.c +++ b/src/mainboard/intel/baskingridge/chromeos.c @@ -65,7 +65,6 @@ int get_write_protect_state(void) static const struct cros_gpio cros_gpios[] = { CROS_GPIO_REC_AH(69, CROS_GPIO_DEVICE_NAME), - CROS_GPIO_DEV_AL(48, CROS_GPIO_DEVICE_NAME), CROS_GPIO_WP_AL(22, CROS_GPIO_DEVICE_NAME), }; diff --git a/src/mainboard/intel/emeraldlake2/chromeos.c b/src/mainboard/intel/emeraldlake2/chromeos.c index 9fae82211f..aa0d9aad1b 100644 --- a/src/mainboard/intel/emeraldlake2/chromeos.c +++ b/src/mainboard/intel/emeraldlake2/chromeos.c @@ -62,7 +62,6 @@ int get_write_protect_state(void) static const struct cros_gpio cros_gpios[] = { CROS_GPIO_REC_AL(22, CROS_GPIO_DEVICE_NAME), - CROS_GPIO_DEV_AH(57, CROS_GPIO_DEVICE_NAME), CROS_GPIO_WP_AL(48, CROS_GPIO_DEVICE_NAME), }; diff --git a/src/mainboard/intel/wtm2/chromeos.c b/src/mainboard/intel/wtm2/chromeos.c index 9487e9b391..6464ef4c0f 100644 --- a/src/mainboard/intel/wtm2/chromeos.c +++ b/src/mainboard/intel/wtm2/chromeos.c @@ -50,7 +50,6 @@ int get_write_protect_state(void) static const struct cros_gpio cros_gpios[] = { CROS_GPIO_REC_AL(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME), - CROS_GPIO_DEV_AL(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME), CROS_GPIO_WP_AL(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME), }; diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h index 6db7fc44dd..e5420ac099 100644 --- a/src/vendorcode/google/chromeos/chromeos.h +++ b/src/vendorcode/google/chromeos/chromeos.h @@ -78,7 +78,8 @@ void chromeos_dsdt_generator(struct device *dev); enum { CROS_GPIO_REC = 1, /* Recovery */ - CROS_GPIO_DEV = 2, /* Developer */ + CROS_GPIO_DEPRECATED_DEV = 2, /* Developer; + * deprecated (chromium:942901) */ CROS_GPIO_WP = 3, /* Write Protect */ CROS_GPIO_PE = 4, /* Phase enforcement for final product */ @@ -112,15 +113,6 @@ struct cros_gpio { #define CROS_GPIO_REC_AH(num, dev) \ CROS_GPIO_REC_INITIALIZER(CROS_GPIO_ACTIVE_HIGH, num, dev) -#define CROS_GPIO_DEV_INITIALIZER(pol, num, dev) \ - CROS_GPIO_INITIALIZER(CROS_GPIO_DEV, pol, num, dev) - -#define CROS_GPIO_DEV_AL(num, dev) \ - CROS_GPIO_DEV_INITIALIZER(CROS_GPIO_ACTIVE_LOW, num, dev) - -#define CROS_GPIO_DEV_AH(num, dev) \ - CROS_GPIO_DEV_INITIALIZER(CROS_GPIO_ACTIVE_HIGH, num, dev) - #define CROS_GPIO_WP_INITIALIZER(pol, num, dev) \ CROS_GPIO_INITIALIZER(CROS_GPIO_WP, pol, num, dev) |