ARM: ux500: Add support for gpio-keys and Proximity Sensor for HREF

Here we ensure the SFH7741 Proximity Sensor is registered through
gpio-keys when booting with Device Tree enabled.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/arch/arm/boot/dts/href.dtsi b/arch/arm/boot/dts/href.dtsi
index 27baa440bd00902d14f85e8d9232e79d878efeb5..592fb9dc35bdcd355293e923b5a07bb79d11b1b9 100644 (file)
--- a/arch/arm/boot/dts/href.dtsi
+++ b/arch/arm/boot/dts/href.dtsi
@@ -16,6 +16,17 @@
                reg = <0x00000000 0x20000000>;
        };
 
+       gpio_keys {
+               compatible = "gpio-keys";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               button@1 {
+                       linux,code = <11>;
+                       label = "SFH7741 Proximity Sensor";
+               };
+       };
+
        soc-u9500 {
                uart@80120000 {
                        status = "okay";

diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/hrefprev60.dts
index 2dd28b99680497cca838f01eddd5d1863dae2a54..0756f97f1ee832920fc364f5bab08ed19b2cfc6f 100644 (file)
--- a/arch/arm/boot/dts/hrefprev60.dts
+++ b/arch/arm/boot/dts/hrefprev60.dts
@@ -17,6 +17,12 @@
        model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
        compatible = "st-ericsson,mop500";
 
+       gpio_keys {
+               button@1 {
+                       gpios = <&tc3589x_gpio 7 0x4>;
+               };
+       };
+
        soc-u9500 {
                i2c@80004000 {
                        tps61052@33 {

diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts
index 2a85893e51562ff145f04c3da822ab9e2f5ed41e..4b867b25fd404edece9e72f79b5a00422d294f2e 100644 (file)
--- a/arch/arm/boot/dts/hrefv60plus.dts
+++ b/arch/arm/boot/dts/hrefv60plus.dts
@@ -16,4 +16,10 @@
 / {
        model = "ST-Ericsson HREF (v60+) platform with Device Tree";
        compatible = "st-ericsson,hrefv60+";
+
+       gpio_keys {
+               button@1 {
+                       gpios = <&gpio6 25 0x4>;
+               };
+       };
 };