Merge tag 'renesas-kconfig-cleanups-for-v3.18' of... (184df9dd) · Commits · EulixOS / Software / Kernel

Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -4,11 +4,13 @@ Specifying interrupt information for devices
	1) Interrupt client nodes		1) Interrupt client nodes
	-------------------------		-------------------------

	Nodes that describe devices which generate interrupts must contain an either an		Nodes that describe devices which generate interrupts must contain an
	"interrupts" property or an "interrupts-extended" property. These properties		"interrupts" property, an "interrupts-extended" property, or both. If both are
	contain a list of interrupt specifiers, one per output interrupt. The format of		present, the latter should take precedence; the former may be provided simply
	the interrupt specifier is determined by the interrupt controller to which the		for compatibility with software that does not recognize the latter. These
	interrupts are routed; see section 2 below for details.		properties contain a list of interrupt specifiers, one per output interrupt. The
			format of the interrupt specifier is determined by the interrupt controller to
			which the interrupts are routed; see section 2 below for details.

	Example:		Example:
	interrupt-parent = <&intc1>;		interrupt-parent = <&intc1>;

Documentation/devicetree/bindings/pci/designware-pcie.txt

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2,6 +2,10 @@

	Required properties:		Required properties:
	- compatible: should contain "snps,dw-pcie" to identify the core.		- compatible: should contain "snps,dw-pcie" to identify the core.
			- reg: Should contain the configuration address space.
			- reg-names: Must be "config" for the PCIe configuration space.
			(The old way of getting the configuration address space from "ranges"
			is deprecated and should be avoided.)
	- #address-cells: set to <3>		- #address-cells: set to <3>
	- #size-cells: set to <2>		- #size-cells: set to <2>
	- device_type: set to "pci"		- device_type: set to "pci"

Documentation/devicetree/bindings/pci/ti-pci.txt

0 → 100644

+59 −0

Original line number	Original line	Diff line number	Diff line
			TI PCI Controllers

			PCIe Designware Controller
			- compatible: Should be "ti,dra7-pcie""
			- reg : Two register ranges as listed in the reg-names property
			- reg-names : The first entry must be "ti-conf" for the TI specific registers
			The second entry must be "rc-dbics" for the designware pcie
			registers
			The third entry must be "config" for the PCIe configuration space
			- phys : list of PHY specifiers (used by generic PHY framework)
			- phy-names : must be "pcie-phy0", "pcie-phy1", "pcie-phyN".. based on the
			number of PHYs as specified in phys property.
			- ti,hwmods : Name of the hwmod associated to the pcie, "pcie<X>",
			where <X> is the instance number of the pcie from the HW spec.
			- interrupts : Two interrupt entries must be specified. The first one is for
			main interrupt line and the second for MSI interrupt line.
			- #address-cells,
			#size-cells,
			#interrupt-cells,
			device_type,
			ranges,
			num-lanes,
			interrupt-map-mask,
			interrupt-map : as specified in ../designware-pcie.txt

			Example:
			axi {
			compatible = "simple-bus";
			#size-cells = <1>;
			#address-cells = <1>;
			ranges = <0x51000000 0x51000000 0x3000
			0x0 0x20000000 0x10000000>;
			pcie@51000000 {
			compatible = "ti,dra7-pcie";
			reg = <0x51000000 0x2000>, <0x51002000 0x14c>, <0x1000 0x2000>;
			reg-names = "rc_dbics", "ti_conf", "config";
			interrupts = <0 232 0x4>, <0 233 0x4>;
			#address-cells = <3>;
			#size-cells = <2>;
			device_type = "pci";
			ranges = <0x81000000 0 0 0x03000 0 0x00010000
			0x82000000 0 0x20013000 0x13000 0 0xffed000>;
			#interrupt-cells = <1>;
			num-lanes = <1>;
			ti,hwmods = "pcie1";
			phys = <&pcie1_phy>;
			phy-names = "pcie-phy0";
			interrupt-map-mask = <0 0 0 7>;
			interrupt-map = <0 0 0 1 &pcie_intc 1>,
			<0 0 0 2 &pcie_intc 2>,
			<0 0 0 3 &pcie_intc 3>,
			<0 0 0 4 &pcie_intc 4>;
			pcie_intc: interrupt-controller {
			interrupt-controller;
			#address-cells = <0>;
			#interrupt-cells = <1>;
			};
			};
			};

Documentation/x86/tlb.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -35,7 +35,7 @@ invlpg instruction (or instructions _near_ it) show up high in
	profiles. If you believe that individual invalidations being		profiles. If you believe that individual invalidations being
	called too often, you can lower the tunable:		called too often, you can lower the tunable:

	/sys/debug/kernel/x86/tlb_single_page_flush_ceiling		/sys/kernel/debug/x86/tlb_single_page_flush_ceiling

	This will cause us to do the global flush for more cases.		This will cause us to do the global flush for more cases.
	Lowering it to 0 will disable the use of the individual flushes.		Lowering it to 0 will disable the use of the individual flushes.

MAINTAINERS

