Commit c964cdc3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'realview-broomstick-sweep' of... 

Merge tag 'realview-broomstick-sweep' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup

Merge "delete the RealView boardfiles" from Linus Walleij:

This deletes the realview boardfiles, consolidates a bit
around the Kconfig options and leaves the mach-realview
directory nice and tidy, with all boards migrated over to
Device Tree.

* tag 'realview-broomstick-sweep' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: imply device tree boot
  ARM: realview: no need to select SMP_ON_UP explicitly
  ARM: realview: delete the RealView board files
parents 3eab887a 8f2c0062

arch/arm/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -278,10 +278,9 @@ config PHYS_OFFSET 
			ARCH_INTEGRATOR || \

			ARCH_IOP13XX || \

			ARCH_KS8695 || \

			(ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET)

			ARCH_REALVIEW

	default 0x10000000 if ARCH_OMAP1 || ARCH_RPC

	default 0x20000000 if ARCH_S5PV210

	default 0x70000000 if REALVIEW_HIGH_PHYS_OFFSET

	default 0xc0000000 if ARCH_SA1100

	help

	  Please provide the physical address corresponding to the

arch/arm/mach-realview/Kconfig

+11 −61
Original line number Diff line number Diff line
@@ -2,34 +2,29 @@ menuconfig ARCH_REALVIEW 
	bool "ARM Ltd. RealView family"

	depends on ARCH_MULTI_V5 || ARCH_MULTI_V6 || ARCH_MULTI_V7

	select ARM_AMBA

	select ARM_GIC

	select ARM_TIMER_SP804

	select CLK_SP810

	select COMMON_CLK_VERSATILE

	select GPIO_PL061 if GPIOLIB

	select ICST

	select PLAT_VERSATILE

	select PLAT_VERSATILE_SCHED_CLOCK

	help

	  This enables support for ARM Ltd RealView boards.



if ARCH_REALVIEW



config REALVIEW_DT

	bool "Support RealView(R) Device Tree based boot"

	select ARM_GIC

	select CLK_SP810

	select HAVE_SMP

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_PATA_PLATFORM

	select HAVE_TCM

	select ICST

	select MACH_REALVIEW_EB if ARCH_MULTI_V5

	select MFD_SYSCON

	select PLAT_VERSATILE

	select PLAT_VERSATILE_SCHED_CLOCK

	select POWER_RESET

	select POWER_RESET_VERSATILE

	select POWER_SUPPLY

	select SMP_ON_UP if SMP

	select SOC_REALVIEW

	select USE_OF

	help

	  Include support for booting the ARM(R) RealView(R) evaluation

	  boards using a device tree machine description.

	  This enables support for ARM Ltd RealView boards.



if ARCH_REALVIEW



config MACH_REALVIEW_EB

	bool "Support RealView(R) Emulation Baseboard"
@@ -60,8 +55,6 @@ config REALVIEW_EB_ARM1176 
config REALVIEW_EB_A9MP

	bool "Support Multicore Cortex-A9 Tile"

	depends on MACH_REALVIEW_EB && ARCH_MULTI_V7

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	help
@@ -71,30 +64,15 @@ config REALVIEW_EB_A9MP 
config REALVIEW_EB_ARM11MP

	bool "Support ARM11MPCore Tile"

	depends on MACH_REALVIEW_EB && ARCH_MULTI_V6

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	help

	  Enable support for the ARM11MPCore tile fitted to the Realview(R)

	  Emulation Baseboard platform.



config REALVIEW_EB_ARM11MP_REVB

	bool "Support ARM11MPCore RevB Tile"

	depends on REALVIEW_EB_ARM11MP && ARCH_MULTI_V6

	help

	  Enable support for the ARM11MPCore Revision B tile on the

	  Realview(R) Emulation Baseboard platform. Since there are device

	  address differences, a kernel built with this option enabled is

	  not compatible with other revisions of the ARM11MPCore tile.



config MACH_REALVIEW_PB11MP

	bool "Support RealView(R) Platform Baseboard for ARM11MPCore"

	depends on ARCH_MULTI_V6

	select ARM_GIC

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_PATA_PLATFORM

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	help
@@ -106,7 +84,6 @@ config MACH_REALVIEW_PB11MP 
config MACH_REALVIEW_PB1176

	bool "Support RealView(R) Platform Baseboard for ARM1176JZF-S"

	depends on ARCH_MULTI_V6

	select ARM_GIC

	select CPU_V6

	select HAVE_TCM

	select MIGHT_HAVE_CACHE_L2X0
