Patchwork alix 2d2

login
register
about
Submitter Myles Watson
Date 2010-08-31 17:01:32
Message ID <AANLkTimS7P7jOLVWaN8HLwexuSAhX2Zx3c0d84aAyMxx@mail.gmail.com>
Download mbox | patch
Permalink /patch/1832/
State Superseded
Headers show

Comments

Myles Watson - 2010-08-31 17:01:32
On Tue, Aug 31, 2010 at 10:50 AM, Jens Rottmann
<JRottmann@lippertembedded.de> wrote:
> I wrote:
>> > AFAIK an IRQ routing table entry gets ignored anyway if the
>> > appropriate device is not there
>
> Myles wrote:
>> I wanted to make sure I didn't break anything.
>
> If it wasn't ignored, wouldn't you have to recompile your BIOS every
> time you added a PCI card to your computer or pulled one out? Wouldn't
> in that case boards only work if _all_ PCI connectors were in use.
>
> A nonexisting NIC is no different than a PCI connector with nothing in
> it. From the system's point of view, it's just _nothing_ connected to
> the PCI bus.
Absolutely right.

Here's your suggestion as a patch.  (still needs an Acked-by:)

Signed-off-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles

Patch

Index: svn/src/mainboard/pcengines/Kconfig
===================================================================
--- svn.orig/src/mainboard/pcengines/Kconfig
+++ svn/src/mainboard/pcengines/Kconfig
@@ -6,7 +6,7 @@  choice
 config BOARD_PCENGINES_ALIX1C
 	bool "ALIX.1C"
 config BOARD_PCENGINES_ALIX2D3
-	bool "ALIX.2D3"
+	bool "ALIX.2D"
 
 endchoice
 
Index: svn/src/mainboard/pcengines/alix2d3/Kconfig
===================================================================
--- svn.orig/src/mainboard/pcengines/alix2d3/Kconfig
+++ svn/src/mainboard/pcengines/alix2d3/Kconfig
@@ -22,7 +22,7 @@  config MAINBOARD_PART_NUMBER
 
 config IRQ_SLOT_COUNT
 	int
-	default 6
+	default 7
 
 config RAMBASE
 	hex
Index: svn/src/mainboard/pcengines/alix2d3/irq_tables.c
===================================================================
--- svn.orig/src/mainboard/pcengines/alix2d3/irq_tables.c
+++ svn/src/mainboard/pcengines/alix2d3/irq_tables.c
@@ -103,6 +103,9 @@  const struct irq_routing_table intel_irq
 		/* Mini PCI (slot 1) */
 		{0x00, (0x0C << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {L_PIRQB, M_PIRQB}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0},
 
+		/* Mini PCI (slot 2) */
+		{0x00, (0x0E << 3) | 0x0, {{L_PIRQC, M_PIRQC}, {L_PIRQD, M_PIRQD}, {0x00, 0x00}, {0x00, 0x00}}, 0x0, 0x0},
+
 		/* Chipset slots -- f.3 wires to B, and f.4 and f.5 wires to D. */
 		{0x00, (0x0F << 3) | 0x0, {{L_PIRQA, M_PIRQA}, {L_PIRQB, M_PIRQB}, {L_PIRQC, M_PIRQC}, {L_PIRQD, M_PIRQD}}, 0x0, 0x0},
 	}
Index: svn/src/mainboard/pcengines/alix2d3/mainboard.c
===================================================================
--- svn.orig/src/mainboard/pcengines/alix2d3/mainboard.c
+++ svn/src/mainboard/pcengines/alix2d3/mainboard.c
@@ -23,8 +23,8 @@ 
 
 static void init(struct device *dev)
 {
-	printk(BIOS_DEBUG, "ALIX.2D3 ENTER %s\n", __func__);
-	printk(BIOS_DEBUG, "ALIX.2D3 EXIT %s\n", __func__);
+	printk(BIOS_DEBUG, "ALIX.2D ENTER %s\n", __func__);
+	printk(BIOS_DEBUG, "ALIX.2D EXIT %s\n", __func__);
 }
 
 static void enable_dev(struct device *dev)
@@ -33,7 +33,7 @@  static void enable_dev(struct device *de
 }
 
 struct chip_operations mainboard_ops = {
-	CHIP_NAME("PC Engines ALIX.2D3 Mainboard")
+	CHIP_NAME("PC Engines ALIX.2D Mainboard")
 	.enable_dev = enable_dev,
 };