+43 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1277,6 +1277,7 @@ F: drivers/scsi/arm/
	ARM/Rockchip SoC support		ARM/Rockchip SoC support
	M: Heiko Stuebner <heiko@sntech.de>		M: Heiko Stuebner <heiko@sntech.de>
	L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
			L: linux-rockchip@lists.infradead.org
	S: Maintained		S: Maintained
	F: arch/arm/mach-rockchip/		F: arch/arm/mach-rockchip/
	F: drivers//rockchip*		F: drivers//rockchip*
	@@ -1843,6 +1844,12 @@ S: Orphan
	F: Documentation/filesystems/befs.txt		F: Documentation/filesystems/befs.txt
	F: fs/befs/		F: fs/befs/

			BECKHOFF CX5020 ETHERCAT MASTER DRIVER
			M: Dariusz Marcinkiewicz <reksio@newterm.pl>
			L: netdev@vger.kernel.org
			S: Maintained
			F: drivers/net/ethernet/ec_bhf.c

	BFS FILE SYSTEM		BFS FILE SYSTEM
	M: "Tigran A. Aivazian" <tigran@aivazian.fsnet.co.uk>		M: "Tigran A. Aivazian" <tigran@aivazian.fsnet.co.uk>
	S: Maintained		S: Maintained
	@@ -2059,7 +2066,7 @@ S: Supported
	F: drivers/scsi/bnx2i/		F: drivers/scsi/bnx2i/

	BROADCOM KONA GPIO DRIVER		BROADCOM KONA GPIO DRIVER
	M: Markus Mayer <markus.mayer@linaro.org>		M: Ray Jui <rjui@broadcom.com>
	L: bcm-kernel-feedback-list@broadcom.com		L: bcm-kernel-feedback-list@broadcom.com
	S: Supported		S: Supported
	F: drivers/gpio/gpio-bcm-kona.c		F: drivers/gpio/gpio-bcm-kona.c
	@@ -3115,6 +3122,17 @@ F: include/linux/host1x.h
	F: include/uapi/drm/tegra_drm.h		F: include/uapi/drm/tegra_drm.h
	F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt		F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt

			DRM DRIVERS FOR RENESAS
			M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
			L: dri-devel@lists.freedesktop.org
			L: linux-sh@vger.kernel.org
			T: git git://people.freedesktop.org/~airlied/linux
			S: Supported
			F: drivers/gpu/drm/rcar-du/
			F: drivers/gpu/drm/shmobile/
			F: include/linux/platform_data/rcar-du.h
			F: include/linux/platform_data/shmob_drm.h

	DSBR100 USB FM RADIO DRIVER		DSBR100 USB FM RADIO DRIVER
	M: Alexey Klimov <klimov.linux@gmail.com>		M: Alexey Klimov <klimov.linux@gmail.com>
	L: linux-media@vger.kernel.org		L: linux-media@vger.kernel.org
	@@ -3843,10 +3861,13 @@ F: drivers/tty/serial/ucc_uart.c

	FREESCALE SOC SOUND DRIVERS		FREESCALE SOC SOUND DRIVERS
	M: Timur Tabi <timur@tabi.org>		M: Timur Tabi <timur@tabi.org>
			M: Nicolin Chen <nicoleotsuka@gmail.com>
			M: Xiubo Li <Li.Xiubo@freescale.com>
	L: alsa-devel@alsa-project.org (moderated for non-subscribers)		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
	L: linuxppc-dev@lists.ozlabs.org		L: linuxppc-dev@lists.ozlabs.org
	S: Maintained		S: Maintained
	F: sound/soc/fsl/fsl*		F: sound/soc/fsl/fsl*
			F: sound/soc/fsl/imx*
	F: sound/soc/fsl/mpc8610_hpcd.c		F: sound/soc/fsl/mpc8610_hpcd.c

	FREEVXFS FILESYSTEM		FREEVXFS FILESYSTEM
	@@ -4446,6 +4467,13 @@ F: include/linux/i2c-*.h
	F: include/uapi/linux/i2c.h		F: include/uapi/linux/i2c.h
	F: include/uapi/linux/i2c-*.h		F: include/uapi/linux/i2c-*.h

			I2C ACPI SUPPORT
			M: Mika Westerberg <mika.westerberg@linux.intel.com>
			L: linux-i2c@vger.kernel.org
			L: linux-acpi@vger.kernel.org
			S: Maintained
			F: drivers/i2c/i2c-acpi.c

	I2C-TAOS-EVM DRIVER		I2C-TAOS-EVM DRIVER
	M: Jean Delvare <jdelvare@suse.de>		M: Jean Delvare <jdelvare@suse.de>
	L: linux-i2c@vger.kernel.org		L: linux-i2c@vger.kernel.org
	@@ -5972,6 +6000,12 @@ T: git git://linuxtv.org/media_tree.git
	S: Maintained		S: Maintained
	F: drivers/media/radio/radio-mr800.c		F: drivers/media/radio/radio-mr800.c

			MRF24J40 IEEE 802.15.4 RADIO DRIVER
			M: Alan Ott <alan@signal11.us>
			L: linux-wpan@vger.kernel.org
			S: Maintained
			F: drivers/net/ieee802154/mrf24j40.c

	MSI LAPTOP SUPPORT		MSI LAPTOP SUPPORT
	M: "Lee, Chun-Yi" <jlee@suse.com>		M: "Lee, Chun-Yi" <jlee@suse.com>
	L: platform-driver-x86@vger.kernel.org		L: platform-driver-x86@vger.kernel.org
	@@ -6858,6 +6892,14 @@ S: Supported
	F: Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt		F: Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
	F: drivers/pci/host/pci-tegra.c		F: drivers/pci/host/pci-tegra.c

			PCI DRIVER FOR TI DRA7XX
			M: Kishon Vijay Abraham I <kishon@ti.com>
			L: linux-omap@vger.kernel.org
			L: linux-pci@vger.kernel.org
			S: Supported
			F: Documentation/devicetree/bindings/pci/ti-pci.txt
			F: drivers/pci/host/pci-dra7xx.c

	PCI DRIVER FOR RENESAS R-CAR		PCI DRIVER FOR RENESAS R-CAR
	M: Simon Horman <horms@verge.net.au>		M: Simon Horman <horms@verge.net.au>
	L: linux-pci@vger.kernel.org		L: linux-pci@vger.kernel.org