summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Hellstrom <daniel@gaisler.com>2011-01-04 01:41:35 +0000
committerDavid S. Miller <davem@davemloft.net>2011-01-04 11:16:38 -0800
commitf28f3313aa97dcb46954f90f596d75f8faf4626e (patch)
treeb8914d5d4ad6486e063001138882712c0cb6724c
parentd89ddf0da8f0a140d4dc2e2dbc594fb278e33db5 (diff)
downloadlinux-f28f3313aa97dcb46954f90f596d75f8faf4626e.tar.bz2
Added support for ampopts in APBUART driver. Used in AMP systems.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/serial/apbuart.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/serial/apbuart.c b/drivers/serial/apbuart.c
index 7160345a184e..767ce9e396c5 100644
--- a/drivers/serial/apbuart.c
+++ b/drivers/serial/apbuart.c
@@ -26,6 +26,7 @@
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_platform.h>
+#include <linux/of_irq.h>
#include <linux/platform_device.h>
#include <linux/io.h>
#include <linux/serial_core.h>
@@ -573,7 +574,6 @@ static int __devinit apbuart_probe(struct platform_device *op,
printk(KERN_INFO "grlib-apbuart at 0x%llx, irq %d\n",
(unsigned long long) port->mapbase, port->irq);
return 0;
-
}
static struct of_device_id __initdata apbuart_match[] = {
@@ -623,9 +623,12 @@ static void grlib_apbuart_configure(void)
int *vendor = (int *) of_get_property(np, "vendor", NULL);
int *device = (int *) of_get_property(np, "device", NULL);
int *irqs = (int *) of_get_property(np, "interrupts", NULL);
+ int *ampopts = (int *) of_get_property(np, "ampopts", NULL);
regs = (struct amba_prom_registers *)
of_get_property(np, "reg", NULL);
+ if (ampopts && (*ampopts == 0))
+ continue; /* Ignore if used by another OS instance */
if (vendor)
v = *vendor;
if (device)