Change in coreboot[master]: soc/intel/broadwell/pch: Rename GPIO identifiers - coreboot-gerrit

28 Jan 2021

Attention is currently required from: Patrick Rudolph.
Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50064 )
Change subject: soc/intel/broadwell/pch: Rename GPIO identifiers
......................................................................
soc/intel/broadwell/pch: Rename GPIO identifiers
Rename structs, types and functions to match Lynx Point's names.
Tested with BUILD_TIMELESS=1, Purism Librem 13 v1 remains identical.
Change-Id: I11ea27b00b5820eb5553712e0420836470ec0d27
Signed-off-by: Angel Pons th3fanbus@gmail.com
---
M src/mainboard/google/auron/variants/auron_paine/gpio.c
M src/mainboard/google/auron/variants/auron_yuna/gpio.c
M src/mainboard/google/auron/variants/buddy/gpio.c
M src/mainboard/google/auron/variants/gandof/gpio.c
M src/mainboard/google/auron/variants/lulu/gpio.c
M src/mainboard/google/auron/variants/samus/gpio.c
M src/mainboard/google/jecht/variants/guado/gpio.c
M src/mainboard/google/jecht/variants/jecht/gpio.c
M src/mainboard/google/jecht/variants/rikku/gpio.c
M src/mainboard/google/jecht/variants/tidus/gpio.c
M src/mainboard/intel/wtm2/gpio.c
M src/mainboard/purism/librem_bdw/gpio.c
M src/soc/intel/broadwell/include/soc/gpio.h
M src/soc/intel/broadwell/pch/gpio.c
M src/soc/intel/broadwell/romstage.c
15 files changed, 27 insertions(+), 27 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/50064/1

