cns3xxx: backport laguna UART setup crash fix from r33719, r33721

SVN-Revision: 35839

diff --git a/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch b/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch
index b42606b5082e26858eca3df73863c09bf449cad3..13d029c58bb38a1574320bbc940bf87b3301b925 100644 (file)
--- a/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch
+++ b/target/linux/cns3xxx/patches-3.3/300-laguna_support.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/arch/arm/mach-cns3xxx/laguna.c
-@@ -0,0 +1,935 @@
+@@ -0,0 +1,936 @@
 +/*
 + * Gateworks Corporation Laguna Platform
 + *
@@ -387,6 +387,7 @@
 +              .uartclk        = 24000000,
 +              .type           = PORT_16550A,
 +      },
++      { }
 +};
 +
 +static struct platform_device laguna_uart = {

diff --git a/target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch b/target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch
index c5de35fe427ca1064d4617f93e90ccea07cfab90..220980f51596f51a83729293e0aeec767a900e3a 100644 (file)
--- a/target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch
+++ b/target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch
@@ -500,7 +500,7 @@
  #include <asm/hardware/gic.h>
  #include "core.h"
  #include "devices.h"
-@@ -759,6 +760,10 @@ static int __init laguna_model_setup(voi
+@@ -760,6 +761,10 @@ static int __init laguna_model_setup(voi
        u8 pcie_bitmap = 0;
  
        printk("Running on Gateworks Laguna %s\n", laguna_info.model);