Change in coreboot[master]: [WIP] ChromeOS: Move cros_get_gpio_value()

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/58898 )

Change subject: [WIP] ChromeOS: Move cros_get_gpio_value()
......................................................................

[WIP] ChromeOS: Move cros_get_gpio_value()

Change-Id: Id2a8427e8cd34abde98a267bd086eb4143433d0b
Signed-off-by: Kyösti Mälkki 
---
M src/mainboard/google/deltaur/chromeos.c
M src/mainboard/google/drallion/chromeos.c
M src/mainboard/google/sarien/chromeos.c
M src/vendorcode/google/chromeos/acpi.c
M src/vendorcode/google/chromeos/chromeos.h
5 files changed, 24 insertions(+), 61 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/58898/1

diff --git a/src/mainboard/google/deltaur/chromeos.c b/src/mainboard/google/deltaur/chromeos.c
index 8c9e1b7..da8eb02c 100644
--- a/src/mainboard/google/deltaur/chromeos.c
+++ b/src/mainboard/google/deltaur/chromeos.c
@@ -31,27 +31,6 @@
    lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
 }

-static int cros_get_gpio_value(int type)
-{
-	const struct cros_gpio *cros_gpios;
-	size_t i, num_gpios = 0;
-
-	cros_gpios = variant_cros_gpios(&num_gpios);
-
-	for (i = 0; i < num_gpios; i++) {
-		const struct cros_gpio *gpio = &cros_gpios[i];
-		if (gpio->type == type) {
-			int state = gpio_get(gpio->gpio_num);
-			if (gpio->polarity == CROS_GPIO_ACTIVE_LOW)
-				return !state;
-			else
-				return state;
-		}
-	}
-	return 0;
-}
-
-
 int get_write_protect_state(void)
 {
    return cros_get_gpio_value(CROS_GPIO_WP);
diff --git a/src/mainboard/google/drallion/chromeos.c b/src/mainboard/google/drallion/chromeos.c
index f418cc1..886f055 100644
--- a/src/mainboard/google/drallion/chromeos.c
+++ b/src/mainboard/google/drallion/chromeos.c
@@ -29,27 +29,6 @@
    lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
 }

-static int cros_get_gpio_value(int type)
-{
-	const struct cros_gpio *cros_gpios;
-	size_t i, num_gpios = 0;
-
-	cros_gpios = variant_cros_gpios(&num_gpios);
-
-	for (i = 0; i < num_gpios; i++) {
-		const struct cros_gpio *gpio = &cros_gpios[i];
-		if (gpio->type == type) {
-			int state = gpio_get(gpio->gpio_num);
-			if (gpio->polarity == CROS_GPIO_ACTIVE_LOW)
-				return !state;
-			else
-				return state;
-		}
-	}
-	return 0;
-}
-
-
 int get_write_protect_state(void)
 {
    return cros_get_gpio_value(CROS_GPIO_WP);
diff --git a/src/mainboard/google/sarien/chromeos.c b/src/mainboard/google/sarien/chromeos.c
index 96ada16..455ce5a 100644
--- a/src/mainboard/google/sarien/chromeos.c
+++ b/src/mainboard/google/sarien/chromeos.c
@@ -27,25 +27,6 @@
    lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
 }

-static int cros_get_gpio_value(int type)
-{
-	const struct cros_gpio *cros_gpios;
-	size_t i, num_gpios = 0;
-
-	cros_gpios = variant_cros_gpios(&num_gpios);
-
-	for (i = 0; i < num_gpios; i++) {
-		const struct cros_gpio *gpio = &cros_gpios[i];
-		if (gpio->type == type) {
-			int state = gpio_get(gpio->gpio_num);
-			if (gpio->polarity == CROS_GPIO_ACTIVE_LOW)
-				return !state;
-			else
-				return state;
-		}
-	}
-	return 0;
-}

int get_write_protect_state(void)
diff --git a/src/vendorcode/google/chromeos/acpi.c b/src/vendorcode/google/chromeos/acpi.c
index 383cd31..3cc820f 100644
--- a/src/vendorcode/google/chromeos/acpi.c
+++ b/src/vendorcode/google/chromeos/acpi.c
@@ -38,3 +38,25 @@

acpigen_pop_len();
 }
+
+#if CONFIG(GENERIC_GPIO_LIB)
+int cros_get_gpio_value(int type)
+{
+	const struct cros_gpio *cros_gpios;
+	size_t i, num_gpios = 0;
+
+	cros_gpios = variant_cros_gpios(&num_gpios);
+
+	for (i = 0; i < num_gpios; i++) {
+		const struct cros_gpio *gpio = &cros_gpios[i];
+		if (gpio->type == type) {
+			int state = gpio_get(gpio->gpio_num);
+			if (gpio->polarity == CROS_GPIO_ACTIVE_LOW)
+				return !state;
+			else
+				return state;
+		}
+	}
+	return 0;
+}
+#endif
diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h
index 693336a..47c154a 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -48,6 +48,8 @@
  */
 void chromeos_acpi_gpio_generate(void);

+int cros_get_gpio_value(int type);
+
 enum {
    CROS_GPIO_REC = 1, /* Recovery */
    CROS_GPIO_DEPRECATED_DEV = 2, /* Developer;