ARM: ux500: Add support for gpio-keys and Proximity Sensor for HREF
authorLee Jones <lee.jones@linaro.org>
Wed, 26 Sep 2012 16:09:17 +0000 (17:09 +0100)
committerLee Jones <lee.jones@linaro.org>
Thu, 1 Nov 2012 11:59:32 +0000 (12:59 +0100)
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>
arch/arm/boot/dts/href.dtsi
arch/arm/boot/dts/hrefprev60.dts
arch/arm/boot/dts/hrefv60plus.dts

index 27baa44..592fb9d 100644 (file)
                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";
index 2dd28b9..0756f97 100644 (file)
        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 {
index 2a85893..4b867b2 100644 (file)
 / {
        model = "ST-Ericsson HREF (v60+) platform with Device Tree";
        compatible = "st-ericsson,hrefv60+";
+
+       gpio_keys {
+               button@1 {
+                       gpios = <&gpio6 25 0x4>;
+               };
+       };
 };