diff options
| author |   Ryan Mallon <ryan@bluewatersys.com> | 2011-05-20 08:34:21 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 22:34:24 +0100 |
| commit | 61e72bca04be2dc11a637185f2bbe6dba32ecaf3 (patch) | |
| tree | 997d0912e7f1483bdc913fae32e2c3b61481238e /arch/arm/mach-spear3xx/spear3xx.c | |
| parent | ARM: 6928/1: SPEAr3xx: Make local shirq structures static (diff) | |
| download | linux-dev-61e72bca04be2dc11a637185f2bbe6dba32ecaf3.tar.xz linux-dev-61e72bca04be2dc11a637185f2bbe6dba32ecaf3.zip | |
ARM: 6935/1: SPEAR3xx: Rename register/irq defines to remove naming conflicts
Prefix register and irq defintions to remove naming conflicts between
the three SPEAr3xx platforms.
Reviewed-by: Stanley Miao <stanley.miao@windriver.com>
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-spear3xx/spear3xx.c')
| -rw-r--r-- | arch/arm/mach-spear3xx/spear3xx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-spear3xx/spear3xx.c b/arch/arm/mach-spear3xx/spear3xx.c index 1316eaa14822..35cb8c72d899 100644 --- a/arch/arm/mach-spear3xx/spear3xx.c +++ b/arch/arm/mach-spear3xx/spear3xx.c @@ -25,7 +25,7 @@ /* gpio device registration */ static struct pl061_platform_data gpio_plat_data = { .gpio_base = 0, - .irq_base = SPEAR_GPIO_INT_BASE, + .irq_base = SPEAR3XX_GPIO_INT_BASE, }; struct amba_device gpio_device = { @@ -38,7 +38,7 @@ struct amba_device gpio_device = { .end = SPEAR3XX_ICM3_GPIO_BASE + SZ_4K - 1, .flags = IORESOURCE_MEM, }, - .irq = {IRQ_BASIC_GPIO, NO_IRQ}, + .irq = {SPEAR3XX_IRQ_BASIC_GPIO, NO_IRQ}, }; /* uart device registration */ @@ -51,7 +51,7 @@ struct amba_device uart_device = { .end = SPEAR3XX_ICM1_UART_BASE + SZ_4K - 1, .flags = IORESOURCE_MEM, }, - .irq = {IRQ_UART, NO_IRQ}, + .irq = {SPEAR3XX_IRQ_UART, NO_IRQ}, }; /* Do spear3xx familiy common initialization part here */ |