diff --git a/src/mainboard/google/auron/variants/auron_paine/gpio.c b/src/mainboard/google/auron/variants/auron_paine/gpio.c
index f2930e0..6c3a92f 100644
--- a/src/mainboard/google/auron/variants/auron_paine/gpio.c
+++ b/src/mainboard/google/auron/variants/auron_paine/gpio.c
@@ -2,7 +2,7 @@
#include <soc/gpio.h>
-const struct gpio_config mainboard_gpio_config[] = {
+const struct pch_lp_gpio_map mainboard_gpio_map[] = {
    PCH_GPIO_UNUSED,        /* 0: UNUSED */
    PCH_GPIO_UNUSED,        /* 1: UNUSED */
    PCH_GPIO_UNUSED,        /* 2: UNUSED */
diff --git a/src/mainboard/google/auron/variants/auron_yuna/gpio.c b/src/mainboard/google/auron/variants/auron_yuna/gpio.c
index f2930e0..6c3a92f 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/gpio.c
+++ b/src/mainboard/google/auron/variants/auron_yuna/gpio.c
@@ -2,7 +2,7 @@
#include <soc/gpio.h>
-const struct gpio_config mainboard_gpio_config[] = {
+const struct pch_lp_gpio_map mainboard_gpio_map[] = {
    PCH_GPIO_UNUSED,        /* 0: UNUSED */
    PCH_GPIO_UNUSED,        /* 1: UNUSED */
    PCH_GPIO_UNUSED,        /* 2: UNUSED */
diff --git a/src/mainboard/google/auron/variants/buddy/gpio.c b/src/mainboard/google/auron/variants/buddy/gpio.c
index fcb63a4..35e1873 100644
--- a/src/mainboard/google/auron/variants/buddy/gpio.c
+++ b/src/mainboard/google/auron/variants/buddy/gpio.c
@@ -2,7 +2,7 @@
#include <soc/gpio.h>
-const struct gpio_config mainboard_gpio_config[] = {
+const struct pch_lp_gpio_map mainboard_gpio_map[] = {
    PCH_GPIO_UNUSED,        /* 0: UNUSED */
    PCH_GPIO_UNUSED,        /* 1: UNUSED */
    PCH_GPIO_UNUSED,        /* 2: UNUSED */
diff --git a/src/mainboard/google/auron/variants/gandof/gpio.c b/src/mainboard/google/auron/variants/gandof/gpio.c
index 5b7ed82..20546fd 100644
--- a/src/mainboard/google/auron/variants/gandof/gpio.c
+++ b/src/mainboard/google/auron/variants/gandof/gpio.c
@@ -2,7 +2,7 @@
#include <soc/gpio.h>
-const struct gpio_config mainboard_gpio_config[] = {
+const struct pch_lp_gpio_map mainboard_gpio_map[] = {
    PCH_GPIO_UNUSED,        /* 0: UNUSED */
    PCH_GPIO_UNUSED,        /* 1: UNUSED */
    PCH_GPIO_UNUSED,        /* 2: UNUSED */
diff --git a/src/mainboard/google/auron/variants/lulu/gpio.c b/src/mainboard/google/auron/variants/lulu/gpio.c
index b049bde..d91ab0e 100644
--- a/src/mainboard/google/auron/variants/lulu/gpio.c
+++ b/src/mainboard/google/auron/variants/lulu/gpio.c
@@ -2,7 +2,7 @@
#include <soc/gpio.h>
-const struct gpio_config mainboard_gpio_config[] = {
+const struct pch_lp_gpio_map mainboard_gpio_map[] = {
    PCH_GPIO_UNUSED,        /* 0: UNUSED */
    PCH_GPIO_UNUSED,        /* 1: UNUSED */
    PCH_GPIO_UNUSED,        /* 2: UNUSED */
diff --git a/src/mainboard/google/auron/variants/samus/gpio.c b/src/mainboard/google/auron/variants/samus/gpio.c
index 12e9e64..c8afea1 100644
--- a/src/mainboard/google/auron/variants/samus/gpio.c
+++ b/src/mainboard/google/auron/variants/samus/gpio.c
@@ -2,7 +2,7 @@
#include <soc/gpio.h>
-const struct gpio_config mainboard_gpio_config[] = {
+const struct pch_lp_gpio_map mainboard_gpio_map[] = {
    PCH_GPIO_UNUSED,        /* 0: UNUSED */
    PCH_GPIO_UNUSED,        /* 1: UNUSED */
    PCH_GPIO_UNUSED,        /* 2: UNUSED */
diff --git a/src/mainboard/google/jecht/variants/guado/gpio.c b/src/mainboard/google/jecht/variants/guado/gpio.c
index b4ffaa7..51fe7ed 100644
--- a/src/mainboard/google/jecht/variants/guado/gpio.c
+++ b/src/mainboard/google/jecht/variants/guado/gpio.c
@@ -2,7 +2,7 @@
#include <soc/gpio.h>
-const struct gpio_config mainboard_gpio_config[] = {
+const struct pch_lp_gpio_map mainboard_gpio_map[] = {
    PCH_GPIO_UNUSED,        /* 0: UNUSED */
    PCH_GPIO_UNUSED,        /* 1: UNUSED */
    PCH_GPIO_UNUSED,        /* 2: UNUSED */
diff --git a/src/mainboard/google/jecht/variants/jecht/gpio.c b/src/mainboard/google/jecht/variants/jecht/gpio.c
index 92470cd..de4d4f1 100644
--- a/src/mainboard/google/jecht/variants/jecht/gpio.c
+++ b/src/mainboard/google/jecht/variants/jecht/gpio.c
@@ -2,7 +2,7 @@
#include <soc/gpio.h>
-const struct gpio_config mainboard_gpio_config[] = {
+const struct pch_lp_gpio_map mainboard_gpio_map[] = {
    PCH_GPIO_UNUSED,        /* 0: UNUSED */
    PCH_GPIO_UNUSED,        /* 1: UNUSED */
    PCH_GPIO_UNUSED,        /* 2: UNUSED */
diff --git a/src/mainboard/google/jecht/variants/rikku/gpio.c b/src/mainboard/google/jecht/variants/rikku/gpio.c
index b4ffaa7..51fe7ed 100644
--- a/src/mainboard/google/jecht/variants/rikku/gpio.c
+++ b/src/mainboard/google/jecht/variants/rikku/gpio.c
@@ -2,7 +2,7 @@
#include <soc/gpio.h>
-const struct gpio_config mainboard_gpio_config[] = {
+const struct pch_lp_gpio_map mainboard_gpio_map[] = {
    PCH_GPIO_UNUSED,        /* 0: UNUSED */
    PCH_GPIO_UNUSED,        /* 1: UNUSED */
    PCH_GPIO_UNUSED,        /* 2: UNUSED */
diff --git a/src/mainboard/google/jecht/variants/tidus/gpio.c b/src/mainboard/google/jecht/variants/tidus/gpio.c
index 805b617..3dd95a1 100644
--- a/src/mainboard/google/jecht/variants/tidus/gpio.c
+++ b/src/mainboard/google/jecht/variants/tidus/gpio.c
@@ -2,7 +2,7 @@
#include <soc/gpio.h>
-const struct gpio_config mainboard_gpio_config[] = {
+const struct pch_lp_gpio_map mainboard_gpio_map[] = {
    PCH_GPIO_UNUSED,        /* 0: UNUSED */
    PCH_GPIO_UNUSED,        /* 1: UNUSED */
    PCH_GPIO_UNUSED,        /* 2: UNUSED */
diff --git a/src/mainboard/intel/wtm2/gpio.c b/src/mainboard/intel/wtm2/gpio.c
index c779ef0..85ebb77 100644
--- a/src/mainboard/intel/wtm2/gpio.c
+++ b/src/mainboard/intel/wtm2/gpio.c
@@ -2,7 +2,7 @@
#include <soc/gpio.h>
-const struct gpio_config mainboard_gpio_config[] = {
+const struct pch_lp_gpio_map mainboard_gpio_map[] = {
    PCH_GPIO_NATIVE,        /* 0: LPSS_UART1_RXD */
    PCH_GPIO_NATIVE,        /* 1: LPSS_UART1_TXD */
    PCH_GPIO_NATIVE,        /* 2: LPSS_UART1_RTS_N_R */
diff --git a/src/mainboard/purism/librem_bdw/gpio.c b/src/mainboard/purism/librem_bdw/gpio.c
index a8d1aba..0e670fe 100644
--- a/src/mainboard/purism/librem_bdw/gpio.c
+++ b/src/mainboard/purism/librem_bdw/gpio.c
@@ -2,7 +2,7 @@
#include <soc/gpio.h>
-const struct gpio_config mainboard_gpio_config[] = {
+const struct pch_lp_gpio_map mainboard_gpio_map[] = {
    [0]  = PCH_GPIO_INPUT,
    [1]  = PCH_GPIO_INPUT,
    [2]  = PCH_GPIO_INPUT,
diff --git a/src/soc/intel/broadwell/include/soc/gpio.h b/src/soc/intel/broadwell/include/soc/gpio.h
index e11ceb8..990b7b8 100644
--- a/src/soc/intel/broadwell/include/soc/gpio.h
+++ b/src/soc/intel/broadwell/include/soc/gpio.h
@@ -149,7 +149,7 @@
      .owner = GPIO_OWNER_GPIO, \
      .conf1 = GPIO_SENSE_DISABLE }
-struct gpio_config {
+struct pch_lp_gpio_map {
    u8 gpio;
    u32 conf0;
    u32 conf1;
@@ -162,7 +162,7 @@
 } __packed;
/* Configure GPIOs with mainboard provided settings */
-void init_gpios(const struct gpio_config config[]);
+void setup_pch_lp_gpios(const struct pch_lp_gpio_map map[]);
/* Get GPIO pin value */
 int get_gpio(int gpio_num);
@@ -179,6 +179,6 @@
  */
 unsigned int get_gpios(const int *gpio_num_array);
-extern const struct gpio_config mainboard_gpio_config[];
+extern const struct pch_lp_gpio_map mainboard_gpio_map[];
#endif
diff --git a/src/soc/intel/broadwell/pch/gpio.c b/src/soc/intel/broadwell/pch/gpio.c
index ff1f019..9523291 100644
--- a/src/soc/intel/broadwell/pch/gpio.c
+++ b/src/soc/intel/broadwell/pch/gpio.c
@@ -36,9 +36,9 @@
    };
 }
-void init_gpios(const struct gpio_config config[])
+void setup_pch_lp_gpios(const struct pch_lp_gpio_map map[])
 {
-	const struct gpio_config *entry;
+	const struct pch_lp_gpio_map *config;
    u32 owner[3] = {0};
    u32 route[3] = {0};
    u32 irqen[3] = {0};
@@ -47,29 +47,29 @@
    u16 pirq2apic = 0;
    int set, bit, gpio = 0;
-	for (entry = config; entry->conf0 != GPIO_LIST_END; entry++, gpio++) {
+	for (config = map; config->conf0 != GPIO_LIST_END; config++, gpio++) {
    	if (gpio > MAX_GPIO_NUMBER)
    		break;
/* Setup Configuration registers 1 and 2 */
-		outl(entry->conf0, GPIO_BASE_ADDRESS + GPIO_CONFIG0(gpio));
-		outl(entry->conf1, GPIO_BASE_ADDRESS + GPIO_CONFIG1(gpio));
+		outl(config->conf0, GPIO_BASE_ADDRESS + GPIO_CONFIG0(gpio));
+		outl(config->conf1, GPIO_BASE_ADDRESS + GPIO_CONFIG1(gpio));
/* Determine set and bit based on GPIO number */
    	set = gpio >> 5;
    	bit = gpio % 32;
/* Apply settings to set specific bits */
-		owner[set] |= entry->owner << bit;
-		route[set] |= entry->route << bit;
-		irqen[set] |= entry->irqen << bit;
-		reset[set] |= entry->reset << bit;
+		owner[set] |= config->owner << bit;
+		route[set] |= config->route << bit;
+		irqen[set] |= config->irqen << bit;
+		reset[set] |= config->reset << bit;
if (set == 0)
-			blink |= entry->blink << bit;
+			blink |= config->blink << bit;
/* PIRQ to IO-APIC map */
-		if (entry->pirq == GPIO_PIRQ_APIC_ROUTE) {
+		if (config->pirq == GPIO_PIRQ_APIC_ROUTE) {
    		set = gpio_to_pirq(gpio);
    		if (set >= 0)
    			pirq2apic |= 1 << set;
diff --git a/src/soc/intel/broadwell/romstage.c b/src/soc/intel/broadwell/romstage.c
index 33b4e4a..b9570f3 100644
--- a/src/soc/intel/broadwell/romstage.c
+++ b/src/soc/intel/broadwell/romstage.c
@@ -50,7 +50,7 @@
    set_max_freq();
/* Initialize GPIOs */
-	init_gpios(mainboard_gpio_config);
+	setup_pch_lp_gpios(mainboard_gpio_map);
mainboard_fill_pei_data(&pei_data);
    mainboard_fill_spd_data(&pei_data);
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/50064
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I11ea27b00b5820eb5553712e0420836470ec0d27
Gerrit-Change-Number: 50064
Gerrit-PatchSet: 1
Gerrit-Owner: Angel Pons th3fanbus@gmail.com
Gerrit-Reviewer: Patrick Rudolph siro@das-labor.org
Gerrit-Attention: Patrick Rudolph siro@das-labor.org
Gerrit-MessageType: newchange



    