[coreboot-gerrit] Change in ...coreboot[master]: chromeos: remove remaining dev switch references

[Joel Kitching (Code Review)]

Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32064

Change subject: chromeos: remove remaining dev switch references
......................................................................

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 
---
M src/mainboard/google/butterfly/chromeos.c
M src/mainboard/google/parrot/chromeos.c
M src/mainboard/intel/baskingridge/chromeos.c
M src/mainboard/intel/emeraldlake2/chromeos.c
M src/mainboard/intel/wtm2/chromeos.c
M src/vendorcode/google/chromeos/chromeos.h
6 files changed, 2 insertions(+), 15 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/32064/1

diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c
index a956e28..2301d3e 100644
--- a/src/mainboard/google/butterfly/chromeos.c
+++ b/src/mainboard/google/butterfly/chromeos.c
@@ -90,7 +90,6 @@

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 99fc764..f17b6a6 100644
--- a/src/mainboard/google/parrot/chromeos.c
+++ b/src/mainboard/google/parrot/chromeos.c
@@ -83,7 +83,6 @@

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 875578f..0c8d0b2 100644
--- a/src/mainboard/intel/baskingridge/chromeos.c
+++ b/src/mainboard/intel/baskingridge/chromeos.c
@@ -65,7 +65,6 @@

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 9fae822..aa0d9aa 100644
--- a/src/mainboard/intel/emeraldlake2/chromeos.c
+++ b/src/mainboard/intel/emeraldlake2/chromeos.c
@@ -62,7 +62,6 @@

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 9487e9b..6464ef4 100644
--- a/src/mainboard/intel/wtm2/chromeos.c
+++ b/src/mainboard/intel/wtm2/chromeos.c
@@ -50,7 +50,6 @@

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 6db7fc4..e5420ac 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -78,7 +78,8 @@

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 @@
 #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)