Merge branches 'acpica', 'acpi-tpm' and 'acpi-processor' (7d18aecd) · Commits · 戴 / test

Documentation/devicetree/bindings/net/arc_emac.txt

+10 −2

Original line number	Diff line number	Diff line
		@@ -4,11 +4,15 @@ Required properties:
		- compatible: Should be "snps,arc-emac"
		- reg: Address and length of the register set for the device
		- interrupts: Should contain the EMAC interrupts
		- clock-frequency: CPU frequency. It is needed to calculate and set polling
		period of EMAC.
		- max-speed: see ethernet.txt file in the same directory.
		- phy: see ethernet.txt file in the same directory.

		Clock handling:
		The clock frequency is needed to calculate and set polling period of EMAC.
		It must be provided by one of:
		- clock-frequency: CPU frequency.
		- clocks: reference to the clock supplying the EMAC.

		Child nodes of the driver are the individual PHY devices connected to the
		MDIO bus. They must have a "reg" property given the PHY address on the MDIO bus.

		@@ -19,7 +23,11 @@ Examples:
		reg = <0xc0fc2000 0x3c>;
		interrupts = <6>;
		mac-address = [ 00 11 22 33 44 55 ];

		clock-frequency = <80000000>;
		/* or */
		clocks = <&emac_clock>;

		max-speed = <100>;
		phy = <&phy0>;

+4 −1

Original line number	Diff line number	Diff line
		@@ -504,9 +504,12 @@ byte 5:
		* reg_10

		bit 7 6 5 4 3 2 1 0
		0 0 0 0 0 0 0 A
		0 0 0 0 R F T A

		A: 1 = enable absolute tracking
		T: 1 = enable two finger mode auto correct
		F: 1 = disable ABS Position Filter
		R: 1 = enable real hardware resolution

		6.2 Native absolute mode 6 byte packet format
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

+1 −1

Original line number	Diff line number	Diff line
		@@ -429,7 +429,7 @@ RPS and RFS were introduced in kernel 2.6.35. XPS was incorporated into
		(therbert@google.com)

		Accelerated RFS was introduced in 2.6.35. Original patches were
		submitted by Ben Hutchings (bhutchings@solarflare.com)
		submitted by Ben Hutchings (bwh@kernel.org)

		Authors:
		Tom Herbert (therbert@google.com)

+3 −5

Original line number	Diff line number	Diff line
		@@ -7288,7 +7288,6 @@ F: drivers/video/aty/aty128fb.c
		RALINK RT2X00 WIRELESS LAN DRIVER
		P: rt2x00 project
		M: Ivo van Doorn <IvDoorn@gmail.com>
		M: Gertjan van Wingerde <gwingerde@gmail.com>
		M: Helmut Schaa <helmut.schaa@googlemail.com>
		L: linux-wireless@vger.kernel.org
		L: users@rt2x00.serialmonkey.com (moderated for non-subscribers)
		@@ -7304,7 +7303,7 @@ F: Documentation/blockdev/ramdisk.txt
		F: drivers/block/brd.c

		RANDOM NUMBER DRIVER
		M: Theodore Ts'o" <tytso@mit.edu>
		M: "Theodore Ts'o" <tytso@mit.edu>
		S: Maintained
		F: drivers/char/random.c

		@@ -7685,7 +7684,6 @@ F: drivers/clk/samsung/
		SAMSUNG SXGBE DRIVERS
		M: Byungho An <bh74.an@samsung.com>
		M: Girish K S <ks.giri@samsung.com>
		M: Siva Reddy Kallam <siva.kallam@samsung.com>
		M: Vipul Pandya <vipul.pandya@samsung.com>
		S: Supported
		L: netdev@vger.kernel.org
		@@ -9962,7 +9960,7 @@ F: drivers/net/hamradio/*scc.c
		F: drivers/net/hamradio/z8530.h

		ZBUD COMPRESSED PAGE ALLOCATOR
		M: Seth Jennings <sjenning@linux.vnet.ibm.com>
		M: Seth Jennings <sjennings@variantweb.net>
		L: linux-mm@kvack.org
		S: Maintained
		F: mm/zbud.c
		@@ -10007,7 +10005,7 @@ F: mm/zsmalloc.c
		F: include/linux/zsmalloc.h

		ZSWAP COMPRESSED SWAP CACHING
		M: Seth Jennings <sjenning@linux.vnet.ibm.com>
		M: Seth Jennings <sjennings@variantweb.net>
		L: linux-mm@kvack.org
		S: Maintained
		F: mm/zswap.c

+1 −1