@@ -114,20 +91,9 @@ config MACH_REALVIEW_PB1176 
	  Include support for the ARM(R) RealView(R) Platform Baseboard for

	  ARM1176JZF-S.



config REALVIEW_PB1176_SECURE_FLASH

	bool "Allow access to the secure flash memory block"

	depends on MACH_REALVIEW_PB1176

	default n

	help

	  Select this option if Linux will only run in secure mode on the

	  RealView PB1176 platform and access to the secure flash memory

	  block (64MB @ 0x3c000000) is required.



config MACH_REALVIEW_PBA8

	bool "Support RealView(R) Platform Baseboard for Cortex(tm)-A8 platform"

	depends on ARCH_MULTI_V7

	select ARM_GIC

	select HAVE_PATA_PLATFORM

	help

	  Include support for the ARM(R) RealView Platform Baseboard for

	  Cortex(tm)-A8.  This platform has an on-board Cortex-A8 and has
@@ -136,10 +102,6 @@ config MACH_REALVIEW_PBA8 
config MACH_REALVIEW_PBX

	bool "Support RealView(R) Platform Baseboard Explore for Cortex-A9"

	depends on ARCH_MULTI_V7

	select ARM_GIC

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_PATA_PLATFORM

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select ZONE_DMA
@@ -147,16 +109,4 @@ config MACH_REALVIEW_PBX 
	  Include support for the ARM(R) RealView(R) Platform Baseboard

	  Explore.



config REALVIEW_HIGH_PHYS_OFFSET

	bool "High physical base address for the RealView platform"

	depends on MMU && !MACH_REALVIEW_PB1176

	default y

	help

	  RealView boards other than PB1176 have the RAM available at

	  0x70000000, 256MB of which being mirrored at 0x00000000. If

	  the board supports 512MB of RAM, this option allows the

	  memory to be accessed contiguously at the high physical

	  offset. On the PBX board, disabling this option allows 1GB of

	  RAM to be used with HIGHMEM.



endif

arch/arm/mach-realview/Makefile

+1 −11
Original line number Diff line number Diff line
@@ -3,16 +3,6 @@ 
#

ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-versatile/include



obj-y					:= core.o

obj-$(CONFIG_REALVIEW_DT)		+= realview-dt.o

obj-y					+= realview-dt.o

obj-$(CONFIG_SMP)			+= platsmp-dt.o



ifdef CONFIG_ATAGS

obj-$(CONFIG_MACH_REALVIEW_EB)		+= realview_eb.o

obj-$(CONFIG_MACH_REALVIEW_PB11MP)	+= realview_pb11mp.o

obj-$(CONFIG_MACH_REALVIEW_PB1176)	+= realview_pb1176.o

obj-$(CONFIG_MACH_REALVIEW_PBA8)	+= realview_pba8.o

obj-$(CONFIG_MACH_REALVIEW_PBX)		+= realview_pbx.o

obj-$(CONFIG_SMP)			+= platsmp.o

endif

obj-$(CONFIG_HOTPLUG_CPU)		+= hotplug.o

arch/arm/mach-realview/board-eb.h

deleted100644 → 0
+0 −94
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007 ARM Limited

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

 * MA 02110-1301, USA.

 */



#ifndef __ASM_ARCH_BOARD_EB_H

#define __ASM_ARCH_BOARD_EB_H



#include "platform.h"



/*

 * RealView EB + ARM11MPCore peripheral addresses

 */

#define REALVIEW_EB_UART0_BASE		0x10009000	/* UART 0 */

#define REALVIEW_EB_UART1_BASE		0x1000A000	/* UART 1 */

#define REALVIEW_EB_UART2_BASE		0x1000B000	/* UART 2 */

#define REALVIEW_EB_UART3_BASE		0x1000C000	/* UART 3 */

#define REALVIEW_EB_SSP_BASE		0x1000D000	/* Synchronous Serial Port */

#define REALVIEW_EB_WATCHDOG_BASE	0x10010000	/* watchdog interface */

#define REALVIEW_EB_TIMER0_1_BASE	0x10011000	/* Timer 0 and 1 */

#define REALVIEW_EB_TIMER2_3_BASE	0x10012000	/* Timer 2 and 3 */

