diff options
| author | Linus Walleij <linus.walleij@stericsson.com> | 2009-08-04 01:01:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 11:51:14 +0100 |
| commit | f17a1f06d2fa93f4825be572622eb02c4894db4e (patch) | |
| tree | a9c179d0a49bbb67db01be55d03a9c1dc966eb27 /arch/arm/common | |
| parent | 701038144945ef98c5817f43079952fa38c35999 (diff) | |
| download | linux-f17a1f06d2fa93f4825be572622eb02c4894db4e.tar.bz2 | |
ARM: 5636/1: Move vendor enum to AMBA include
This moves the primecell vendor enum definition inside vic.c
out to linux/amba/bus.h where it belongs and replace any
occurances of specific vendor ID:s with the respective enums
instead.
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/common')
| -rw-r--r-- | arch/arm/common/vic.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c index bc1f9ad61ff6..920ced0b73c5 100644 --- a/arch/arm/common/vic.c +++ b/arch/arm/common/vic.c @@ -22,6 +22,7 @@ #include <linux/list.h> #include <linux/io.h> #include <linux/sysdev.h> +#include <linux/amba/bus.h> #include <asm/mach/irq.h> #include <asm/hardware/vic.h> @@ -272,11 +273,6 @@ static struct irq_chip vic_chip = { static void vik_init_st(void __iomem *base, unsigned int irq_start, u32 vic_sources); -enum vic_vendor { - VENDOR_ARM = 0x41, - VENDOR_ST = 0x80, -}; - /** * vic_init - initialise a vectored interrupt controller * @base: iomem base address @@ -289,7 +285,7 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, { unsigned int i; u32 cellid = 0; - enum vic_vendor vendor; + enum amba_vendor vendor; /* Identify which VIC cell this one is, by reading the ID */ for (i = 0; i < 4; i++) { @@ -301,13 +297,13 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, base, cellid, vendor); switch(vendor) { - case VENDOR_ST: + case AMBA_VENDOR_ST: vik_init_st(base, irq_start, vic_sources); return; default: printk(KERN_WARNING "VIC: unknown vendor, continuing anyways\n"); /* fall through */ - case VENDOR_ARM: + case AMBA_VENDOR_ARM: break; } |