Merge branches 'ib-mfd-watchdog-rtc-4.2', 'ib-mfd-regulator-4.2' and... (79aa7934) · Commits · 戴 / test

Documentation/devicetree/bindings/mfd/axp20x.txt

+29 −3

Original line number	Diff line number	Diff line
		AXP202/AXP209 device tree bindings
		AXP family PMIC device tree bindings

		The axp20x family current members :
		axp202 (X-Powers)
		axp209 (X-Powers)
		axp221 (X-Powers)

		Required properties:
		- compatible: "x-powers,axp202" or "x-powers,axp209"
		- compatible: "x-powers,axp202", "x-powers,axp209", "x-powers,axp221"
		- reg: The I2C slave address for the AXP chip
		- interrupt-parent: The parent interrupt controller
		- interrupts: SoC NMI / GPIO interrupt connected to the PMIC's IRQ pin
		- interrupt-controller: axp20x has its own internal IRQs
		- interrupt-controller: The PMIC has its own internal IRQs
		- #interrupt-cells: Should be set to 1

		Optional properties:
		@@ -48,6 +49,31 @@ LDO3 : LDO : ldo3in-supply
		LDO4 : LDO : ldo24in-supply : shared supply
		LDO5 : LDO : ldo5in-supply

		AXP221 regulators, type, and corresponding input supply names:

		Regulator Type Supply Name Notes
		--------- ---- ----------- -----
		DCDC1 : DC-DC buck : vin1-supply
		DCDC2 : DC-DC buck : vin2-supply
		DCDC3 : DC-DC buck : vin3-supply
		DCDC4 : DC-DC buck : vin4-supply
		DCDC5 : DC-DC buck : vin5-supply
		DC1SW : On/Off Switch : dcdc1-supply : DCDC1 secondary output
		DC5LDO : LDO : dcdc5-supply : input from DCDC5
		ALDO1 : LDO : aldoin-supply : shared supply
		ALDO2 : LDO : aldoin-supply : shared supply
		ALDO3 : LDO : aldoin-supply : shared supply
		DLDO1 : LDO : dldoin-supply : shared supply
		DLDO2 : LDO : dldoin-supply : shared supply
		DLDO3 : LDO : dldoin-supply : shared supply
		DLDO4 : LDO : dldoin-supply : shared supply
		ELDO1 : LDO : eldoin-supply : shared supply
		ELDO2 : LDO : eldoin-supply : shared supply
		ELDO3 : LDO : eldoin-supply : shared supply
		LDO_IO0 : LDO : ips-supply : GPIO 0
		LDO_IO1 : LDO : ips-supply : GPIO 1
		RTC_LDO : LDO : ips-supply : always on

		Example:

		axp209: pmic@34 {

Documentation/devicetree/bindings/mfd/cros-ec.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,10 @@ Required properties (SPI):
		- reg: SPI chip select

		Optional properties (SPI):
		- google,cros-ec-spi-pre-delay: Some implementations of the EC need a little
		time to wake up from sleep before they can receive SPI transfers at a high
		clock rate. This property specifies the delay, in usecs, between the
		assertion of the CS to the start of the first clock pulse.
		- google,cros-ec-spi-msg-delay: Some implementations of the EC require some
		additional processing time in order to accept new transactions. If the delay
		between transactions is not long enough the EC may not be able to respond

Documentation/kernel-parameters.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -3787,6 +3787,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		READ_CAPACITY_16 command);
		f = NO_REPORT_OPCODES (don't use report opcodes
		command, uas only);
		g = MAX_SECTORS_240 (don't transfer more than
		240 sectors at a time, uas only);
		h = CAPACITY_HEURISTICS (decrease the
		reported device capacity by one
		sector if the number is odd);

Documentation/module-signing.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -119,9 +119,9 @@ Most notably, in the x509.genkey file, the req_distinguished_name section
		should be altered from the default:

		[ req_distinguished_name ]
		O = Magrathea
		CN = Glacier signing key
		emailAddress = slartibartfast@magrathea.h2g2
		#O = Unspecified company
		CN = Build time autogenerated kernel key
		#emailAddress = unspecified.user@unspecified.company

		The generated RSA key size can also be set with:

Documentation/networking/mpls-sysctl.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -18,3 +18,12 @@ platform_labels - INTEGER

		Possible values: 0 - 1048575
		Default: 0

		conf/<interface>/input - BOOL
		Control whether packets can be input on this interface.

		If disabled, packets will be discarded without further
		processing.

		0 - disabled (default)
		not 0 - enabled

Admin message