Commit d516a305 authored by Catalin Marinas's avatar Catalin Marinas Committed by Russell King

[ARM PATCH] 2309/1: ARCH->MACH replacement for the Versatile/AB platform

Patch from Catalin Marinas

The Versatile/AB platform is defined as a MACH (not ARCH) in the
arch/arm/tools/mach-types file.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King
parent 4ae22c49
...@@ -7,7 +7,7 @@ config ARCH_VERSATILE_PB ...@@ -7,7 +7,7 @@ config ARCH_VERSATILE_PB
help help
Include support for the ARM(R) Versatile/PB platform. Include support for the ARM(R) Versatile/PB platform.
config ARCH_VERSATILE_AB config MACH_VERSATILE_AB
bool "Support Versatile/AB platform" bool "Support Versatile/AB platform"
default n default n
help help
......
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
obj-y := core.o clock.o obj-y := core.o clock.o
obj-$(CONFIG_ARCH_VERSATILE_PB) += versatile_pb.o obj-$(CONFIG_ARCH_VERSATILE_PB) += versatile_pb.o
obj-$(CONFIG_ARCH_VERSATILE_AB) += versatile_ab.o obj-$(CONFIG_MACH_VERSATILE_AB) += versatile_ab.o
...@@ -189,7 +189,7 @@ static struct map_desc versatile_io_desc[] __initdata = { ...@@ -189,7 +189,7 @@ static struct map_desc versatile_io_desc[] __initdata = {
{ IO_ADDRESS(VERSATILE_SIC_BASE), VERSATILE_SIC_BASE, SZ_4K, MT_DEVICE }, { IO_ADDRESS(VERSATILE_SIC_BASE), VERSATILE_SIC_BASE, SZ_4K, MT_DEVICE },
{ IO_ADDRESS(VERSATILE_VIC_BASE), VERSATILE_VIC_BASE, SZ_4K, MT_DEVICE }, { IO_ADDRESS(VERSATILE_VIC_BASE), VERSATILE_VIC_BASE, SZ_4K, MT_DEVICE },
{ IO_ADDRESS(VERSATILE_SCTL_BASE), VERSATILE_SCTL_BASE, SZ_4K * 9, MT_DEVICE }, { IO_ADDRESS(VERSATILE_SCTL_BASE), VERSATILE_SCTL_BASE, SZ_4K * 9, MT_DEVICE },
#ifdef CONFIG_ARCH_VERSATILE_AB #ifdef CONFIG_MACH_VERSATILE_AB
{ IO_ADDRESS(VERSATILE_GPIO0_BASE), VERSATILE_GPIO0_BASE, SZ_4K, MT_DEVICE }, { IO_ADDRESS(VERSATILE_GPIO0_BASE), VERSATILE_GPIO0_BASE, SZ_4K, MT_DEVICE },
{ IO_ADDRESS(VERSATILE_IB2_BASE), VERSATILE_IB2_BASE, SZ_64M, MT_DEVICE }, { IO_ADDRESS(VERSATILE_IB2_BASE), VERSATILE_IB2_BASE, SZ_64M, MT_DEVICE },
#endif #endif
...@@ -341,7 +341,7 @@ static void versatile_oscvco_set(struct clk *clk, struct icst307_vco vco) ...@@ -341,7 +341,7 @@ static void versatile_oscvco_set(struct clk *clk, struct icst307_vco vco)
unsigned long sys_lock = IO_ADDRESS(VERSATILE_SYS_BASE) + VERSATILE_SYS_LOCK_OFFSET; unsigned long sys_lock = IO_ADDRESS(VERSATILE_SYS_BASE) + VERSATILE_SYS_LOCK_OFFSET;
#if defined(CONFIG_ARCH_VERSATILE_PB) #if defined(CONFIG_ARCH_VERSATILE_PB)
unsigned long sys_osc = IO_ADDRESS(VERSATILE_SYS_BASE) + VERSATILE_SYS_OSC4_OFFSET; unsigned long sys_osc = IO_ADDRESS(VERSATILE_SYS_BASE) + VERSATILE_SYS_OSC4_OFFSET;
#elif defined(CONFIG_ARCH_VERSATILE_AB) #elif defined(CONFIG_MACH_VERSATILE_AB)
unsigned long sys_osc = IO_ADDRESS(VERSATILE_SYS_BASE) + VERSATILE_SYS_OSC1_OFFSET; unsigned long sys_osc = IO_ADDRESS(VERSATILE_SYS_BASE) + VERSATILE_SYS_OSC1_OFFSET;
#endif #endif
u32 val; u32 val;
...@@ -512,7 +512,7 @@ static void versatile_clcd_disable(struct clcd_fb *fb) ...@@ -512,7 +512,7 @@ static void versatile_clcd_disable(struct clcd_fb *fb)
val &= ~SYS_CLCD_NLCDIOON | SYS_CLCD_PWR3V5SWITCH; val &= ~SYS_CLCD_NLCDIOON | SYS_CLCD_PWR3V5SWITCH;
writel(val, sys_clcd); writel(val, sys_clcd);
#ifdef CONFIG_ARCH_VERSATILE_AB #ifdef CONFIG_MACH_VERSATILE_AB
/* /*
* If the LCD is Sanyo 2x5 in on the IB2 board, turn the back-light off * If the LCD is Sanyo 2x5 in on the IB2 board, turn the back-light off
*/ */
...@@ -561,7 +561,7 @@ static void versatile_clcd_enable(struct clcd_fb *fb) ...@@ -561,7 +561,7 @@ static void versatile_clcd_enable(struct clcd_fb *fb)
val |= SYS_CLCD_NLCDIOON | SYS_CLCD_PWR3V5SWITCH; val |= SYS_CLCD_NLCDIOON | SYS_CLCD_PWR3V5SWITCH;
writel(val, sys_clcd); writel(val, sys_clcd);
#ifdef CONFIG_ARCH_VERSATILE_AB #ifdef CONFIG_MACH_VERSATILE_AB
/* /*
* If the LCD is Sanyo 2x5 in on the IB2 board, turn the back-light on * If the LCD is Sanyo 2x5 in on the IB2 board, turn the back-light on
*/ */
......
...@@ -121,8 +121,8 @@ config CPU_ARM925T ...@@ -121,8 +121,8 @@ config CPU_ARM925T
# ARM926T # ARM926T
config CPU_ARM926T config CPU_ARM926T
bool "Support ARM926T processor" if ARCH_INTEGRATOR bool "Support ARM926T processor" if ARCH_INTEGRATOR
depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || ARCH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP1610 || ARCH_OMAP5912 depends on ARCH_INTEGRATOR || ARCH_VERSATILE_PB || MACH_VERSATILE_AB || ARCH_OMAP730 || ARCH_OMAP1610 || ARCH_OMAP5912
default y if ARCH_VERSATILE_PB || ARCH_VERSATILE_AB default y if ARCH_VERSATILE_PB || MACH_VERSATILE_AB
select CPU_32v5 select CPU_32v5
select CPU_ABRT_EV5TJ select CPU_ABRT_EV5TJ
select CPU_CACHE_VIVT select CPU_CACHE_VIVT
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
#define VERSATILE_SYS_OSC2_OFFSET 0x14 #define VERSATILE_SYS_OSC2_OFFSET 0x14
#define VERSATILE_SYS_OSC3_OFFSET 0x18 #define VERSATILE_SYS_OSC3_OFFSET 0x18
#define VERSATILE_SYS_OSC4_OFFSET 0x1C #define VERSATILE_SYS_OSC4_OFFSET 0x1C
#elif defined(CONFIG_ARCH_VERSATILE_AB) #elif defined(CONFIG_MACH_VERSATILE_AB)
#define VERSATILE_SYS_OSC1_OFFSET 0x1C #define VERSATILE_SYS_OSC1_OFFSET 0x1C
#endif #endif
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
#define VERSATILE_CSR_BASE 0x10000000 #define VERSATILE_CSR_BASE 0x10000000
#define VERSATILE_CSR_SIZE 0x10000000 #define VERSATILE_CSR_SIZE 0x10000000
#ifdef CONFIG_ARCH_VERSATILE_AB #ifdef CONFIG_MACH_VERSATILE_AB
/* /*
* IB2 Versatile/AB expansion board definitions * IB2 Versatile/AB expansion board definitions
*/ */
......
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