Merge branch 'samsung/dt' into samsung/cleanup (a07613a5) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/arm/memory.txt

+5 −6

Original line number	Original line	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		ff000000 ffbfffff Reserved for future expansion of DMA
	mapping region.		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.		VMALLOC_START VMALLOC_END-1 vmalloc() / ioremap() space.
	Memory returned by vmalloc/ioremap will		Memory returned by vmalloc/ioremap will
	be dynamically placed in this region.		be dynamically placed in this region.
	VMALLOC_START may be based upon the value		Machine specific static mappings are also
	of the high_memory variable.		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.		PAGE_OFFSET high_memory-1 Kernel direct-mapped RAM region.
	This maps the platforms RAM, and typically		This maps the platforms RAM, and typically

Documentation/devicetree/bindings/arm/gic.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -42,6 +42,10 @@ Optional
	- interrupts : Interrupt source of the parent interrupt controller. Only		- interrupts : Interrupt source of the parent interrupt controller. Only
	present on secondary GICs.		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:		Example:

	intc: interrupt-controller@fff11000 {		intc: interrupt-controller@fff11000 {

Documentation/devicetree/bindings/arm/vic.txt

0 → 100644

+29 −0

Original line number	Original line	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>;
			};

Documentation/virtual/kvm/api.txt

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1100,6 +1100,15 @@ emulate them efficiently. The fields in each entry are defined as follows:
	eax, ebx, ecx, edx: the values returned by the cpuid instruction for		eax, ebx, ecx, edx: the values returned by the cpuid instruction for
	this function/index combination		this function/index combination

			The TSC deadline timer feature (CPUID leaf 1, ecx[24]) is always returned
			as false, since the feature depends on KVM_CREATE_IRQCHIP for local APIC
			support. Instead it is reported via

			ioctl(KVM_CHECK_EXTENSION, KVM_CAP_TSC_DEADLINE_TIMER)

			if that returns true and you use KVM_CREATE_IRQCHIP, or if you emulate the
			feature in userspace, then you can enable the feature for KVM_SET_CPUID2.

	4.47 KVM_PPC_GET_PVINFO		4.47 KVM_PPC_GET_PVINFO

	Capability: KVM_CAP_PPC_GET_PVINFO		Capability: KVM_CAP_PPC_GET_PVINFO
	@@ -1151,6 +1160,13 @@ following flags are specified:
	/* Depends on KVM_CAP_IOMMU */		/* Depends on KVM_CAP_IOMMU */
	#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)		#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)

			The KVM_DEV_ASSIGN_ENABLE_IOMMU flag is a mandatory option to ensure
			isolation of the device. Usages not specifying this flag are deprecated.

			Only PCI header type 0 devices with PCI BAR resources are supported by
			device assignment. The user requesting this ioctl must have read/write
			access to the PCI sysfs resource files associated with the device.

	4.49 KVM_DEASSIGN_PCI_DEVICE		4.49 KVM_DEASSIGN_PCI_DEVICE

	Capability: KVM_CAP_DEVICE_DEASSIGNMENT		Capability: KVM_CAP_DEVICE_DEASSIGNMENT

MAINTAINERS

+21 −12

Original line number	Original line	Diff line number	Diff line
	@@ -1124,13 +1124,6 @@ S: Supported
	F: arch/arm/mach-shmobile/		F: arch/arm/mach-shmobile/
	F: drivers/sh/		F: drivers/sh/

	ARM/TELECHIPS ARM ARCHITECTURE
	M: "Hans J. Koch" <hjk@hansjkoch.de>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	S: Maintained
	F: arch/arm/plat-tcc/
	F: arch/arm/mach-tcc8k/

	ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT		ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
	M: Lennert Buytenhek <kernel@wantstofly.org>		M: Lennert Buytenhek <kernel@wantstofly.org>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
	@@ -2700,7 +2693,7 @@ FIREWIRE SUBSYSTEM
	M: Stefan Richter <stefanr@s5r6.in-berlin.de>		M: Stefan Richter <stefanr@s5r6.in-berlin.de>
	L: linux1394-devel@lists.sourceforge.net		L: linux1394-devel@lists.sourceforge.net
	W: http://ieee1394.wiki.kernel.org/		W: http://ieee1394.wiki.kernel.org/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git
	S: Maintained		S: Maintained
	F: drivers/firewire/		F: drivers/firewire/
	F: include/linux/firewire*.h		F: include/linux/firewire*.h
	@@ -3101,6 +3094,7 @@ F: include/linux/hid*

	HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS		HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
	M: Thomas Gleixner <tglx@linutronix.de>		M: Thomas Gleixner <tglx@linutronix.de>
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
	S: Maintained		S: Maintained
	F: Documentation/timers/		F: Documentation/timers/
	F: kernel/hrtimer.c		F: kernel/hrtimer.c
	@@ -3610,7 +3604,7 @@ F: net/irda/
	IRQ SUBSYSTEM		IRQ SUBSYSTEM
	M: Thomas Gleixner <tglx@linutronix.de>		M: Thomas Gleixner <tglx@linutronix.de>
	S: Maintained		S: Maintained
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq/core		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
	F: kernel/irq/		F: kernel/irq/

	ISAPNP		ISAPNP
	@@ -4098,7 +4092,7 @@ F: drivers/hwmon/lm90.c
	LOCKDEP AND LOCKSTAT		LOCKDEP AND LOCKSTAT
	M: Peter Zijlstra <peterz@infradead.org>		M: Peter Zijlstra <peterz@infradead.org>
	M: Ingo Molnar <mingo@redhat.com>		M: Ingo Molnar <mingo@redhat.com>
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core/locking
	S: Maintained		S: Maintained
	F: Documentation/lockdep*.txt		F: Documentation/lockdep*.txt
	F: Documentation/lockstat.txt		F: Documentation/lockstat.txt
	@@ -4280,7 +4274,9 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
	S: Maintained		S: Maintained
	F: Documentation/dvb/		F: Documentation/dvb/
	F: Documentation/video4linux/		F: Documentation/video4linux/
			F: Documentation/DocBook/media/
	F: drivers/media/		F: drivers/media/
			F: drivers/staging/media/
	F: include/media/		F: include/media/
	F: include/linux/dvb/		F: include/linux/dvb/
	F: include/linux/videodev*.h		F: include/linux/videodev*.h
	@@ -5086,6 +5082,7 @@ M: Peter Zijlstra <a.p.zijlstra@chello.nl>
	M: Paul Mackerras <paulus@samba.org>		M: Paul Mackerras <paulus@samba.org>
	M: Ingo Molnar <mingo@elte.hu>		M: Ingo Molnar <mingo@elte.hu>
	M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>		M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
	S: Supported		S: Supported
	F: kernel/events/*		F: kernel/events/*
	F: include/linux/perf_event.h		F: include/linux/perf_event.h
	@@ -5117,6 +5114,15 @@ L: linux-mtd@lists.infradead.org
	S: Maintained		S: Maintained
	F: drivers/mtd/devices/phram.c		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		PIN CONTROL SUBSYSTEM
	M: Linus Walleij <linus.walleij@linaro.org>		M: Linus Walleij <linus.walleij@linaro.org>
	S: Maintained		S: Maintained
	@@ -5165,6 +5171,7 @@ F: drivers/scsi/pm8001/

	POSIX CLOCKS and TIMERS		POSIX CLOCKS and TIMERS
	M: Thomas Gleixner <tglx@linutronix.de>		M: Thomas Gleixner <tglx@linutronix.de>
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
	S: Supported		S: Supported
	F: fs/timerfd.c		F: fs/timerfd.c
	F: include/linux/timer*		F: include/linux/timer*
	@@ -5680,6 +5687,7 @@ F: drivers/dma/dw_dmac.c
	TIMEKEEPING, NTP		TIMEKEEPING, NTP
	M: John Stultz <johnstul@us.ibm.com>		M: John Stultz <johnstul@us.ibm.com>
	M: Thomas Gleixner <tglx@linutronix.de>		M: Thomas Gleixner <tglx@linutronix.de>
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
	S: Supported		S: Supported
	F: include/linux/clocksource.h		F: include/linux/clocksource.h
	F: include/linux/time.h		F: include/linux/time.h
	@@ -5704,6 +5712,7 @@ F: drivers/watchdog/sc1200wdt.c
	SCHEDULER		SCHEDULER
	M: Ingo Molnar <mingo@elte.hu>		M: Ingo Molnar <mingo@elte.hu>
	M: Peter Zijlstra <peterz@infradead.org>		M: Peter Zijlstra <peterz@infradead.org>
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
	S: Maintained		S: Maintained
	F: kernel/sched*		F: kernel/sched*
	F: include/linux/sched.h		F: include/linux/sched.h
	@@ -6631,7 +6640,7 @@ TRACING
	M: Steven Rostedt <rostedt@goodmis.org>		M: Steven Rostedt <rostedt@goodmis.org>
	M: Frederic Weisbecker <fweisbec@gmail.com>		M: Frederic Weisbecker <fweisbec@gmail.com>
	M: Ingo Molnar <mingo@redhat.com>		M: Ingo Molnar <mingo@redhat.com>
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf/core		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
	S: Maintained		S: Maintained
	F: Documentation/trace/ftrace.txt		F: Documentation/trace/ftrace.txt
	F: arch///*/ftrace.h		F: arch///*/ftrace.h
	@@ -7381,7 +7390,7 @@ M: Thomas Gleixner <tglx@linutronix.de>
	M: Ingo Molnar <mingo@redhat.com>		M: Ingo Molnar <mingo@redhat.com>
	M: "H. Peter Anvin" <hpa@zytor.com>		M: "H. Peter Anvin" <hpa@zytor.com>
	M: x86@kernel.org		M: x86@kernel.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
	S: Maintained		S: Maintained
	F: Documentation/x86/		F: Documentation/x86/
	F: arch/x86/		F: arch/x86/