Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (1602f49b) · Commits · e / devices / android_kernel_teracube_mt6765

Documentation/ABI/testing/sysfs-platform-i2c-demux-pinctrl

+12 −17

Original line number	Original line	Diff line number	Diff line
	What: /sys/devices/platform/<i2c-demux-name>/cur_master		What: /sys/devices/platform/<i2c-demux-name>/available_masters
	Date: January 2016		Date: January 2016
	KernelVersion: 4.6		KernelVersion: 4.6
	Contact: Wolfram Sang <wsa@the-dreams.de>		Contact: Wolfram Sang <wsa@the-dreams.de>
	Description:		Description:
			Reading the file will give you a list of masters which can be
			selected for a demultiplexed bus. The format is
			"<index>:<name>". Example from a Renesas Lager board:

	This file selects the active I2C master for a demultiplexed bus.		0:/i2c@e6500000 1:/i2c@e6508000

	Write 0 there for the first master, 1 for the second etc. Reading the file will		What: /sys/devices/platform/<i2c-demux-name>/current_master
	give you a list with the active master marked. Example from a Renesas Lager		Date: January 2016
	board:		KernelVersion: 4.6
			Contact: Wolfram Sang <wsa@the-dreams.de>
	root@Lager:~# cat /sys/devices/platform/i2c@8/cur_master		Description:
	* 0 - /i2c@9		This file selects/shows the active I2C master for a demultiplexed
	1 - /i2c@e6520000		bus. It uses the <index> value from the file 'available_masters'.
	2 - /i2c@e6530000

	root@Lager:~# echo 2 > /sys/devices/platform/i2c@8/cur_master

	root@Lager:~# cat /sys/devices/platform/i2c@8/cur_master
	0 - /i2c@9
	1 - /i2c@e6520000
	* 2 - /i2c@e6530000

