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>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50064
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2021-01-28 16:11:31 +01:00 committed by Patrick Georgi
parent 19d4364ed6
commit f76822a75c
15 changed files with 27 additions and 27 deletions

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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,

View File

@ -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 @@ struct gpio_config {
} __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 @@ int gpio_is_native(int gpio_num);
*/
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

View File

@ -36,9 +36,9 @@ static int gpio_to_pirq(int gpio)
};
}
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 @@ void init_gpios(const struct gpio_config config[])
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;

View File

@ -50,7 +50,7 @@ void mainboard_romstage_entry(void)
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);