KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ixp4xx: replace magic number with macros in avila/ixdp425/miccpt PCI routing setup

Browse source 
Replace magic number with the appropriate macro in
avila/ixdp425/miccpt PCI routing setup.
Signed-off-by: Tamas TEVESZ <ice@extreme.hu>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 37154
This commit is contained in:
Jonas Gorski 2013-07-03 17:51:54 +00:00
parent cdd6c5b750
commit fb81a9b5ed
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/ixp4xx/patches-3.10/300-avila_support.patch
View file

@ -11,17 +11,19 @@
#define IRQ_LINES 4
/* PCI controller GPIO to IRQ pin mappings */
@@ -55,9 +55,7 @@ static int __init avila_map_irq(const st
@@ -55,10 +55,8 @@ static int __init avila_map_irq(const st
IXP4XX_GPIO_IRQ(INTD)
};
- if (slot >= 1 &&
- slot <= (machine_is_loft() ? LOFT_MAX_DEV : AVILA_MAX_DEV) &&
- pin >= 1 && pin <= IRQ_LINES)
- return pci_irq_table[(slot + pin - 2) % 4];
+ if (slot >= 1 && slot <= AVILA_MAX_DEV && pin >= 1 && pin <= IRQ_LINES)
return pci_irq_table[(slot + pin - 2) % 4];
+ return pci_irq_table[(slot + pin - 2) % IRQ_LINES];
return -1;
}
--- a/arch/arm/mach-ixp4xx/avila-setup.c
+++ b/arch/arm/mach-ixp4xx/avila-setup.c
@@ -14,9 +14,16 @@

22
target/linux/ixp4xx/patches-3.10/910-ixp4xx-nr_irq_lines.patch Normal file
View file

@ -0,0 +1,22 @@
--- a/arch/arm/mach-ixp4xx/ixdp425-pci.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-pci.c
@@ -53,7 +53,7 @@ static int __init ixdp425_map_irq(const
};
if (slot >= 1 && slot <= MAX_DEV && pin >= 1 && pin <= IRQ_LINES)
- return pci_irq_table[(slot + pin - 2) % 4];
+ return pci_irq_table[(slot + pin - 2) % IRQ_LINES];
return -1;
}
--- a/arch/arm/mach-ixp4xx/miccpt-pci.c
+++ b/arch/arm/mach-ixp4xx/miccpt-pci.c
@@ -54,7 +54,7 @@ static int __init miccpt_map_irq(const s
};
if (slot >= 1 && slot <= MAX_DEV && pin >= 1 && pin <= IRQ_LINES)
- return pci_irq_table[(slot + pin - 2) % 4];
+ return pci_irq_table[(slot + pin - 2) % IRQ_LINES];
return -1;
}