diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2020-01-29 23:59:20 +0300 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2020-01-29 23:59:20 +0300 |
| commit | 4a890148df4740a6fce25f9bd4a70d1587a8e8e8 (patch) | |
| tree | 772b0d8b14b24085f1e59b256988bb419e583e95 /Documentation/devicetree | |
| parent | 6810df46c41879eba8437ab020c7abf5d1db827e (diff) | |
| parent | e65e228eb0963be32180db3039f0a1467b426aae (diff) | |
| download | linux-4a890148df4740a6fce25f9bd4a70d1587a8e8e8.tar.xz | |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-5.6
The main feature is the idle-state rework of the pca954x driver from Biwen Li.
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt index 30ac6a60f041..7abda506b828 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-mux-pca954x.txt @@ -25,6 +25,8 @@ Required Properties: Optional Properties: - reset-gpios: Reference to the GPIO connected to the reset input. + - idle-state: if present, overrides i2c-mux-idle-disconnect, + Please refer to Documentation/devicetree/bindings/mux/mux-controller.txt - 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. |