Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d1f7023 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c fixes from Wolfram Sang:

 - a bigger fix for i801 to finally be able to be loaded on some
   machines again

 - smaller driver fixes

 - documentation update because of a renamed file

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: mux: reg: Provide of_match_table
  i2c: mux: refer to i2c-mux.txt
  i2c: octeon: Avoid printk after too long SMBUS message
  i2c: octeon: Missing AAK flag in case of I2C_M_RECV_LEN
  i2c: i801: Allow ACPI SystemIO OpRegion to conflict with PCI BAR
parents 90735c99 9f05e621

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:

Documentation/devicetree/bindings/i2c/i2c-mux-gpio.txt

+3 −3
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ Required properties: 
- i2c-parent: The phandle of the I2C bus that this multiplexer's master-side

  port is connected to.

- mux-gpios: list of gpios used to control the muxer

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

* I2C child bus nodes. See mux.txt in this directory.

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

* I2C child bus nodes. See i2c-mux.txt in this directory.



Optional properties:

- idle-state: value to set the muxer to when idle. When no value is
@@ -33,7 +33,7 @@ For each i2c child node, an I2C child bus will be created. They will 
be numbered based on their order in the device tree.



Whenever an access is made to a device on a child bus, the value set

in the revelant node's reg property will be output using the list of

in the relevant node's reg property will be output using the list of

GPIOs, the first in the list holding the least-significant value.



If an idle state is defined, using the idle-state (optional) property,

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

+2 −2
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ Also required are: 
* Standard pinctrl properties that specify the pin mux state for each child

  bus. See ../pinctrl/pinctrl-bindings.txt.



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

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



* I2C child bus nodes. See mux.txt in this directory.

* I2C child bus nodes. See i2c-mux.txt in this directory.



For each named state defined in the pinctrl-names property, an I2C child bus

will be created. I2C child bus numbers are assigned based on the index into

Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt

+3 −3
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ Required properties: 
- compatible: i2c-mux-reg

- i2c-parent: The phandle of the I2C bus that this multiplexer's master-side

  port is connected to.

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

* I2C child bus nodes. See mux.txt in this directory.

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

* I2C child bus nodes. See i2c-mux.txt in this directory.



Optional properties:

- reg: this pair of <offset size> specifies the register to control the mux.
@@ -24,7 +24,7 @@ Optional properties: 
  given, it defaults to the last value used.



Whenever an access is made to a device on a child bus, the value set

in the revelant node's reg property will be output to the register.

in the relevant node's reg property will be output to the register.



If an idle state is defined, using the idle-state (optional) property,

whenever an access is not being made to a device on a child bus, the