From fb3eca1a8e161bbc92da15085c6eb6e907e42b09 Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 9 May 2012 10:48:41 +0000 Subject: mpc85xx: remove 2.6.38 support git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31661 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../mpc85xx/patches/100-fix_mpc8568e_mds.patch | 60 ---------------------- .../mpc85xx/patches/110-fix_mpc8548_cds.patch | 38 -------------- .../patches/120-mpc8548_cds_i8259_noirq_init.patch | 23 --------- .../130-mpc8548_cds_disable_i8259_irq.patch | 13 ----- 4 files changed, 134 deletions(-) delete mode 100644 target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch delete mode 100644 target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch delete mode 100644 target/linux/mpc85xx/patches/120-mpc8548_cds_i8259_noirq_init.patch delete mode 100644 target/linux/mpc85xx/patches/130-mpc8548_cds_disable_i8259_irq.patch (limited to 'target/linux/mpc85xx/patches') diff --git a/target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch b/target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch deleted file mode 100644 index d1e672a9df..0000000000 --- a/target/linux/mpc85xx/patches/100-fix_mpc8568e_mds.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- a/arch/powerpc/boot/dts/mpc8568mds.dts -+++ b/arch/powerpc/boot/dts/mpc8568mds.dts -@@ -301,32 +301,24 @@ - }; - }; - -- duart-sleep-nexus { -- #address-cells = <1>; -- #size-cells = <1>; -- compatible = "simple-bus"; -- sleep = <&pmc 0x00000002>; -- ranges; -- -- serial0: serial@4500 { -- cell-index = <0>; -- device_type = "serial"; -- compatible = "ns16550"; -- reg = <0x4500 0x100>; -- clock-frequency = <0>; -- interrupts = <42 2>; -- interrupt-parent = <&mpic>; -- }; -+ serial0: serial@4500 { -+ cell-index = <0>; -+ device_type = "serial"; -+ compatible = "ns16550"; -+ reg = <0x4500 0x100>; -+ clock-frequency = <0>; -+ interrupts = <42 2>; -+ interrupt-parent = <&mpic>; -+ }; - -- serial1: serial@4600 { -- cell-index = <1>; -- device_type = "serial"; -- compatible = "ns16550"; -- reg = <0x4600 0x100>; -- clock-frequency = <0>; -- interrupts = <42 2>; -- interrupt-parent = <&mpic>; -- }; -+ serial1: serial@4600 { -+ cell-index = <1>; -+ device_type = "serial"; -+ compatible = "ns16550"; -+ reg = <0x4600 0x100>; -+ clock-frequency = <0>; -+ interrupts = <42 2>; -+ interrupt-parent = <&mpic>; - }; - - global-utilities@e0000 { -@@ -669,4 +661,7 @@ - gpios = <&bcsr5 3 0>; - }; - }; -+ chosen { -+ linux,stdout-path = "/soc8568@e0000000/serial@4500"; -+ }; - }; diff --git a/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch b/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch deleted file mode 100644 index 3cca8288c6..0000000000 --- a/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/arch/powerpc/boot/dts/mpc8548cds.dts -+++ b/arch/powerpc/boot/dts/mpc8548cds.dts -@@ -308,21 +308,21 @@ - }; - }; - -- serial0: serial@4500 { -- cell-index = <0>; -+ serial0: serial@4600 { -+ cell-index = <1>; - device_type = "serial"; - compatible = "ns16550"; -- reg = <0x4500 0x100>; // reg base, size -+ reg = <0x4600 0x100>; // reg base, size - clock-frequency = <0>; // should we fill in in uboot? - interrupts = <42 2>; - interrupt-parent = <&mpic>; - }; - -- serial1: serial@4600 { -- cell-index = <1>; -+ serial1: serial@4500 { -+ cell-index = <0>; - device_type = "serial"; - compatible = "ns16550"; -- reg = <0x4600 0x100>; // reg base, size -+ reg = <0x4500 0x100>; // reg base, size - clock-frequency = <0>; // should we fill in in uboot? - interrupts = <42 2>; - interrupt-parent = <&mpic>; -@@ -564,4 +564,7 @@ - 0x0 0x100000>; - }; - }; -+ chosen { -+ linux,stdout-path = "/soc8548@e0000000/serial@4600"; -+ }; - }; diff --git a/target/linux/mpc85xx/patches/120-mpc8548_cds_i8259_noirq_init.patch b/target/linux/mpc85xx/patches/120-mpc8548_cds_i8259_noirq_init.patch deleted file mode 100644 index 4d585100e6..0000000000 --- a/target/linux/mpc85xx/patches/120-mpc8548_cds_i8259_noirq_init.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c -+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c -@@ -234,15 +234,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 diff --git a/target/linux/mpc85xx/patches/130-mpc8548_cds_disable_i8259_irq.patch b/target/linux/mpc85xx/patches/130-mpc8548_cds_disable_i8259_irq.patch deleted file mode 100644 index 54a27858f3..0000000000 --- a/target/linux/mpc85xx/patches/130-mpc8548_cds_disable_i8259_irq.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/arch/powerpc/boot/dts/mpc8548cds.dts -+++ b/arch/powerpc/boot/dts/mpc8548cds.dts -@@ -492,8 +492,10 @@ - #address-cells = <0>; - #interrupt-cells = <2>; - compatible = "chrp,iic"; -+/* - interrupts = <0 1>; - interrupt-parent = <&mpic>; -+*/ - }; - - rtc@70 { -- cgit v1.2.3