1 From 8129fa5437f3fe5f95bac180a43cd5a856cebdf3 Mon Sep 17 00:00:00 2001
2 From: Daniel Hellstrom <daniel@gaisler.com>
3 Date: Wed, 20 Oct 2010 17:00:41 +0200
4 Subject: [PATCH] Added support for ampopts in APBUART driver. Used in AMP systems.
6 Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
8 drivers/serial/apbuart.c | 5 ++++-
9 1 files changed, 4 insertions(+), 1 deletions(-)
11 --- a/drivers/serial/apbuart.c
12 +++ b/drivers/serial/apbuart.c
15 #include <linux/of_device.h>
16 #include <linux/of_platform.h>
17 +#include <linux/of_irq.h>
18 #include <linux/platform_device.h>
20 #include <linux/serial_core.h>
21 @@ -573,7 +574,6 @@ static int __devinit apbuart_probe(struc
22 printk(KERN_INFO "grlib-apbuart at 0x%llx, irq %d\n",
23 (unsigned long long) port->mapbase, port->irq);
28 static struct of_device_id __initdata apbuart_match[] = {
29 @@ -620,9 +620,12 @@ static void grlib_apbuart_configure(void
30 int *vendor = (int *) of_get_property(np, "vendor", NULL);
31 int *device = (int *) of_get_property(np, "device", NULL);
32 int *irqs = (int *) of_get_property(np, "interrupts", NULL);
33 + int *ampopts = (int *) of_get_property(np, "ampopts", NULL);
34 regs = (struct amba_prom_registers *)
35 of_get_property(np, "reg", NULL);
37 + if (ampopts && (*ampopts == 0))
38 + continue; /* Ignore if used by another OS instance */