Commit 994c0e99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc 

* 'next/soc' of git://git.linaro.org/people/arnd/arm-soc: (21 commits)
  MAINTAINERS: add ARM/FREESCALE IMX6 entry
  arm/imx: merge i.MX3 and i.MX6
  arm/imx6q: add suspend/resume support
  arm/imx6q: add device tree machine support
  arm/imx6q: add smp and cpu hotplug support
  arm/imx6q: add core drivers clock, gpc, mmdc and src
  arm/imx: add gic_handle_irq function
  arm/imx6q: add core definitions and low-level debug uart
  arm/imx6q: add device tree source
  ARM: highbank: add suspend support
  ARM: highbank: Add cpu hotplug support
  ARM: highbank: add SMP support
  MAINTAINERS: add Calxeda Highbank ARM platform
  ARM: add Highbank core platform support
  ARM: highbank: add devicetree source
  ARM: l2x0: add empty l2x0_of_init
  picoxcell: add a definition of VMALLOC_END
  picoxcell: remove custom ioremap implementation
  picoxcell: add the DTS for the PC7302 board
  picoxcell: add the DTS for pc3x2 and pc3x3 devices
  ...

Fix up trivial conflicts in arch/arm/Kconfig, and some more header file
conflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge
by Arnd).
parents 367069f1 abc3f126

Documentation/devicetree/bindings/arm/calxeda.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
Calxeda Highbank Platforms Device Tree Bindings

-----------------------------------------------



Boards with Calxeda Cortex-A9 based Highbank SOC shall have the following

properties.



Required root node properties:

    - compatible = "calxeda,highbank";

Documentation/devicetree/bindings/arm/fsl.txt

+7 −0
Original line number Diff line number Diff line 
Freescale i.MX Platforms Device Tree Bindings

-----------------------------------------------



i.MX51 Babbage Board

Required root node properties:

    - compatible = "fsl,imx51-babbage", "fsl,imx51";
@@ -17,3 +20,7 @@ Required root node properties: 
i.MX53 Smart Mobile Reference Design Board

Required root node properties:

    - compatible = "fsl,imx53-smd", "fsl,imx53";



i.MX6 Quad SABRE Automotive Board

Required root node properties:

    - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";

Documentation/devicetree/bindings/arm/picoxcell.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
Picochip picoXcell device tree bindings.

========================================



Required root node properties:

    - compatible:

	- "picochip,pc7302-pc3x3" : PC7302 development board with PC3X3 device.

	- "picochip,pc7302-pc3x2" : PC7302 development board with PC3X2 device.

	- "picochip,pc3x3" : picoXcell PC3X3 device based board.

	- "picochip,pc3x2" : picoXcell PC3X2 device based board.



Timers required properties:

    - compatible = "picochip,pc3x2-timer"

    - interrupts : The single IRQ line for the timer.

    - clock-freq : The frequency in HZ of the timer.

    - reg : The register bank for the timer.



Note: two timers are required - one for the scheduler clock and one for the

event tick/NOHZ.



VIC required properties:

    - compatible = "arm,pl192-vic".

    - interrupt-controller.

    - reg : The register bank for the device.

    - #interrupt-cells : Must be 1.

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -692,6 +692,12 @@ F: drivers/mtd/nand/bcm_umi_nand.c 
F:	drivers/mtd/nand/bcm_umi_bch.c

F:	drivers/mtd/nand/nand_bcm_umi.h



ARM/CALXEDA HIGHBANK ARCHITECTURE

M:	Rob Herring <rob.herring@calxeda.com>

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

S:	Maintained

F:	arch/arm/mach-highbank/



ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT

M:	Anton Vorontsov <avorontsov@mvista.com>

S:	Maintained
@@ -791,6 +797,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Maintained

F:	arch/arm/mach-mx5/



ARM/FREESCALE IMX6

M:	Shawn Guo <shawn.guo@linaro.org>

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

S:	Maintained

T:	git git://git.linaro.org/people/shawnguo/linux-2.6.git

F:	arch/arm/mach-imx/*imx6*



ARM/GLOMATION GESBC9312SX MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

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

arch/arm/Kconfig

+33 −1
Original line number Diff line number Diff line
@@ -334,6 +334,20 @@ config ARCH_BCMRING 
	help

	  Support for Broadcom's BCMRing platform.



config ARCH_HIGHBANK

	bool "Calxeda Highbank-based"

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_AMBA

	select ARM_GIC

	select ARM_TIMER_SP804

	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU

	select USE_OF

	help

	  Support for the Calxeda Highbank SoC based boards.



config ARCH_CLPS711X

	bool "Cirrus Logic CLPS711x/EP721x-based"

	select CPU_ARM720T
@@ -623,6 +637,24 @@ config ARCH_TEGRA 
	  This enables support for NVIDIA Tegra based systems (Tegra APX,

	  Tegra 6xx and Tegra 2 series).



config ARCH_PICOXCELL

	bool "Picochip picoXcell"

	select ARCH_REQUIRE_GPIOLIB

	select ARM_PATCH_PHYS_VIRT

	select ARM_VIC

	select CPU_V6K

	select DW_APB_TIMER

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_SCHED_CLOCK

	select HAVE_TCM

	select NO_IOPORT

	select USE_OF

	help

	  This enables support for systems based on the Picochip picoXcell

	  family of Femtocell devices.  The picoxcell support requires device tree

	  for all boards.



config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"

	select CPU_ARM926T
@@ -1398,7 +1430,7 @@ config SMP 
	depends on REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP || \

		 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \

		 ARCH_EXYNOS4 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \

		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE

		 ARCH_MSM_SCORPIONMP || ARCH_SHMOBILE || ARCH_HIGHBANK || SOC_IMX6Q

	depends on MMU

	select USE_GENERIC_SMP_HELPERS

	select HAVE_ARM_SCU if !ARCH_MSM_SCORPIONMP

CRA Git | Maintained and supported by SUSTech CRA and CCSE