diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2017-11-01 23:49:36 +0100 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2017-11-01 23:49:36 +0100 |
| commit | f6d2953643164525b22edcc09720c2cbf2e52d21 (patch) | |
| tree | d4bd80a15eab6c4017215096e19bce6fb163e94f /Documentation/devicetree/bindings/i2c | |
| parent | 4ee045f4e9b73c4635ceedbb1ee40e0b3ecbdbcc (diff) | |
| parent | 4cf419a2b4c2e5bb0583e32e5fe079995c987c0f (diff) | |
| download | linux-f6d2953643164525b22edcc09720c2cbf2e52d21.tar.gz linux-f6d2953643164525b22edcc09720c2cbf2e52d21.tar.bz2 linux-f6d2953643164525b22edcc09720c2cbf2e52d21.zip | |
Merge branch 'i2c/sbs-manager' into i2c/for-4.15
Diffstat (limited to 'Documentation/devicetree/bindings/i2c')
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/i2c/i2c.txt b/Documentation/devicetree/bindings/i2c/i2c.txt index cee9d5055fa2..11263982470e 100644 --- a/Documentation/devicetree/bindings/i2c/i2c.txt +++ b/Documentation/devicetree/bindings/i2c/i2c.txt @@ -59,8 +59,8 @@ wants to support one of the below features, it should adapt the bindings below. interrupts used by the device. - interrupt-names - "irq" and "wakeup" names are recognized by I2C core, other names are - left to individual drivers. + "irq", "wakeup" and "smbus_alert" names are recognized by I2C core, + other names are left to individual drivers. - host-notify device uses SMBus host notify protocol instead of interrupt line. |