diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2013-03-01 11:22:27 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2013-03-01 11:22:27 +0000 |
| commit | 5f65907a7c61c9040ec1f0c0adf800807d585cac (patch) | |
| tree | 842783a8317ed71e8e7e27c42ab6fd940dcecc67 /target/linux | |
| parent | 433db8f7ec2ec318bd777c6fab36215f6cb7ffc9 (diff) | |
| download | upstream-5f65907a7c61c9040ec1f0c0adf800807d585cac.tar.gz upstream-5f65907a7c61c9040ec1f0c0adf800807d585cac.tar.bz2 upstream-5f65907a7c61c9040ec1f0c0adf800807d585cac.zip | |
cns3xxx: backport laguna UART setup crash fix from r33719, r33721
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@35839 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/cns3xxx/patches-3.3/300-laguna_support.patch | 3 | ||||
| -rw-r--r-- | target/linux/cns3xxx/patches-3.3/470-gpio_irq.patch | 2 |
2 files changed, 3 insertions, 2 deletions
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 b42606b508..13d029c58b 100644 --- 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 c5de35fe42..220980f515 100644 --- 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); |