aboriginal

changeset 1589:96fb8598a446 1.2.3

The ARM irq mapping is more broken than that: both the SCSI controller (slot 13, pin 1) and the ethernet controller (slot 12, pin 1) are both on irq 59 in qemu. Just hardwire it for now.
author Rob Landley <rob@landley.net>
date Wed, 20 Mar 2013 21:13:57 -0500
parents 7bf850767bb8
children d06508bc4f8f
files sources/patches/linux-arm.patch
diffstat 1 files changed, 5 insertions(+), 22 deletions(-) [+]
line diff
     1.1 --- a/sources/patches/linux-arm.patch	Thu Mar 14 23:12:25 2013 -0500
     1.2 +++ b/sources/patches/linux-arm.patch	Wed Mar 20 21:13:57 2013 -0500
     1.3 @@ -91,32 +91,15 @@
     1.4   	bool "Support Versatile Platform Baseboard for ARM926EJ-S"
     1.5   	default y
     1.6  diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c
     1.7 -index 2f84f40..af54581 100644
     1.8 +index 2f84f40..cd7c8ce 100644
     1.9  --- a/arch/arm/mach-versatile/pci.c
    1.10  +++ b/arch/arm/mach-versatile/pci.c
    1.11 -@@ -23,6 +23,7 @@
    1.12 - #include <linux/io.h>
    1.13 - 
    1.14 - #include <mach/hardware.h>
    1.15 -+#include <mach/irqs.h>
    1.16 - #include <asm/irq.h>
    1.17 - #include <asm/mach/pci.h>
    1.18 - 
    1.19 -@@ -327,12 +328,12 @@ static int __init versatile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
    1.20 - 	int irq;
    1.21 - 
    1.22 - 	/* slot,  pin,	irq
    1.23 --	 *  24     1     27
    1.24 --	 *  25     1     28
    1.25 --	 *  26     1     29
    1.26 --	 *  27     1     30
    1.27 -+	 *  24     1     IRQ_SIC_PCI0
    1.28 -+	 *  25     1     IRQ_SIC_PCI1
    1.29 -+	 *  26     1     IRQ_SIC_PCI2
    1.30 -+	 *  27     1     IRQ_SIC_PCI3
    1.31 +@@ -332,7 +332,7 @@ static int __init versatile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
    1.32 + 	 *  26     1     29
    1.33 + 	 *  27     1     30
    1.34   	 */
    1.35  -	irq = 27 + ((slot - 24 + pin - 1) & 3);
    1.36 -+	irq = IRQ_VIC_START + SIC_INT_PCI0 + ((slot + pin - 2) & 3);
    1.37 ++	irq = 59; //27 + ((slot - 24 + pin - 1) & 3);
    1.38   
    1.39   	return irq;
    1.40   }