Documentation/devicetree/bindings/net/mediatek-net.txt

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,8 @@ have dual GMAC each represented by a child node..
	Required properties:		Required properties:
	- compatible: Should be "mediatek,mt7623-eth"		- compatible: Should be "mediatek,mt7623-eth"
	- reg: Address and length of the register set for the device		- reg: Address and length of the register set for the device
	- interrupts: Should contain the frame engines interrupt		- interrupts: Should contain the three frame engines interrupts in numeric
			order. These are fe_int0, fe_int1 and fe_int2.
	- clocks: the clock used by the core		- clocks: the clock used by the core
	- clock-names: the names of the clock listed in the clocks property. These are		- clock-names: the names of the clock listed in the clocks property. These are
	"ethif", "esw", "gp2", "gp1"		"ethif", "esw", "gp2", "gp1"
	@@ -42,7 +43,9 @@ eth: ethernet@1b100000 {
	<&ethsys CLK_ETHSYS_GP2>,		<&ethsys CLK_ETHSYS_GP2>,
	<&ethsys CLK_ETHSYS_GP1>;		<&ethsys CLK_ETHSYS_GP1>;
	clock-names = "ethif", "esw", "gp2", "gp1";		clock-names = "ethif", "esw", "gp2", "gp1";
	interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_LOW>;		interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_LOW
			GIC_SPI 199 IRQ_TYPE_LEVEL_LOW
			GIC_SPI 198 IRQ_TYPE_LEVEL_LOW>;
	power-domains = <&scpsys MT2701_POWER_DOMAIN_ETH>;		power-domains = <&scpsys MT2701_POWER_DOMAIN_ETH>;
	resets = <&ethsys MT2701_ETHSYS_ETH_RST>;		resets = <&ethsys MT2701_ETHSYS_ETH_RST>;
	reset-names = "eth";		reset-names = "eth";

Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt

+7 −31

Original line number	Original line	Diff line number	Diff line
	== Amlogic Meson pinmux controller ==		== Amlogic Meson pinmux controller ==

	Required properties for the root node:		Required properties for the root node:
	- compatible: "amlogic,meson8-pinctrl" or "amlogic,meson8b-pinctrl"		- compatible: one of "amlogic,meson8-cbus-pinctrl"
			"amlogic,meson8b-cbus-pinctrl"
			"amlogic,meson8-aobus-pinctrl"
			"amlogic,meson8b-aobus-pinctrl"
	- reg: address and size of registers controlling irq functionality		- reg: address and size of registers controlling irq functionality

	=== GPIO sub-nodes ===		=== GPIO sub-nodes ===

	The 2 power domains of the controller (regular and always-on) are		The GPIO bank for the controller is represented as a sub-node and it acts as a
	represented as sub-nodes and each of them acts as a GPIO controller.		GPIO controller.

	Required properties for sub-nodes are:		Required properties for sub-nodes are:
	- reg: should contain address and size for mux, pull-enable, pull and		- reg: should contain address and size for mux, pull-enable, pull and
	@@ -18,10 +21,6 @@ Required properties for sub-nodes are:
	- gpio-controller: identifies the node as a gpio controller		- gpio-controller: identifies the node as a gpio controller
	- #gpio-cells: must be 2		- #gpio-cells: must be 2

	Valid sub-node names are:
	- "banks" for the regular domain
	- "ao-bank" for the always-on domain

	=== Other sub-nodes ===		=== Other sub-nodes ===

	Child nodes without the "gpio-controller" represent some desired		Child nodes without the "gpio-controller" represent some desired
	@@ -45,7 +44,7 @@ pinctrl-bindings.txt
	=== Example ===		=== Example ===

	pinctrl: pinctrl@c1109880 {		pinctrl: pinctrl@c1109880 {
	compatible = "amlogic,meson8-pinctrl";		compatible = "amlogic,meson8-cbus-pinctrl";
	reg = <0xc1109880 0x10>;		reg = <0xc1109880 0x10>;
	#address-cells = <1>;		#address-cells = <1>;
	#size-cells = <1>;		#size-cells = <1>;
	@@ -61,15 +60,6 @@ pinctrl-bindings.txt
	#gpio-cells = <2>;		#gpio-cells = <2>;
	};		};

	gpio_ao: ao-bank@c1108030 {
	reg = <0xc8100014 0x4>,
	<0xc810002c 0x4>,
	<0xc8100024 0x8>;
	reg-names = "mux", "pull", "gpio";
	gpio-controller;
	#gpio-cells = <2>;
	};

	nand {		nand {
	mux {		mux {
	groups = "nand_io", "nand_io_ce0", "nand_io_ce1",		groups = "nand_io", "nand_io_ce0", "nand_io_ce1",
	@@ -79,18 +69,4 @@ pinctrl-bindings.txt
	function = "nand";		function = "nand";
	};		};
	};		};

	uart_ao_a {
	mux {
	groups = "uart_tx_ao_a", "uart_rx_ao_a",
	"uart_cts_ao_a", "uart_rts_ao_a";
	function = "uart_ao";
	};

	conf {
	pins = "GPIOAO_0", "GPIOAO_1",
	"GPIOAO_2", "GPIOAO_3";
	bias-disable;
	};
	};
	};		};

Documentation/devicetree/bindings/rtc/s3c-rtc.txt

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -15,9 +15,10 @@ Required properties:
	is the rtc tick interrupt. The number of cells representing a interrupt		is the rtc tick interrupt. The number of cells representing a interrupt
	depends on the parent interrupt controller.		depends on the parent interrupt controller.
	- clocks: Must contain a list of phandle and clock specifier for the rtc		- clocks: Must contain a list of phandle and clock specifier for the rtc
	and source clocks.		clock and in the case of a s3c6410 compatible controller, also
	- clock-names: Must contain "rtc" and "rtc_src" entries sorted in the		a source clock.
	same order as the clocks property.		- clock-names: Must contain "rtc" and for a s3c6410 compatible controller,
			a "rtc_src" sorted in the same order as the clocks property.

	Example:		Example:

Documentation/kernel-parameters.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4077,6 +4077,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
	sector if the number is odd);		sector if the number is odd);
	i = IGNORE_DEVICE (don't bind to this		i = IGNORE_DEVICE (don't bind to this
	device);		device);
			j = NO_REPORT_LUNS (don't use report luns
			command, uas only);
	l = NOT_LOCKABLE (don't try to lock and		l = NOT_LOCKABLE (don't try to lock and
	unlock ejectable media);		unlock ejectable media);
	m = MAX_SECTORS_64 (don't transfer more		m = MAX_SECTORS_64 (don't transfer more