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

ARM: versatile: move integrator/realview/vexpress to versatile 



These are all fairly small platforms by now, and they are
closely related. Just move them all into a single directory.

Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Liviu Dudau <liviu.dudau@arm.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Tested-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 31231092

MAINTAINERS

+0 −3
Original line number Diff line number Diff line
@@ -1525,10 +1525,7 @@ F: Documentation/devicetree/bindings/mtd/mtd-physmap.yaml 
F:	arch/arm/boot/dts/arm-realview-*

F:	arch/arm/boot/dts/integrator*

F:	arch/arm/boot/dts/versatile*

F:	arch/arm/mach-integrator/

F:	arch/arm/mach-realview/

F:	arch/arm/mach-versatile/

F:	arch/arm/plat-versatile/

F:	drivers/bus/arm-integrator-lm.c

F:	drivers/clk/versatile/

F:	drivers/i2c/busses/i2c-versatile.c

arch/arm/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -622,8 +622,6 @@ source "arch/arm/mach-hisi/Kconfig" 


source "arch/arm/mach-imx/Kconfig"



source "arch/arm/mach-integrator/Kconfig"



source "arch/arm/mach-iop32x/Kconfig"



source "arch/arm/mach-ixp4xx/Kconfig"
@@ -675,8 +673,6 @@ source "arch/arm/mach-rda/Kconfig" 


source "arch/arm/mach-realtek/Kconfig"



source "arch/arm/mach-realview/Kconfig"



source "arch/arm/mach-rockchip/Kconfig"



source "arch/arm/mach-s3c/Kconfig"
@@ -705,8 +701,6 @@ source "arch/arm/mach-ux500/Kconfig" 


source "arch/arm/mach-versatile/Kconfig"



source "arch/arm/mach-vexpress/Kconfig"



source "arch/arm/mach-vt8500/Kconfig"



source "arch/arm/mach-zynq/Kconfig"

arch/arm/Makefile

+1 −6
Original line number Diff line number Diff line
@@ -179,7 +179,6 @@ machine-$(CONFIG_ARCH_FOOTBRIDGE) += footbridge 
machine-$(CONFIG_ARCH_GEMINI)		+= gemini

machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank

machine-$(CONFIG_ARCH_HISI)		+= hisi

machine-$(CONFIG_ARCH_INTEGRATOR)	+= integrator

machine-$(CONFIG_ARCH_IOP32X)		+= iop32x

machine-$(CONFIG_ARCH_IXP4XX)		+= ixp4xx

machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone
@@ -187,7 +186,6 @@ machine-$(CONFIG_ARCH_LPC18XX) += lpc18xx 
machine-$(CONFIG_ARCH_LPC32XX)		+= lpc32xx

machine-$(CONFIG_ARCH_MESON)		+= meson

machine-$(CONFIG_ARCH_MMP)		+= mmp

machine-$(CONFIG_ARCH_MPS2)		+= vexpress

machine-$(CONFIG_ARCH_MOXART)		+= moxart

machine-$(CONFIG_ARCH_MV78XX0)		+= mv78xx0

machine-$(CONFIG_ARCH_MVEBU)		+= mvebu
@@ -207,7 +205,6 @@ machine-$(CONFIG_ARCH_PXA) += pxa 
machine-$(CONFIG_ARCH_QCOM)		+= qcom

machine-$(CONFIG_ARCH_RDA)		+= rda

machine-$(CONFIG_ARCH_REALTEK)		+= realtek

machine-$(CONFIG_ARCH_REALVIEW)		+= realview

machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip

machine-$(CONFIG_ARCH_RPC)		+= rpc

machine-$(CONFIG_PLAT_SAMSUNG)		+= s3c
@@ -220,10 +217,9 @@ machine-$(CONFIG_ARCH_STM32) += stm32 
machine-$(CONFIG_ARCH_SUNXI)		+= sunxi

machine-$(CONFIG_ARCH_TEGRA)		+= tegra

machine-$(CONFIG_ARCH_U8500)		+= ux500

machine-$(CONFIG_ARCH_VERSATILE)	+= versatile

machine-$(CONFIG_ARCH_VEXPRESS)		+= vexpress

machine-$(CONFIG_ARCH_VT8500)		+= vt8500

machine-$(CONFIG_ARCH_ZYNQ)		+= zynq

machine-$(CONFIG_PLAT_VERSATILE)	+= versatile

machine-$(CONFIG_PLAT_SPEAR)		+= spear



# Platform directory name.  This list is sorted alphanumerically
@@ -231,7 +227,6 @@ machine-$(CONFIG_PLAT_SPEAR) += spear 
plat-$(CONFIG_ARCH_OMAP)	+= omap

plat-$(CONFIG_PLAT_ORION)	+= orion

