summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2022-10-25 23:30:43 +0200
committerFelix Held <felix-coreboot@felixheld.de>2022-10-26 22:09:07 +0000
commit067f7033291a31f98264404463d421196dcdc65b (patch)
tree6bf11df1e19fb5ea18177bad94728d9801b52269 /src/mainboard
parentce934056df417e0928bf3287d014d202f217d875 (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')
-rw-r--r--src/mainboard/amd/bilby/mainboard.c6
-rw-r--r--src/mainboard/amd/birman/mainboard.c6
-rw-r--r--src/mainboard/amd/chausie/mainboard.c6
-rw-r--r--src/mainboard/amd/majolica/mainboard.c6
-rw-r--r--src/mainboard/amd/mandolin/mainboard.c6
-rw-r--r--src/mainboard/google/guybrush/mainboard.c6
-rw-r--r--src/mainboard/google/skyrim/mainboard.c6
-rw-r--r--src/mainboard/google/zork/mainboard.c6
8 files changed, 24 insertions, 24 deletions
diff --git a/src/mainboard/amd/bilby/mainboard.c b/src/mainboard/amd/bilby/mainboard.c
index c9310530d2..c594a90b1d 100644
--- a/src/mainboard/amd/bilby/mainboard.c
+++ b/src/mainboard/amd/bilby/mainboard.c
@@ -31,7 +31,7 @@
static uint8_t fch_pic_routing[FCH_IRQ_ROUTING_ENTRIES];
static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES];
-static const struct fch_irq_routing bilby_fch[] = {
+static const struct fch_irq_routing fch_irq_map[] = {
{ PIRQ_A, 8, 16 },
{ PIRQ_B, 10, 17 },
{ PIRQ_C, 11, 18 },
@@ -64,8 +64,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(bilby_fch); i++) {
- entry = bilby_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/amd/birman/mainboard.c b/src/mainboard/amd/birman/mainboard.c
index 8b27e37f51..4c641f5c24 100644
--- a/src/mainboard/amd/birman/mainboard.c
+++ b/src/mainboard/amd/birman/mainboard.c
@@ -31,7 +31,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 birman_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(birman_fch); i++) {
- entry = birman_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/amd/chausie/mainboard.c b/src/mainboard/amd/chausie/mainboard.c
index 0318e4333e..c0142368b3 100644
--- a/src/mainboard/amd/chausie/mainboard.c
+++ b/src/mainboard/amd/chausie/mainboard.c
@@ -29,7 +29,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 chausie_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 },
@@ -66,8 +66,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(chausie_fch); i++) {
- entry = chausie_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/amd/majolica/mainboard.c b/src/mainboard/amd/majolica/mainboard.c
index 32b29e4fe6..31ac5153ee 100644
--- a/src/mainboard/amd/majolica/mainboard.c
+++ b/src/mainboard/amd/majolica/mainboard.c
@@ -28,7 +28,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 majolica_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 },
@@ -66,8 +66,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(majolica_fch); i++) {
- entry = majolica_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/amd/mandolin/mainboard.c b/src/mainboard/amd/mandolin/mainboard.c
index 43fa4152ff..6c4e545fd6 100644
--- a/src/mainboard/amd/mandolin/mainboard.c
+++ b/src/mainboard/amd/mandolin/mainboard.c
@@ -26,7 +26,7 @@
static uint8_t fch_pic_routing[FCH_IRQ_ROUTING_ENTRIES];
static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES];
-static const struct fch_irq_routing mandolin_fch[] = {
+static const struct fch_irq_routing fch_irq_map[] = {
{ PIRQ_A, 8, 16 },
{ PIRQ_B, 10, 17 },
{ PIRQ_C, 11, 18 },
@@ -59,8 +59,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(mandolin_fch); i++) {
- entry = mandolin_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/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;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 03:28:38 +0000