diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2022-10-25 23:30:43 +0200 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-10-26 22:09:07 +0000 |
| commit | 067f7033291a31f98264404463d421196dcdc65b (patch) | |
| tree | 6bf11df1e19fb5ea18177bad94728d9801b52269 /src/mainboard/google | |
| parent | ce934056df417e0928bf3287d014d202f217d875 (diff) | |
mb/amd,google: unify fch_irq_routing struct instance name
Use the same fch_irq_map name in all mainboards using the Picasso,
Cezanne, Mendocino and Morgana instead of using a mainboard-specific
name.
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: I035cffb9c6c8afd6bd115831e8eed4a395e2a7fc
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68846
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
Diffstat (limited to 'src/mainboard/google')
| -rw-r--r-- | src/mainboard/google/guybrush/mainboard.c | 6 | ||||
| -rw-r--r-- | src/mainboard/google/skyrim/mainboard.c | 6 | ||||
| -rw-r--r-- | src/mainboard/google/zork/mainboard.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/mainboard/google/guybrush/mainboard.c b/src/mainboard/google/guybrush/mainboard.c index d3a45c1400..150835cb48 100644 --- a/src/mainboard/google/guybrush/mainboard.c +++ b/src/mainboard/google/guybrush/mainboard.c @@ -44,7 +44,7 @@ static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES]; * 8: rtc0 <- soc/amd/common/acpi/lpc.asl * 9: acpi <- soc/amd/common/acpi/lpc.asl */ -static const struct fch_irq_routing guybrush_fch[] = { +static const struct fch_irq_routing fch_irq_map[] = { { PIRQ_A, 12, PIRQ_NC }, { PIRQ_B, 14, PIRQ_NC }, { PIRQ_C, 15, PIRQ_NC }, @@ -82,8 +82,8 @@ static void init_tables(void) memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing)); memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing)); - for (i = 0; i < ARRAY_SIZE(guybrush_fch); i++) { - entry = guybrush_fch + i; + for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) { + entry = fch_irq_map + i; fch_pic_routing[entry->intr_index] = entry->pic_irq_num; fch_apic_routing[entry->intr_index] = entry->apic_irq_num; } diff --git a/src/mainboard/google/skyrim/mainboard.c b/src/mainboard/google/skyrim/mainboard.c index 3ddcf4227a..0469c59148 100644 --- a/src/mainboard/google/skyrim/mainboard.c +++ b/src/mainboard/google/skyrim/mainboard.c @@ -31,7 +31,7 @@ static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES]; * 9: acpi <- soc/amd/common/acpi/lpc.asl */ -static const struct fch_irq_routing skyrim_fch[] = { +static const struct fch_irq_routing fch_irq_map[] = { { PIRQ_A, 12, PIRQ_NC }, { PIRQ_B, 14, PIRQ_NC }, { PIRQ_C, 15, PIRQ_NC }, @@ -68,8 +68,8 @@ static void init_tables(void) memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing)); memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing)); - for (i = 0; i < ARRAY_SIZE(skyrim_fch); i++) { - entry = skyrim_fch + i; + for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) { + entry = fch_irq_map + i; fch_pic_routing[entry->intr_index] = entry->pic_irq_num; fch_apic_routing[entry->intr_index] = entry->apic_irq_num; } diff --git a/src/mainboard/google/zork/mainboard.c b/src/mainboard/google/zork/mainboard.c index bab79b44e0..a925851215 100644 --- a/src/mainboard/google/zork/mainboard.c +++ b/src/mainboard/google/zork/mainboard.c @@ -53,7 +53,7 @@ static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES]; * 9: acpi <- soc/amd/common/acpi/lpc.asl * 12: i8042 <- ec/google/chromeec/acpi/superio.asl */ -static const struct fch_irq_routing fch_pirq[] = { +static const struct fch_irq_routing fch_irq_map[] = { { PIRQ_A, 6, PIRQ_NC }, { PIRQ_B, 13, PIRQ_NC }, { PIRQ_C, 14, PIRQ_NC }, @@ -86,8 +86,8 @@ static void init_tables(void) memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing)); memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing)); - for (i = 0; i < ARRAY_SIZE(fch_pirq); i++) { - entry = fch_pirq + i; + for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) { + entry = fch_irq_map + i; fch_pic_routing[entry->intr_index] = entry->pic_irq_num; fch_apic_routing[entry->intr_index] = entry->apic_irq_num; } |