plat-$(CONFIG_PLAT_PXA)		+= pxa

plat-$(CONFIG_PLAT_VERSATILE)	+= versatile



# The byte offset of the kernel image in RAM from the start of RAM.

TEXT_OFFSET := $(textofs-y)

arch/arm/mach-integrator/Kconfig

deleted100644 → 0
+0 −125
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

menuconfig ARCH_INTEGRATOR

	bool "ARM Ltd. Integrator family"

	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6

	select ARM_AMBA

	select CMA

	select DMA_CMA

	select HAVE_TCM

	select CLK_ICST

	select MFD_SYSCON

	select PLAT_VERSATILE

	select POWER_RESET

	select POWER_RESET_VERSATILE

	select POWER_SUPPLY

	select SOC_INTEGRATOR_CM

	select VERSATILE_FPGA_IRQ

	help

	  Support for ARM's Integrator platform.



if ARCH_INTEGRATOR



config ARCH_INTEGRATOR_AP

	bool "Support Integrator/AP and Integrator/PP2 platforms"

	select INTEGRATOR_AP_TIMER

	select SERIAL_AMBA_PL010 if TTY

	select SERIAL_AMBA_PL010_CONSOLE if TTY

	select SOC_BUS

	help

	  Include support for the ARM(R) Integrator/AP and

	  Integrator/PP2 platforms.



config INTEGRATOR_IMPD1

	bool "Include support for Integrator/IM-PD1"

	depends on ARCH_INTEGRATOR_AP

	select ARM_VIC

	select GPIO_PL061

	select GPIOLIB

	select REGULATOR

	select REGULATOR_FIXED_VOLTAGE

	help

	  The IM-PD1 is an add-on logic module for the Integrator which

	  allows ARM(R) Ltd PrimeCells to be developed and evaluated.

	  The IM-PD1 can be found on the Integrator/PP2 platform.



config INTEGRATOR_CM720T

	bool "Integrator/CM720T core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V4T

	select CPU_ARM720T



config INTEGRATOR_CM920T

	bool "Integrator/CM920T core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V4T

	select CPU_ARM920T



config INTEGRATOR_CM922T_XA10

	bool "Integrator/CM922T-XA10 core module"

	depends on ARCH_MULTI_V4T

	depends on ARCH_INTEGRATOR_AP

	select CPU_ARM922T



config INTEGRATOR_CM926EJS

	bool "Integrator/CM926EJ-S core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V5

	select CPU_ARM926T



config INTEGRATOR_CM10200E_REV0

	bool "Integrator/CM10200E rev.0 core module"

	depends on ARCH_INTEGRATOR_AP && n

	depends on ARCH_MULTI_V5

	select CPU_ARM1020



config INTEGRATOR_CM10200E

	bool "Integrator/CM10200E core module"

	depends on ARCH_INTEGRATOR_AP && n

	depends on ARCH_MULTI_V5

	select CPU_ARM1020E



config INTEGRATOR_CM10220E

	bool "Integrator/CM10220E core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V5

	select CPU_ARM1022



config INTEGRATOR_CM1026EJS

	bool "Integrator/CM1026EJ-S core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V5

	select CPU_ARM1026



config INTEGRATOR_CM1136JFS

	bool "Integrator/CM1136JF-S core module"

	depends on ARCH_INTEGRATOR_AP

	depends on ARCH_MULTI_V6

	select CPU_V6



config ARCH_INTEGRATOR_CP

	bool "Support Integrator/CP platform"

	depends on ARCH_MULTI_V5 || ARCH_MULTI_V6

	select ARM_TIMER_SP804

	select SERIAL_AMBA_PL011 if TTY

	select SERIAL_AMBA_PL011_CONSOLE if TTY

	select SOC_BUS

	help

	  Include support for the ARM(R) Integrator CP platform.



config INTEGRATOR_CT926

	bool "Integrator/CT926 (ARM926EJ-S) core tile"

	depends on ARCH_INTEGRATOR_CP

	depends on ARCH_MULTI_V5

	select CPU_ARM926T



config INTEGRATOR_CTB36

	bool "Integrator/CTB36 (ARM1136JF-S) core tile"

	depends on ARCH_INTEGRATOR_CP

	depends on ARCH_MULTI_V6

	select CPU_V6



config ARCH_CINTEGRATOR

	depends on ARCH_INTEGRATOR_CP

	def_bool y



endif

arch/arm/mach-integrator/Makefile

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# Makefile for the linux kernel.

#



# Object file lists.



obj-y					:= core.o

obj-$(CONFIG_ARCH_INTEGRATOR_AP)	+= integrator_ap.o

obj-$(CONFIG_ARCH_INTEGRATOR_CP)	+= integrator_cp.o