summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLee Jones2012-10-04 13:41:35 +0200
committerLee Jones2012-11-01 13:02:17 +0100
commitcb5527035d384d7fdead83adf00833d734c282ce (patch)
tree8894ba42d4b2c44833b4ac14227e54af15710e05
parentARM: ux500: Stop informing the regulator subsystem that we have full constraints (diff)
downloadkernel-qcow2-linux-cb5527035d384d7fdead83adf00833d734c282ce.tar.gz
kernel-qcow2-linux-cb5527035d384d7fdead83adf00833d734c282ce.tar.xz
kernel-qcow2-linux-cb5527035d384d7fdead83adf00833d734c282ce.zip
ARM: ux500: Apply a Device Tree node for the STMPE MFD
Here we apply the STMPE Multi-Functional Device's node to the ST User Interface Board Device Tree file. It includes all of the properties required for correct device initialsation. Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--arch/arm/boot/dts/stuib.dtsi13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/stuib.dtsi b/arch/arm/boot/dts/stuib.dtsi
index 62f3ecd336f8..d6e36b5757a3 100644
--- a/arch/arm/boot/dts/stuib.dtsi
+++ b/arch/arm/boot/dts/stuib.dtsi
@@ -11,6 +11,19 @@
/ {
soc-u9500 {
+ i2c@80004000 {
+ stmpe1601: stmpe1601@40 {
+ compatible = "st,stmpe1601";
+ reg = <0x40>;
+ interrupts = <26 0x4>;
+ interrupt-parent = <&gpio6>;
+ interrupt-controller;
+
+ wakeup-source;
+ st,autosleep-timeout = <1024>;
+ };
+ };
+
i2c@80110000 {
bu21013_tp@0x5c {
compatible = "rhom,bu21013_tp";