Commit 4b30b6f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 

* 'next/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  MAINTAINERS: add maintainer of CSR SiRFprimaII machine
  ARM: CSR: initializing L2 cache
  ARM: CSR: mapping early DEBUG_LL uart
  ARM: CSR: Adding CSR SiRFprimaII board support
  OMAP4: clocks: Update the clock tree with 4460 clock nodes
  OMAP4: PRCM: OMAP4460 specific PRM and CM register bitshifts
  OMAP4: ID: add omap_has_feature for max freq supported
  OMAP: ID: introduce chip detection for OMAP4460
  ARM: Xilinx: merge board file into main platform code
  ARM: Xilinx: Adding Xilinx board support

Fix up conflicts in arch/arm/mach-omap2/cm-regbits-44xx.h
parents 38da590b 6c59c115

Documentation/devicetree/bindings/arm/sirf.txt

0 → 100644
+3 −0
Original line number Diff line number Diff line 
prima2 "cb" evalutation board

Required root node properties:

    - compatible = "sirf,prima2-cb", "sirf,prima2";

Documentation/devicetree/bindings/arm/xilinx.txt

0 → 100644
+7 −0
Original line number Diff line number Diff line 
Xilinx Zynq EP107 Emulation Platform board



This board is an emulation platform for the Zynq product which is

based on an ARM Cortex A9 processor.



Required root node properties:

    - compatible = "xlnx,zynq-ep107";

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -734,6 +734,12 @@ T: git git://git.berlios.de/gemini-board 
S:	Maintained

F:	arch/arm/mach-gemini/



ARM/CSR SIRFPRIMA2 MACHINE SUPPORT

M:	Barry Song <baohua.song@csr.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-prima2/



ARM/EBSA110 MACHINE SUPPORT

M:	Russell King <linux@arm.linux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Kconfig

+26 −0
Original line number Diff line number Diff line
@@ -340,6 +340,19 @@ config ARCH_GEMINI 
	help

	  Support for the Cortina Systems Gemini family SoCs



config ARCH_PRIMA2

	bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"

	select CPU_V7

	select GENERIC_TIME

	select NO_IOPORT

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select GENERIC_IRQ_CHIP

	select USE_OF

	select ZONE_DMA

	help

          Support for CSR SiRFSoC ARM Cortex A9 Platform



config ARCH_EBSA110

	bool "EBSA-110"

	select CPU_SA110
@@ -884,6 +897,19 @@ config ARCH_VT8500 
	select HAVE_PWM

	help

	  Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip.



config ARCH_ZYNQ

	bool "Xilinx Zynq ARM Cortex A9 Platform"

	select CPU_V7

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select ARM_GIC

	select ARM_AMBA

	select ICST

	select USE_OF

	help

	  Support for Xilinx Zynq ARM Cortex A9 Platform

endchoice



#

arch/arm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ machine-$(CONFIG_ARCH_OMAP3) := omap2 
machine-$(CONFIG_ARCH_OMAP4)		:= omap2

machine-$(CONFIG_ARCH_ORION5X)		:= orion5x

machine-$(CONFIG_ARCH_PNX4008)		:= pnx4008

machine-$(CONFIG_ARCH_PRIMA2)		:= prima2

machine-$(CONFIG_ARCH_PXA)		:= pxa

machine-$(CONFIG_ARCH_REALVIEW)		:= realview

machine-$(CONFIG_ARCH_RPC)		:= rpc
@@ -194,6 +195,7 @@ machine-$(CONFIG_MACH_SPEAR300) := spear3xx 
machine-$(CONFIG_MACH_SPEAR310)		:= spear3xx

machine-$(CONFIG_MACH_SPEAR320)		:= spear3xx

machine-$(CONFIG_MACH_SPEAR600)		:= spear6xx

machine-$(CONFIG_ARCH_ZYNQ)		:= zynq



# Platform directory name.  This list is sorted alphanumerically

# by CONFIG_* macro name.
@@ -201,6 +203,7 @@ plat-$(CONFIG_ARCH_MXC) := mxc 
plat-$(CONFIG_ARCH_OMAP)	:= omap

plat-$(CONFIG_ARCH_S3C64XX)	:= samsung

plat-$(CONFIG_ARCH_TCC_926)	:= tcc

plat-$(CONFIG_ARCH_ZYNQ)	:= versatile

plat-$(CONFIG_PLAT_IOP)		:= iop

plat-$(CONFIG_PLAT_NOMADIK)	:= nomadik

plat-$(CONFIG_PLAT_ORION)	:= orion

CRA Git | Maintained and supported by SUSTech CRA and CCSE