diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-11 20:24:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-11 20:24:54 +0200 |
| commit | 5d1f7023fb2233d454ac3ac2fb7cc96fb94e9cac (patch) | |
| tree | c0088a7a1126b23435cb00d8cb00d89e0119b3c8 /Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt | |
| parent | Merge tag 'devicetree-fixes-for-4.7' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | i2c: mux: reg: Provide of_match_table (diff) | |
| download | linux-5d1f7023fb2233d454ac3ac2fb7cc96fb94e9cac.tar.xz linux-5d1f7023fb2233d454ac3ac2fb7cc96fb94e9cac.zip | |
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
Diffstat (limited to 'Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt index 688783fbe696..de00d7fc450b 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-mux-reg.txt @@ -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 |