#define REALVIEW_EB_GPIO0_BASE		0x10013000	/* GPIO port 0 */

#define REALVIEW_EB_RTC_BASE		0x10017000	/* Real Time Clock */

#define REALVIEW_EB_CLCD_BASE		0x10020000	/* CLCD */

#define REALVIEW_EB_GIC_CPU_BASE	0x10040000	/* Generic interrupt controller CPU interface */

#define REALVIEW_EB_GIC_DIST_BASE	0x10041000	/* Generic interrupt controller distributor */

#define REALVIEW_EB_SMC_BASE		0x10080000	/* Static memory controller */



#define REALVIEW_EB_FLASH_BASE		0x40000000

#define REALVIEW_EB_FLASH_SIZE		SZ_64M

#define REALVIEW_EB_ETH_BASE		0x4E000000	/* Ethernet */

#define REALVIEW_EB_USB_BASE		0x4F000000	/* USB */



#ifdef CONFIG_REALVIEW_EB_ARM11MP_REVB

#define REALVIEW_EB11MP_PRIV_MEM_BASE	0x10100000

#define REALVIEW_EB11MP_L220_BASE	0x10102000	/* L220 registers */

#define REALVIEW_EB11MP_SYS_PLD_CTRL1	0xD8		/* Register offset for MPCore sysctl */

#else

#define REALVIEW_EB11MP_PRIV_MEM_BASE	0x1F000000

#define REALVIEW_EB11MP_L220_BASE	0x1F002000	/* L220 registers */

#define REALVIEW_EB11MP_SYS_PLD_CTRL1	0x74		/* Register offset for MPCore sysctl */

#endif



#define REALVIEW_EB11MP_PRIV_MEM_SIZE	SZ_8K

#define REALVIEW_EB11MP_PRIV_MEM_OFF(x)	(REALVIEW_EB11MP_PRIV_MEM_BASE + (x))



#define REALVIEW_EB11MP_SCU_BASE	REALVIEW_EB11MP_PRIV_MEM_OFF(0)		/* SCU registers */

#define REALVIEW_EB11MP_GIC_CPU_BASE	REALVIEW_EB11MP_PRIV_MEM_OFF(0x0100)	/* Generic interrupt controller CPU interface */

#define REALVIEW_EB11MP_TWD_BASE	REALVIEW_EB11MP_PRIV_MEM_OFF(0x0600)

#define REALVIEW_EB11MP_GIC_DIST_BASE	REALVIEW_EB11MP_PRIV_MEM_OFF(0x1000)	/* Generic interrupt controller distributor */



/*

 * Core tile identification (REALVIEW_SYS_PROCID)

 */

#define REALVIEW_EB_PROC_MASK		0xFF000000

#define REALVIEW_EB_PROC_ARM7TDMI	0x00000000

#define REALVIEW_EB_PROC_ARM9		0x02000000

#define REALVIEW_EB_PROC_ARM11		0x04000000

#define REALVIEW_EB_PROC_ARM11MP	0x06000000

#define REALVIEW_EB_PROC_A9MP		0x0C000000



#define check_eb_proc(proc_type)						\

	((readl(__io_address(REALVIEW_SYS_PROCID)) & REALVIEW_EB_PROC_MASK)	\

	 == proc_type)



#ifdef CONFIG_REALVIEW_EB_ARM11MP

#define core_tile_eb11mp()	check_eb_proc(REALVIEW_EB_PROC_ARM11MP)

#else

#define core_tile_eb11mp()	0

#endif



#ifdef CONFIG_REALVIEW_EB_A9MP

#define core_tile_a9mp()	check_eb_proc(REALVIEW_EB_PROC_A9MP)

#else

#define core_tile_a9mp()	0

#endif



#define machine_is_realview_eb_mp() \

	(machine_is_realview_eb() && (core_tile_eb11mp() || core_tile_a9mp()))



#endif	/* __ASM_ARCH_BOARD_EB_H */

arch/arm/mach-realview/board-pb1176.h

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 ARM Limited

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

 * MA 02110-1301, USA.

 */



#ifndef __ASM_ARCH_BOARD_PB1176_H

#define __ASM_ARCH_BOARD_PB1176_H



#include "platform.h"



/*

 * Peripheral addresses

 */

#define REALVIEW_PB1176_UART4_BASE		0x10009000 /* UART 4 */

#define REALVIEW_PB1176_SCTL_BASE		0x10100000 /* System controller */

