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 | |
| parent | 701038144945ef98c5817f43079952fa38c35999 (diff) | |
| download | op-kernel-dev-f17a1f06d2fa93f4825be572622eb02c4894db4e.zip op-kernel-dev-f17a1f06d2fa93f4825be572622eb02c4894db4e.tar.gz | |
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>
| -rw-r--r-- | arch/arm/common/vic.c | 12 | ||||
| -rw-r--r-- | drivers/mmc/host/mmci.c | 6 | ||||
| -rw-r--r-- | include/linux/amba/bus.h | 5 |
3 files changed, 12 insertions, 11 deletions
diff --git a/arch/arm/common/vic.c b/arch/arm/common/vic.c index bc1f9ad..920ced0 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; } diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index e1aa847..d78b1e46 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -430,7 +430,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) clk = 255; host->cclk = host->mclk / (2 * (clk + 1)); } - if (host->hw_designer == 0x80) + if (host->hw_designer == AMBA_VENDOR_ST) clk |= MCI_FCEN; /* Bug fix in ST IP block */ clk |= MCI_CLK_ENABLE; } @@ -443,7 +443,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) break; case MMC_POWER_UP: /* The ST version does not have this, fall through to POWER_ON */ - if (host->hw_designer != 0x80) { + if (host->hw_designer != AMBA_VENDOR_ST) { pwr |= MCI_PWR_UP; break; } @@ -453,7 +453,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) } if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN) { - if (host->hw_designer != 0x80) + if (host->hw_designer != AMBA_VENDOR_ST) pwr |= MCI_ROD; else { /* diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index 9b93caf..ab94335 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -36,6 +36,11 @@ struct amba_driver { struct amba_id *id_table; }; +enum amba_vendor { + AMBA_VENDOR_ARM = 0x41, + AMBA_VENDOR_ST = 0x80, +}; + #define amba_get_drvdata(d) dev_get_drvdata(&d->dev) #define amba_set_drvdata(d,p) dev_set_drvdata(&d->dev, p) |
