Merge 3.7-rc5 into driver-core-next (ecdca043) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/arm64/memory.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -27,17 +27,17 @@ Start End Size Use
		-----------------------------------------------------------------------
		0000000000000000 0000007fffffffff 512GB user

		ffffff8000000000 ffffffbbfffcffff ~240GB vmalloc
		ffffff8000000000 ffffffbbfffeffff ~240GB vmalloc

		ffffffbbfffd0000 ffffffbcfffdffff 64KB [guard page]
		ffffffbbffff0000 ffffffbbffffffff 64KB [guard page]

		ffffffbbfffe0000 ffffffbcfffeffff 64KB PCI I/O space
		ffffffbc00000000 ffffffbdffffffff 8GB vmemmap

		ffffffbbffff0000 ffffffbcffffffff 64KB [guard page]
		ffffffbe00000000 ffffffbffbbfffff ~8GB [guard, future vmmemap]

		ffffffbc00000000 ffffffbdffffffff 8GB vmemmap
		ffffffbffbe00000 ffffffbffbe0ffff 64KB PCI I/O space

		ffffffbe00000000 ffffffbffbffffff ~8GB [guard, future vmmemap]
		ffffffbbffff0000 ffffffbcffffffff ~2MB [guard]

		ffffffbffc000000 ffffffbfffffffff 64MB modules

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		* EETI eGalax Multiple Touch Controller

		Required properties:
		- compatible: must be "eeti,egalax_ts"
		- reg: i2c slave address
		- interrupt-parent: the phandle for the interrupt controller
		- interrupts: touch controller interrupt
		- wakeup-gpios: the gpio pin to be used for waking up the controller
		as well as uased as irq pin

		Example:

		egalax_ts@04 {
		compatible = "eeti,egalax_ts";
		reg = <0x04>;
		interrupt-parent = <&gpio1>;
		interrupts = <9 2>;
		wakeup-gpios = <&gpio1 9 0>;
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ Supported chips:
		BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors
		(not yet published)

		Author: Andreas Herrmann <andreas.herrmann3@amd.com>
		Author: Andreas Herrmann <herrmann.der.user@googlemail.com>

		Description
		-----------

+3 −2

Original line number	Diff line number	Diff line
		@@ -503,7 +503,7 @@ F: include/linux/altera_uart.h
		F: include/linux/altera_jtaguart.h

		AMD FAM15H PROCESSOR POWER MONITORING DRIVER
		M: Andreas Herrmann <andreas.herrmann3@amd.com>
		M: Andreas Herrmann <herrmann.der.user@googlemail.com>
		L: lm-sensors@lm-sensors.org
		S: Maintained
		F: Documentation/hwmon/fam15h_power
		@@ -2507,6 +2507,7 @@ M: Joonyoung Shim <jy0922.shim@samsung.com>
		M: Seung-Woo Kim <sw0312.kim@samsung.com>
		M: Kyungmin Park <kyungmin.park@samsung.com>
		L: dri-devel@lists.freedesktop.org
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
		S: Supported
		F: drivers/gpu/drm/exynos
		F: include/drm/exynos*
		@@ -5647,7 +5648,7 @@ S: Maintained
		F: drivers/pinctrl/spear/

		PKTCDVD DRIVER
		M: Peter Osterlund <petero2@telia.com>
		M: Jiri Kosina <jkosina@suse.cz>
		S: Maintained
		F: drivers/block/pktcdvd.c
		F: include/linux/pktcdvd.h

+1 −1