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

Commit 844e8a16 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'picoxcell/cleanup' into next/cleanup 

* picoxcell/cleanup: (4 commits)
  MAINTAINERS: add maintainer entry for Picochip picoxcell
  ARM: picoxcell: move io mappings to common.c
  ARM: picoxcell: don't reserve irq_descs
  ARM: picoxcell: remove mach/memory.h

Conflicts:
	arch/arm/mach-at91/setup.c
parents 5ecdd39f a53bfa07

Documentation/arm/memory.txt

+5 −6
Original line number Diff line number Diff line
@@ -51,15 +51,14 @@ ffc00000 ffefffff DMA memory mapping region. Memory returned 
ff000000	ffbfffff	Reserved for future expansion of DMA

				mapping region.



VMALLOC_END	feffffff	Free for platform use, recommended.

				VMALLOC_END must be aligned to a 2MB

				boundary.



VMALLOC_START	VMALLOC_END-1	vmalloc() / ioremap() space.

				Memory returned by vmalloc/ioremap will

				be dynamically placed in this region.

				VMALLOC_START may be based upon the value

				of the high_memory variable.

				Machine specific static mappings are also

				located here through iotable_init().

				VMALLOC_START is based upon the value

				of the high_memory variable, and VMALLOC_END

				is equal to 0xff000000.



PAGE_OFFSET	high_memory-1	Kernel direct-mapped RAM region.

				This maps the platforms RAM, and typically

Documentation/devicetree/bindings/arm/gic.txt

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ Optional 
- interrupts	: Interrupt source of the parent interrupt controller. Only

  present on secondary GICs.



- cpu-offset	: per-cpu offset within the distributor and cpu interface

  regions, used when the GIC doesn't have banked registers. The offset is

  cpu-offset * cpu-nr.



Example:



	intc: interrupt-controller@fff11000 {

Documentation/devicetree/bindings/arm/vic.txt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
* ARM Vectored Interrupt Controller



One or more Vectored Interrupt Controllers (VIC's) can be connected in an ARM

system for interrupt routing.  For multiple controllers they can either be

nested or have the outputs wire-OR'd together.



Required properties:



- compatible : should be one of

	"arm,pl190-vic"

	"arm,pl192-vic"

- interrupt-controller : Identifies the node as an interrupt controller

- #interrupt-cells : The number of cells to define the interrupts.  Must be 1 as

  the VIC has no configuration options for interrupt sources.  The cell is a u32

  and defines the interrupt number.

- reg : The register bank for the VIC.



Optional properties:



- interrupts : Interrupt source for parent controllers if the VIC is nested.



Example:



	vic0: interrupt-controller@60000 {

		compatible = "arm,pl192-vic";

		interrupt-controller;

		#interrupt-cells = <1>;

		reg = <0x60000 0x1000>;

	};

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -5117,6 +5117,15 @@ L: linux-mtd@lists.infradead.org 
S:	Maintained

F:	drivers/mtd/devices/phram.c



PICOXCELL SUPPORT

M:	Jamie Iles <jamie@jamieiles.com>

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

T:	git git://github.com/jamieiles/linux-2.6-ji.git

S:	Supported

F:	arch/arm/mach-picoxcell

F:	drivers/*/picoxcell*

F:	drivers/*/*/picoxcell*



PIN CONTROL SUBSYSTEM

M:	Linus Walleij <linus.walleij@linaro.org>

S:	Maintained

arch/arm/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -650,6 +650,7 @@ config ARCH_PICOXCELL 
	select HAVE_SCHED_CLOCK

	select HAVE_TCM

	select NO_IOPORT

	select SPARSE_IRQ

	select USE_OF

	help

	  This enables support for systems based on the Picochip picoXcell
@@ -1971,7 +1972,7 @@ endchoice 


config XIP_KERNEL

	bool "Kernel Execute-In-Place from ROM"

	depends on !ZBOOT_ROM

	depends on !ZBOOT_ROM && !ARM_LPAE

	help

	  Execute-In-Place allows the kernel to run from non-volatile storage

	  directly addressable by the CPU, such as NOR flash. This saves RAM
@@ -2001,7 +2002,7 @@ config XIP_PHYS_ADDR 


config KEXEC

	bool "Kexec system call (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	depends on EXPERIMENTAL && (!SMP || HOTPLUG_CPU)

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot