aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mpc85xx/patches-3.6/120-mpc8548_cds_i8259_noirq_init.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-02-01 17:49:53 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-02-01 17:49:53 +0000
commit56849d146cc45e11bc1a9c96bb7564a2a7578b7b (patch)
tree61c36a3263682a3a62d34b1ddea6f77316b7655d /target/linux/mpc85xx/patches-3.6/120-mpc8548_cds_i8259_noirq_init.patch
parent630fffbeadd5a34927ad8428cd8d1aa881e80a76 (diff)
downloadupstream-56849d146cc45e11bc1a9c96bb7564a2a7578b7b.tar.gz
upstream-56849d146cc45e11bc1a9c96bb7564a2a7578b7b.tar.bz2
upstream-56849d146cc45e11bc1a9c96bb7564a2a7578b7b.zip
mpc85xx: add support for 3.6
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 35443
Diffstat (limited to 'target/linux/mpc85xx/patches-3.6/120-mpc8548_cds_i8259_noirq_init.patch')
-rw-r--r--target/linux/mpc85xx/patches-3.6/120-mpc8548_cds_i8259_noirq_init.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/mpc85xx/patches-3.6/120-mpc8548_cds_i8259_noirq_init.patch b/target/linux/mpc85xx/patches-3.6/120-mpc8548_cds_i8259_noirq_init.patch
new file mode 100644
index 0000000000..81b9193691
--- /dev/null
+++ b/target/linux/mpc85xx/patches-3.6/120-mpc8548_cds_i8259_noirq_init.patch
@@ -0,0 +1,23 @@
+--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
++++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+@@ -247,15 +247,16 @@ static int mpc85xx_cds_8259_attach(void)
+ return -ENODEV;
+ }
+
++ i8259_init(cascade_node, 0);
++ of_node_put(cascade_node);
++
+ cascade_irq = irq_of_parse_and_map(cascade_node, 0);
+ if (cascade_irq == NO_IRQ) {
+- printk(KERN_ERR "Failed to map cascade interrupt\n");
++ of_node_put(cascade_node);
++ printk(KERN_DEBUG "No interrupt for i8259 PIC\n");
+ return -ENXIO;
+ }
+
+- i8259_init(cascade_node, 0);
+- of_node_put(cascade_node);
+-
+ /*
+ * Hook the interrupt to make sure desc->action is never NULL.
+ * This is required to ensure that the interrupt does not get