#define REALVIEW_PB1176_SMC_BASE		0x10111000 /* SMC */

#define REALVIEW_PB1176_DMC_BASE		0x10109000 /* DMC configuration */

#define REALVIEW_PB1176_SDRAM67_BASE		0x70000000 /* SDRAM banks 6 and 7 */

#define REALVIEW_PB1176_FLASH_BASE		0x30000000

#define REALVIEW_PB1176_FLASH_SIZE		SZ_64M

#define REALVIEW_PB1176_SEC_FLASH_BASE		0x3C000000 /* Secure flash */

#define REALVIEW_PB1176_SEC_FLASH_SIZE		SZ_64M



#define REALVIEW_PB1176_TIMER0_1_BASE		0x10104000 /* Timer 0 and 1 */

#define REALVIEW_PB1176_TIMER2_3_BASE		0x10105000 /* Timer 2 and 3 */

#define REALVIEW_PB1176_TIMER4_5_BASE		0x10106000 /* Timer 4 and 5 */

#define REALVIEW_PB1176_WATCHDOG_BASE		0x10107000 /* watchdog interface */

#define REALVIEW_PB1176_RTC_BASE		0x10108000 /* Real Time Clock */

#define REALVIEW_PB1176_GPIO0_BASE		0x1010A000 /* GPIO port 0 */

#define REALVIEW_PB1176_SSP_BASE		0x1010B000 /* Synchronous Serial Port */

#define REALVIEW_PB1176_UART0_BASE		0x1010C000 /* UART 0 */

#define REALVIEW_PB1176_UART1_BASE		0x1010D000 /* UART 1 */

#define REALVIEW_PB1176_UART2_BASE		0x1010E000 /* UART 2 */

#define REALVIEW_PB1176_UART3_BASE		0x1010F000 /* UART 3 */

#define REALVIEW_PB1176_CLCD_BASE		0x10112000 /* CLCD */

#define REALVIEW_PB1176_ETH_BASE		0x3A000000 /* Ethernet */

#define REALVIEW_PB1176_USB_BASE		0x3B000000 /* USB */



/*

 * PCI regions

 */

#define REALVIEW_PB1176_PCI_BASE		0x60000000 /* PCI self config */

#define REALVIEW_PB1176_PCI_CFG_BASE		0x61000000 /* PCI config */

#define REALVIEW_PB1176_PCI_IO_BASE0		0x62000000 /* PCI IO region */

#define REALVIEW_PB1176_PCI_MEM_BASE0		0x63000000 /* Memory region 1 */

#define REALVIEW_PB1176_PCI_MEM_BASE1		0x64000000 /* Memory region 2 */

#define REALVIEW_PB1176_PCI_MEM_BASE2		0x68000000 /* Memory region 3 */



#define REALVIEW_PB1176_PCI_BASE_SIZE		0x01000000 /* 16MB */

#define REALVIEW_PB1176_PCI_CFG_BASE_SIZE	0x01000000 /* 16MB */

#define REALVIEW_PB1176_PCI_IO_BASE0_SIZE	0x01000000 /* 16MB */

#define REALVIEW_PB1176_PCI_MEM_BASE0_SIZE	0x01000000 /* 16MB */

#define REALVIEW_PB1176_PCI_MEM_BASE1_SIZE	0x04000000 /* 64MB */

#define REALVIEW_PB1176_PCI_MEM_BASE2_SIZE	0x08000000 /* 128MB */



#define REALVIEW_DC1176_GIC_CPU_BASE		0x10120000 /* GIC CPU interface, on devchip */

#define REALVIEW_DC1176_GIC_DIST_BASE		0x10121000 /* GIC distributor, on devchip */

#define REALVIEW_DC1176_ROM_BASE		0x10200000 /* 16KiB NRAM preudo-ROM, on devchip */

#define REALVIEW_PB1176_GIC_CPU_BASE		0x10040000 /* GIC CPU interface, on FPGA */

#define REALVIEW_PB1176_GIC_DIST_BASE		0x10041000 /* GIC distributor, on FPGA */

#define REALVIEW_PB1176_L220_BASE		0x10110000 /* L220 registers */



/*

 * Control register SYS_RESETCTL Bit 8 is set to 1 to force a soft reset

 */

#define REALVIEW_PB1176_SYS_SOFT_RESET    0x0100



#endif	/* __ASM_ARCH_BOARD_PB1176_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE