diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2017-02-10 12:51:23 +0100 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2017-02-10 12:51:23 +0100 |
commit | 465b2c4ab8724196bc33d82679a19b28e7a1d37e (patch) | |
tree | 12f159f433d0ec17e45cb519ff123e9006dbf263 /Documentation | |
parent | i2c: riic: correctly finish transfers (diff) | |
parent | i2c: mux: pca954x: Add interrupt controller support (diff) | |
download | linux-465b2c4ab8724196bc33d82679a19b28e7a1d37e.tar.xz linux-465b2c4ab8724196bc33d82679a19b28e7a1d37e.zip |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.11
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt index cf53d5fba20a..aa097045a10e 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt @@ -19,7 +19,14 @@ Optional Properties: - i2c-mux-idle-disconnect: Boolean; if defined, forces mux to disconnect all children in idle state. This is necessary for example, if there are several multiplexers on the bus and the devices behind them use same I2C addresses. - + - interrupt-parent: Phandle for the interrupt controller that services + interrupts for this device. + - interrupts: Interrupt mapping for IRQ. + - interrupt-controller: Marks the device node as an interrupt controller. + - #interrupt-cells : Should be two. + - first cell is the pin number + - second cell is used to specify flags. + See also Documentation/devicetree/bindings/interrupt-controller/interrupts.txt Example: @@ -29,6 +36,11 @@ Example: #size-cells = <0>; reg = <0x74>; + interrupt-parent = <&ipic>; + interrupts = <17 IRQ_TYPE_LEVEL_LOW>; + interrupt-controller; + #interrupt-cells = <2>; + i2c@2 { #address-cells = <1>; #size-cells = <0>; |