Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22ba14f4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'realview-base-armsoc-1-tag' of... 

Merge tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/multiplatform

Merge "Realview multiplatform support" from Linus Walleij:

The board and infrastructure changes for RealView
multiplatform and extended DT support.

* tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: add an DT SMP boot method
  ARM: realview: select SP810 and ICST for the DT variant
  soc: versatile: add support for the PB11MPCore
  clk: versatile-icst: add device tree support
  clk: versatile-icst: refactor to allocate regmap separately
  clk: versatile-icst: convert to use regmap
  ARM: realview: remove private barrier implementation
  ARM: no longer force unbuffered DMA for realview
  clk/realview: stop using machine headers
  ARM: realview: don't map undefined PCI registers
  ARM: realview: remove sparsemem hack

Conflicts:
	drivers/clk/versatile/Kconfig
parents 7379d96b 5420b4b1

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ nodes to be present and contain the properties described below. 
			    "allwinner,sun6i-a31"

			    "allwinner,sun8i-a23"

			    "arm,psci"

			    "arm,realview-smp"

			    "brcm,brahma-b15"

			    "marvell,armada-375-smp"

			    "marvell,armada-380-smp"

arch/arm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ config ARM_PATCH_PHYS_VIRT 
	bool "Patch physical to virtual translations at runtime" if EMBEDDED

	default y

	depends on !XIP_KERNEL && MMU

	depends on !ARCH_REALVIEW || !SPARSEMEM

	help

	  Patch phys-to-virt and virt-to-phys translation functions at

	  boot and module load time according to the position of the
@@ -356,7 +355,6 @@ config ARCH_REALVIEW 
	select GENERIC_CLOCKEVENTS

	select GPIO_PL061 if GPIOLIB

	select ICST

	select NEED_MACH_MEMORY_H

	select PLAT_VERSATILE

	select PLAT_VERSATILE_SCHED_CLOCK

	help

arch/arm/mach-realview/Kconfig

+6 −5
Original line number Diff line number Diff line
@@ -4,10 +4,14 @@ menu "RealView platform type" 
config REALVIEW_DT

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

	select ARM_GIC

	select CLK_SP810

	select HAVE_SMP

	select ICST

	select MFD_SYSCON

	select POWER_RESET

	select POWER_RESET_VERSATILE

	select POWER_SUPPLY

	select SMP_ON_UP

	select SOC_REALVIEW

	select USE_OF

	help
@@ -36,7 +40,6 @@ config REALVIEW_EB_A9MP 
config REALVIEW_EB_ARM11MP

	bool "Support ARM11MPCore Tile"

	depends on MACH_REALVIEW_EB

	select ARCH_HAS_BARRIERS if SMP

	select CPU_V6K

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP
@@ -57,7 +60,6 @@ config REALVIEW_EB_ARM11MP_REVB 


config MACH_REALVIEW_PB11MP

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

	select ARCH_HAS_BARRIERS if SMP

	select ARM_GIC

	select CPU_V6K

	select HAVE_ARM_SCU if SMP
@@ -102,14 +104,13 @@ config MACH_REALVIEW_PBA8 


config MACH_REALVIEW_PBX

	bool "Support RealView(R) Platform Baseboard Explore"

	select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET

	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 if SPARSEMEM

	select ZONE_DMA

	help

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

	  Explore.
@@ -124,6 +125,6 @@ config REALVIEW_HIGH_PHYS_OFFSET 
	  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 SPARSEMEM.

	  RAM to be used with HIGHMEM.



endmenu

arch/arm/mach-realview/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



obj-y					:= core.o

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

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

obj-$(CONFIG_MACH_REALVIEW_EB)		+= realview_eb.o

obj-$(CONFIG_MACH_REALVIEW_PB11MP)	+= realview_pb11mp.o

obj-$(CONFIG_MACH_REALVIEW_PB1176)	+= realview_pb1176.o

arch/arm/mach-realview/include/mach/barriers.h

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

 * Barriers redefined for RealView ARM11MPCore platforms with L220 cache

 * controller to work around hardware errata causing the outer_sync()

 * operation to deadlock the system.

 */

#define mb()		dsb()

#define rmb()		dsb()

#define wmb()		mb()