Commit 245050c2 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into locking/core, to pick up fixes before merging new changes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents d4c3be70 db06d759

Documentation/arm64/silicon-errata.txt

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ stable kernels. 
| ARM            | MMU-500         | #841119,#826419 | N/A                     |

|                |                 |                 |                         |

| Cavium         | ThunderX ITS    | #22375, #24313  | CAVIUM_ERRATUM_22375    |

| Cavium         | ThunderX ITS    | #23144          | CAVIUM_ERRATUM_23144    |

| Cavium         | ThunderX GICv3  | #23154          | CAVIUM_ERRATUM_23154    |

| Cavium         | ThunderX Core   | #27456          | CAVIUM_ERRATUM_27456    |

| Cavium         | ThunderX SMMUv2 | #27704          | N/A		       |

Documentation/devicetree/bindings/display/imx/ldb.txt

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ Required properties: 
   display-timings are used instead.



Optional properties (required if display-timings are used):

 - ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing

 - display-timings : A node that describes the display timings as defined in

   Documentation/devicetree/bindings/display/display-timing.txt.

 - fsl,data-mapping : should be "spwg" or "jeida"

Documentation/devicetree/bindings/hwmon/ina2xx.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties: 
	- "ti,ina220" for ina220

	- "ti,ina226" for ina226

	- "ti,ina230" for ina230

	- "ti,ina231" for ina231

- reg: I2C address



Optional properties:

Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.txt

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ Required properties: 
- our-claim-gpio: The GPIO that we use to claim the bus.

- their-claim-gpios: The GPIOs that the other sides use to claim the bus.

  Note that some implementations may only support a single other master.

- Standard I2C mux properties. See mux.txt in this directory.

- Single I2C child bus node at reg 0. See mux.txt in this directory.

- Standard I2C mux properties. See i2c-mux.txt in this directory.

- Single I2C child bus node at reg 0. See i2c-mux.txt in this directory.



Optional properties:

- slew-delay-us: microseconds to wait for a GPIO to go high. Default is 10 us.

Documentation/devicetree/bindings/i2c/i2c-demux-pinctrl.txt

+2 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ Required properties: 
- i2c-bus-name: The name of this bus. Also needed as pinctrl-name for the I2C

		parents.



Furthermore, I2C mux properties and child nodes. See mux.txt in this directory.

Furthermore, I2C mux properties and child nodes. See i2c-mux.txt in this

directory.



Example: