Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (182ad468) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/devicetree/bindings/dma/apm-xgene-dma.txt

+1 −1

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -82,6 +82,9 @@ Optional properties:
	- id: If there are multiple instance of the same type, in order to		- id: If there are multiple instance of the same type, in order to
	differentiate between each instance "id" can be used (e.g., multi-lane PCIe		differentiate between each instance "id" can be used (e.g., multi-lane PCIe
	PHY). If "id" is not provided, it is set to default value of '1'.		PHY). If "id" is not provided, it is set to default value of '1'.
			- syscon-pllreset: Handle to system control region that contains the
			CTRL_CORE_SMA_SW_0 register and register offset to the CTRL_CORE_SMA_SW_0
			register that contains the SATA_PLL_SOFT_RESET bit. Only valid for sata_phy.

	This is usually a subnode of ocp2scp to which it is connected.		This is usually a subnode of ocp2scp to which it is connected.

	@@ -100,3 +103,16 @@ usb3phy@4a084400 {
	"sysclk",		"sysclk",
	"refclk";		"refclk";
	};		};

			sata_phy: phy@4A096000 {
			compatible = "ti,phy-pipe3-sata";
			reg = <0x4A096000 0x80>, /* phy_rx */
			<0x4A096400 0x64>, /* phy_tx */
			<0x4A096800 0x40>; /* pll_ctrl */
			reg-names = "phy_rx", "phy_tx", "pll_ctrl";
			ctrl-module = <&omap_control_sata>;
			clocks = <&sys_clkin1>, <&sata_ref_clk>;
			clock-names = "sysclk", "refclk";
			syscon-pllreset = <&scm_conf 0x3fc>;
			#phy-cells = <0>;
			};

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -119,8 +119,10 @@ ALPS Absolute Mode - Protocol Version 2
	byte 5: 0 z6 z5 z4 z3 z2 z1 z0		byte 5: 0 z6 z5 z4 z3 z2 z1 z0

	Protocol Version 2 DualPoint devices send standard PS/2 mouse packets for		Protocol Version 2 DualPoint devices send standard PS/2 mouse packets for
	the DualPoint Stick. For non interleaved dualpoint devices the pointingstick		the DualPoint Stick. The M, R and L bits signal the combined status of both
	buttons get reported separately in the PSM, PSR and PSL bits.		the pointingstick and touchpad buttons, except for Dell dualpoint devices
			where the pointingstick buttons get reported separately in the PSM, PSR
			and PSL bits.

	Dualpoint device -- interleaved packet format		Dualpoint device -- interleaved packet format
	---------------------------------------------		---------------------------------------------

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5600,6 +5600,7 @@ F: kernel/irq/
	IRQCHIP DRIVERS		IRQCHIP DRIVERS
	M: Thomas Gleixner <tglx@linutronix.de>		M: Thomas Gleixner <tglx@linutronix.de>
	M: Jason Cooper <jason@lakedaemon.net>		M: Jason Cooper <jason@lakedaemon.net>
			M: Marc Zyngier <marc.zyngier@arm.com>
	L: linux-kernel@vger.kernel.org		L: linux-kernel@vger.kernel.org
	S: Maintained		S: Maintained
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
	@@ -5608,11 +5609,14 @@ F: Documentation/devicetree/bindings/interrupt-controller/
	F: drivers/irqchip/		F: drivers/irqchip/

	IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)		IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
	M: Benjamin Herrenschmidt <benh@kernel.crashing.org>		M: Jiang Liu <jiang.liu@linux.intel.com>
			M: Marc Zyngier <marc.zyngier@arm.com>
	S: Maintained		S: Maintained
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
	F: Documentation/IRQ-domain.txt		F: Documentation/IRQ-domain.txt
	F: include/linux/irqdomain.h		F: include/linux/irqdomain.h
	F: kernel/irq/irqdomain.c		F: kernel/irq/irqdomain.c
			F: kernel/irq/msi.c

	ISAPNP		ISAPNP
	M: Jaroslav Kysela <perex@perex.cz>		M: Jaroslav Kysela <perex@perex.cz>

+8 −3

Original line number	Original line	Diff line number	Diff line
	VERSION = 4		VERSION = 4
	PATCHLEVEL = 2		PATCHLEVEL = 2
	SUBLEVEL = 0		SUBLEVEL = 0
	EXTRAVERSION = -rc4		EXTRAVERSION = -rc6
	NAME = Hurr durr I'ma sheep		NAME = Hurr durr I'ma sheep

	# DOCUMENTATION		# DOCUMENTATION
	@@ -597,6 +597,11 @@ endif # $(dot-config)
	# Defaults to vmlinux, but the arch makefile usually adds further targets		# Defaults to vmlinux, but the arch makefile usually adds further targets
	all: vmlinux		all: vmlinux

			# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default
			# values of the respective KBUILD_* variables
			ARCH_CPPFLAGS :=
			ARCH_AFLAGS :=
			ARCH_CFLAGS :=
	include arch/$(SRCARCH)/Makefile		include arch/$(SRCARCH)/Makefile

	KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)		KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,)
	@@ -848,10 +853,10 @@ export mod_strip_cmd
	mod_compress_cmd = true		mod_compress_cmd = true
	ifdef CONFIG_MODULE_COMPRESS		ifdef CONFIG_MODULE_COMPRESS
	ifdef CONFIG_MODULE_COMPRESS_GZIP		ifdef CONFIG_MODULE_COMPRESS_GZIP
	mod_compress_cmd = gzip -n		mod_compress_cmd = gzip -n -f
	endif # CONFIG_MODULE_COMPRESS_GZIP		endif # CONFIG_MODULE_COMPRESS_GZIP
	ifdef CONFIG_MODULE_COMPRESS_XZ		ifdef CONFIG_MODULE_COMPRESS_XZ
	mod_compress_cmd = xz		mod_compress_cmd = xz -f
	endif # CONFIG_MODULE_COMPRESS_XZ		endif # CONFIG_MODULE_COMPRESS_XZ
	endif # CONFIG_MODULE_COMPRESS		endif # CONFIG_MODULE_COMPRESS
	export mod_compress_cmd		export mod_compress_cmd