diff options
| author | Linus Walleij | 2016-08-11 14:06:57 +0200 |
|---|---|---|
| committer | Linus Walleij | 2016-08-11 14:06:57 +0200 |
| commit | de4b894182094e9d717df98c75344dd50ebbe2ea (patch) | |
| tree | e00e35d58dbda6ca411a9d02dd12d2589c924274 /Documentation | |
| parent | gpio: Add GPIO support for the Diamond Systems GPIO-MM (diff) | |
| parent | gpio: stmpe: Add STMPE1600 support (diff) | |
| download | kernel-qcow2-linux-de4b894182094e9d717df98c75344dd50ebbe2ea.tar.gz kernel-qcow2-linux-de4b894182094e9d717df98c75344dd50ebbe2ea.tar.xz kernel-qcow2-linux-de4b894182094e9d717df98c75344dd50ebbe2ea.zip | |
Merge tag 'ib-mfd-gpio-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into devel
Immutable branch between MFD and GPIO due for the v4.9 merge window
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/stmpe.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mfd/stmpe.txt b/Documentation/devicetree/bindings/mfd/stmpe.txt index 3fb68bfefc8b..f9065a5781a2 100644 --- a/Documentation/devicetree/bindings/mfd/stmpe.txt +++ b/Documentation/devicetree/bindings/mfd/stmpe.txt @@ -4,7 +4,7 @@ STMPE is an MFD device which may expose the following inbuilt devices: gpio, keypad, touchscreen, adc, pwm, rotator. Required properties: - - compatible : "st,stmpe[610|801|811|1601|2401|2403]" + - compatible : "st,stmpe[610|801|811|1600|1601|2401|2403]" - reg : I2C/SPI address of the device Optional properties: |