summaryrefslogtreecommitdiff
path: root/target/mips/mikrotik-rb532/patches/3.15-rc7
diff options
context:
space:
mode:
Diffstat (limited to 'target/mips/mikrotik-rb532/patches/3.15-rc7')
-rw-r--r--target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-pci.patch11
-rw-r--r--target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-serial.patch15
2 files changed, 26 insertions, 0 deletions
diff --git a/target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-pci.patch b/target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-pci.patch
new file mode 100644
index 000000000..173e49c35
--- /dev/null
+++ b/target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-pci.patch
@@ -0,0 +1,11 @@
+diff -Nur linux-3.15-rc5.orig/arch/mips/pci/pci-rc32434.c linux-3.15-rc5/arch/mips/pci/pci-rc32434.c
+--- linux-3.15-rc5.orig/arch/mips/pci/pci-rc32434.c 2014-05-09 22:10:52.000000000 +0200
++++ linux-3.15-rc5/arch/mips/pci/pci-rc32434.c 2014-05-16 10:38:10.000000000 +0200
+@@ -53,7 +53,6 @@
+ .start = 0x50000000,
+ .end = 0x5FFFFFFF,
+ .flags = IORESOURCE_MEM,
+- .parent = &rc32434_res_pci_mem1,
+ .sibling = NULL,
+ .child = &rc32434_res_pci_mem2
+ };
diff --git a/target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-serial.patch b/target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-serial.patch
new file mode 100644
index 000000000..6c6951895
--- /dev/null
+++ b/target/mips/mikrotik-rb532/patches/3.15-rc7/rb532-serial.patch
@@ -0,0 +1,15 @@
+diff -Nur linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c linux-3.15-rc5/drivers/tty/serial/serial_core.c
+--- linux-3.15-rc5.orig/drivers/tty/serial/serial_core.c 2014-05-09 22:10:52.000000000 +0200
++++ linux-3.15-rc5/drivers/tty/serial/serial_core.c 2014-05-20 10:30:52.000000000 +0200
+@@ -2686,9 +2686,10 @@
+
+ /*
+ * If the port is used as a console, unregister it
+- */
++ * DISABLE: breaks serial console on rb532
+ if (uart_console(uport))
+ unregister_console(uport->cons);
++ */
+
+ /*
+ * Free the port IO and memory resources, if any.