aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mpc85xx/patches-3.18/120-mpc8548_cds_i8259_noirq_init.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-02-17 20:28:36 +0000
committerJohn Crispin <blogic@openwrt.org>2015-02-17 20:28:36 +0000
commit5ea6da2c711e25cc3d0a78058f91426528040880 (patch)
tree9c9c7143b321c11de7c19269c8841a325a147631 /target/linux/mpc85xx/patches-3.18/120-mpc8548_cds_i8259_noirq_init.patch
parent5b897b6f3a887a294c7763621371df1f4c6d2fa9 (diff)
downloadupstream-5ea6da2c711e25cc3d0a78058f91426528040880.tar.gz
upstream-5ea6da2c711e25cc3d0a78058f91426528040880.tar.bz2
upstream-5ea6da2c711e25cc3d0a78058f91426528040880.zip
mpc85xx: add v3.18 support
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44485 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mpc85xx/patches-3.18/120-mpc8548_cds_i8259_noirq_init.patch')
-rw-r--r--target/linux/mpc85xx/patches-3.18/120-mpc8548_cds_i8259_noirq_init.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/mpc85xx/patches-3.18/120-mpc8548_cds_i8259_noirq_init.patch b/target/linux/mpc85xx/patches-3.18/120-mpc8548_cds_i8259_noirq_init.patch
new file mode 100644
index 0000000000..81b9193691
--- /dev/null
+++ b/target/linux/mpc85xx/patches-3.18/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