Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/49284 )
Change subject: soc/intel/broadwell: Rename more GPIO things ......................................................................
soc/intel/broadwell: Rename more GPIO things
Rename GPIO types, variables and functions to match Lynx Point code.
Change-Id: I99e616a08ba731bf1e0f1cc5bee60563e2535420 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, 19 insertions(+), 19 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/49284/1
diff --git a/src/mainboard/google/auron/variants/auron_paine/gpio.c b/src/mainboard/google/auron/variants/auron_paine/gpio.c index c7f2fa4..3251539 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_config[] = { LP_GPIO_UNUSED, /* 0: UNUSED */ LP_GPIO_UNUSED, /* 1: UNUSED */ LP_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 c7f2fa4..3251539 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_config[] = { LP_GPIO_UNUSED, /* 0: UNUSED */ LP_GPIO_UNUSED, /* 1: UNUSED */ LP_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 ccea5f4..7bf19d9 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_config[] = { LP_GPIO_UNUSED, /* 0: UNUSED */ LP_GPIO_UNUSED, /* 1: UNUSED */ LP_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 e982bbc..857905a 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_config[] = { LP_GPIO_UNUSED, /* 0: UNUSED */ LP_GPIO_UNUSED, /* 1: UNUSED */ LP_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 e84b019..d81888b 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_config[] = { LP_GPIO_UNUSED, /* 0: UNUSED */ LP_GPIO_UNUSED, /* 1: UNUSED */ LP_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 d0d18d7..0ddfa7d 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_config[] = { LP_GPIO_UNUSED, /* 0: UNUSED */ LP_GPIO_UNUSED, /* 1: UNUSED */ LP_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 d4223e1..a7eaafd 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_config[] = { LP_GPIO_UNUSED, /* 0: UNUSED */ LP_GPIO_UNUSED, /* 1: UNUSED */ LP_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 541fbfc..554edb7 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_config[] = { LP_GPIO_UNUSED, /* 0: UNUSED */ LP_GPIO_UNUSED, /* 1: UNUSED */ LP_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 d4223e1..a7eaafd 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_config[] = { LP_GPIO_UNUSED, /* 0: UNUSED */ LP_GPIO_UNUSED, /* 1: UNUSED */ LP_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 3dbc07e..82c4624 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_config[] = { LP_GPIO_UNUSED, /* 0: UNUSED */ LP_GPIO_UNUSED, /* 1: UNUSED */ LP_GPIO_UNUSED, /* 2: UNUSED */ diff --git a/src/mainboard/intel/wtm2/gpio.c b/src/mainboard/intel/wtm2/gpio.c index 987e36e..f922498 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_config[] = { LP_GPIO_NATIVE, /* 0: LPSS_UART1_RXD */ LP_GPIO_NATIVE, /* 1: LPSS_UART1_TXD */ LP_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 e7cf560..f0e3475 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_config[] = { LP_GPIO_INPUT, /* 0 */ LP_GPIO_INPUT, /* 1 */ LP_GPIO_INPUT, /* 2 */ diff --git a/src/soc/intel/broadwell/include/soc/gpio.h b/src/soc/intel/broadwell/include/soc/gpio.h index bff7ee6..621c310 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_config[];
#endif diff --git a/src/soc/intel/broadwell/pch/gpio.c b/src/soc/intel/broadwell/pch/gpio.c index ff1f019..1a49f07 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 *entry; u32 owner[3] = {0}; u32 route[3] = {0}; u32 irqen[3] = {0}; @@ -47,7 +47,7 @@ u16 pirq2apic = 0; int set, bit, gpio = 0;
- for (entry = config; entry->conf0 != GPIO_LIST_END; entry++, gpio++) { + for (entry = map; entry->conf0 != GPIO_LIST_END; entry++, gpio++) { if (gpio > MAX_GPIO_NUMBER) break;
diff --git a/src/soc/intel/broadwell/romstage.c b/src/soc/intel/broadwell/romstage.c index 2e5db76..75eb3e0 100644 --- a/src/soc/intel/broadwell/romstage.c +++ b/src/soc/intel/broadwell/romstage.c @@ -38,7 +38,7 @@ set_max_freq();
/* Initialize GPIOs */ - init_gpios(mainboard_gpio_config); + setup_pch_lp_gpios(mainboard_gpio_config);
/* Fill in mainboard pei_date. */ mainboard_pre_raminit(&rp);