From d37a5bc29ec0f69fad55e3bfb6f6aeb7e1027607 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Mon, 28 May 2018 13:42:22 +0200 Subject: [PATCH] mb/pcengines: Remove unneeded includes and dead code Fix coding style. Change-Id: Id13c0ee284293c0c06d46c75c850bc7e81cfc1f6 Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/26633 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/mainboard/pcengines/alix1c/devicetree.cb | 4 +- src/mainboard/pcengines/alix1c/irq_tables.c | 21 ++++------ src/mainboard/pcengines/apu1/acpi/gpe.asl | 2 +- src/mainboard/pcengines/apu1/acpi/sleep.asl | 2 +- src/mainboard/pcengines/apu2/acpi/gpe.asl | 2 +- src/mainboard/pcengines/apu2/dsdt.asl | 2 +- src/mainboard/pcengines/apu2/mptable.c | 43 -------------------- 7 files changed, 15 insertions(+), 61 deletions(-) diff --git a/src/mainboard/pcengines/alix1c/devicetree.cb b/src/mainboard/pcengines/alix1c/devicetree.cb index 8cb8dd3b03..5b4e603f18 100644 --- a/src/mainboard/pcengines/alix1c/devicetree.cb +++ b/src/mainboard/pcengines/alix1c/devicetree.cb @@ -1,6 +1,6 @@ chip northbridge/amd/lx device domain 0 on - device pci 1.0 on end + device pci 1.0 on end device pci 1.1 on end chip southbridge/amd/cs5536 # IRQ 12 and 1 unmasked, Keyboard and Mouse IRQs. OK @@ -25,7 +25,7 @@ chip northbridge/amd/lx register "com2_address" = "0x2F8" register "com2_irq" = "3" register "unwanted_vpci[0]" = "0" # End of list has a zero - device pci f.0 on # ISA Bridge + device pci f.0 on # ISA Bridge chip superio/winbond/w83627hf device pnp 2e.0 off # Floppy io 0x60 = 0x3f0 diff --git a/src/mainboard/pcengines/alix1c/irq_tables.c b/src/mainboard/pcengines/alix1c/irq_tables.c index 89ac717df0..029624441d 100644 --- a/src/mainboard/pcengines/alix1c/irq_tables.c +++ b/src/mainboard/pcengines/alix1c/irq_tables.c @@ -14,9 +14,6 @@ */ #include -#include -#include -#include "southbridge/amd/cs5536/cs5536.h" /* Platform IRQs */ #define PIRQA 11 @@ -53,15 +50,15 @@ * * The only devices that interrupt are: * - * What Device IRQ PIN PIN WIRED TO + * What Device IRQ PIN PIN WIRED TO * ------------------------------------------------- - * AES 00:01.2 0a 01 A A - * 3VPCI 00:0c.0 0a 01 A A - * eth0 00:0d.0 0b 01 A B - * mpci 00:0e.0 0a 01 A A - * usb 00:0f.3 0b 02 B B - * usb 00:0f.4 0b 04 D D - * usb 00:0f.5 0b 04 D D + * AES 00:01.2 0a 01 A A + * 3VPCI 00:0c.0 0a 01 A A + * eth0 00:0d.0 0b 01 A B + * mpci 00:0e.0 0a 01 A A + * usb 00:0f.3 0b 02 B B + * usb 00:0f.4 0b 04 D D + * usb 00:0f.5 0b 04 D D * * The only swizzled interrupt is eth0, where INTA is wired to interrupt controller line B. */ @@ -71,7 +68,7 @@ static const struct irq_routing_table intel_irq_routing_table = { PIRQ_VERSION, 32 + 16 * CONFIG_IRQ_SLOT_COUNT,/* Max. number of devices on the bus */ 0x00, /* Where the interrupt router lies (bus) */ - (0x0F << 3) | 0x0, /* Where the interrupt router lies (dev) */ + (0x0F << 3) | 0x0, /* Where the interrupt router lies (dev) */ 0x00, /* IRQs devoted exclusively to PCI usage */ 0x100B, /* Vendor */ 0x002B, /* Device */ diff --git a/src/mainboard/pcengines/apu1/acpi/gpe.asl b/src/mainboard/pcengines/apu1/acpi/gpe.asl index 2f22758712..30e6fdcb3c 100644 --- a/src/mainboard/pcengines/apu1/acpi/gpe.asl +++ b/src/mainboard/pcengines/apu1/acpi/gpe.asl @@ -72,7 +72,7 @@ Scope(\_GPE) { /* Start Scope GPE */ Notify(\_SB.PCI0.AZHD, 0x02) /* NOTIFY_DEVICE_WAKE */ Notify(\_SB.PWRB, 0x02) /* NOTIFY_DEVICE_WAKE */ } -} /* End Scope GPE */ +} /* End Scope GPE */ /* Contains the GPEs for USB overcurrent */ #include "usb_oc.asl" diff --git a/src/mainboard/pcengines/apu1/acpi/sleep.asl b/src/mainboard/pcengines/apu1/acpi/sleep.asl index 0069aa9db2..47de049dbc 100644 --- a/src/mainboard/pcengines/apu1/acpi/sleep.asl +++ b/src/mainboard/pcengines/apu1/acpi/sleep.asl @@ -49,7 +49,7 @@ Method(\_PTS, 1) { /* On older chips, clear PciExpWakeDisEn */ /*if (LLessEqual(\_SB.SBRI, 0x13)) { - * Store(0,\_SB.PWDE) + * Store(0,\_SB.PWDE) *} */ diff --git a/src/mainboard/pcengines/apu2/acpi/gpe.asl b/src/mainboard/pcengines/apu2/acpi/gpe.asl index cd366dcc5d..4a6f6f8158 100644 --- a/src/mainboard/pcengines/apu2/acpi/gpe.asl +++ b/src/mainboard/pcengines/apu2/acpi/gpe.asl @@ -64,4 +64,4 @@ Scope(\_GPE) { /* Start Scope GPE */ Notify(\_SB.PCI0.PBR7, 0x02) /* NOTIFY_DEVICE_WAKE */ Notify(\_SB.PWRB, 0x02) /* NOTIFY_DEVICE_WAKE */ } -} /* End Scope GPE */ +} /* End Scope GPE */ diff --git a/src/mainboard/pcengines/apu2/dsdt.asl b/src/mainboard/pcengines/apu2/dsdt.asl index d3fb3b1e6b..03bd33ec5e 100644 --- a/src/mainboard/pcengines/apu2/dsdt.asl +++ b/src/mainboard/pcengines/apu2/dsdt.asl @@ -46,7 +46,7 @@ DefinitionBlock ( /* System Bus */ Scope(\_SB) { /* Start \_SB scope */ - /* global utility methods expected within the \_SB scope */ + /* global utility methods expected within the \_SB scope */ #include /* Describe IRQ Routing mapping for this platform (within the \_SB scope) */ diff --git a/src/mainboard/pcengines/apu2/mptable.c b/src/mainboard/pcengines/apu2/mptable.c index 228e2811f2..dff5fbda14 100644 --- a/src/mainboard/pcengines/apu2/mptable.c +++ b/src/mainboard/pcengines/apu2/mptable.c @@ -14,54 +14,11 @@ * GNU General Public License for more details. */ -#include #include -#include -#include #include -#include #include -#include -#include #include -#if 0 -u8 picr_data[FCH_INT_TABLE_SIZE] = { - 0x03,0x03,0x05,0x07,0x0B,0x0A,0x1F,0x1F, /* 00 - 07 : INTA - INTF and 2 reserved dont map 4*/ - 0xFA,0xF1,0x00,0x00,0x1F,0x1F,0x1F,0x1F, /* 08 - 0F */ - 0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F, /* 10 - 17 */ - 0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 18 - 1F */ - 0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x00,0x00, /* 20 - 27 */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 28 - 2F */ - 0x05,0x1F,0x05,0x1F,0x04,0x1F,0x1F,0x1F, /* 30 - 37 */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 38 - 3F */ - 0x1F,0x1F,0x00,0x00,0x00,0x00,0x00,0x00, /* 40 - 47 */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 48 - 4F */ -// 0x03,0x04,0x05,0x07,0x00,0x00,0x00,0x00, /* 50 - 57 */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 50 - 57 */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 58 - 5F */ - 0x00,0x00,0x1F /* 60 - 62 */ -}; -u8 intr_data[FCH_INT_TABLE_SIZE] = { - 0x10,0x10,0x12,0x13,0x14,0x15,0x1F,0x1F, /* 00 - 07 : INTA - INTF and 2 reserved dont map 4*/ - 0x00,0x00,0x00,0x00,0x1F,0x1F,0x1F,0x1F, /* 08 - 0F */ - 0x09,0x1F,0x1F,0x1F,0x1F,0x1f,0x1F,0x10, /* 10 - 17 */ - 0x1F,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 18 - 1F */ - 0x05,0x1F,0x1F,0x1F,0x1F,0x1F,0x00,0x00, /* 20 - 27 */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 28 - 2F */ - 0x12,0x1f,0x12,0x1F,0x12,0x1F,0x1F,0x00, /* 30 - 37 */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 38 - 3F */ - 0x1f,0x13,0x00,0x00,0x00,0x00,0x00,0x00, /* 40 - 47 */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 48 - 4F */ -// 0x10,0x11,0x12,0x13,0x00,0x00,0x00,0x00, /* 50 - 57 */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 50 - 57 */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 58 - 5F */ - 0x00,0x00,0x1F /* 60 - 62 */ -}; - -#endif - - static void *smp_write_config_table(void *v) { struct mp_config_table *mc;