Commit f28f3313 authored by Daniel Hellstrom's avatar Daniel Hellstrom Committed by David S. Miller

Added support for ampopts in APBUART driver. Used in AMP systems.

Signed-off-by: default avatarDaniel Hellstrom <daniel@gaisler.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d89ddf0d
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_irq.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
...@@ -573,7 +574,6 @@ static int __devinit apbuart_probe(struct platform_device *op, ...@@ -573,7 +574,6 @@ static int __devinit apbuart_probe(struct platform_device *op,
printk(KERN_INFO "grlib-apbuart at 0x%llx, irq %d\n", printk(KERN_INFO "grlib-apbuart at 0x%llx, irq %d\n",
(unsigned long long) port->mapbase, port->irq); (unsigned long long) port->mapbase, port->irq);
return 0; return 0;
} }
static struct of_device_id __initdata apbuart_match[] = { static struct of_device_id __initdata apbuart_match[] = {
...@@ -623,9 +623,12 @@ static void grlib_apbuart_configure(void) ...@@ -623,9 +623,12 @@ static void grlib_apbuart_configure(void)
int *vendor = (int *) of_get_property(np, "vendor", NULL); int *vendor = (int *) of_get_property(np, "vendor", NULL);
int *device = (int *) of_get_property(np, "device", NULL); int *device = (int *) of_get_property(np, "device", NULL);
int *irqs = (int *) of_get_property(np, "interrupts", NULL); int *irqs = (int *) of_get_property(np, "interrupts", NULL);
int *ampopts = (int *) of_get_property(np, "ampopts", NULL);
regs = (struct amba_prom_registers *) regs = (struct amba_prom_registers *)
of_get_property(np, "reg", NULL); of_get_property(np, "reg", NULL);
if (ampopts && (*ampopts == 0))
continue; /* Ignore if used by another OS instance */
if (vendor) if (vendor)
v = *vendor; v = *vendor;
if (device) if (device)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment