aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree
diff options
context:
space:
mode:
authorVipul Kumar Samar <vipulkumar.samar@st.com>2012-12-07 20:29:37 +0530
committerSamuel Ortiz <sameo@linux.intel.com>2012-12-10 10:03:50 +0100
commitac713cc9fcb8a5f9503af08421772b85ca4685f1 (patch)
treeb2a712700477bb7056c0b0cd26896441890823f5 /Documentation/devicetree
parentmfd: wm5102: Add readback of DSP status 3 register (diff)
downloadlinux-dev-ac713cc9fcb8a5f9503af08421772b85ca4685f1.tar.xz
linux-dev-ac713cc9fcb8a5f9503af08421772b85ca4685f1.zip
mfd: stmpe: Update DT support for stmpe driver
This patch extends existing DT support for stmpe devices. This updates: - missing header files in stmpe.c - stmpe_of_probe() with pwm, rotator and new bindings. - Bindings are updated in binding document. Acked-by: Lee Jones <lee.jones@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Vipul Kumar Samar <vipulkumar.samar@st.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r--Documentation/devicetree/bindings/mfd/stmpe.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/mfd/stmpe.txt b/Documentation/devicetree/bindings/mfd/stmpe.txt
index c98450887d5e..56edb5520685 100644
--- a/Documentation/devicetree/bindings/mfd/stmpe.txt
+++ b/Documentation/devicetree/bindings/mfd/stmpe.txt
@@ -1,8 +1,11 @@
-* STMPE Multi-Functional Device
+* ST Microelectronics STMPE Multi-Functional Device
+
+STMPE is an MFD device which may expose the following inbuilt devices: gpio,
+keypad, touchscreen, adc, pwm, rotator.
Required properties:
- - compatible : "st,stmpe[811|1601|2401|2403]"
- - reg : I2C address of the device
+ - compatible : "st,stmpe[610|801|811|1601|2401|2403]"
+ - reg : I2C/SPI address of the device
Optional properties:
- interrupts : The interrupt outputs from the controller