diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-09-26 17:09:17 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-11-01 12:59:32 +0100 |
| commit | 6b8db1326a67440e23f668f0e2b258e5e4127b82 (patch) | |
| tree | cb01e94cb74624981849d8fae845b196a58a6a2d | |
| parent | dd06fafffbd8c8267e5cf945ddc318045e7682db (diff) | |
| download | linux-3.10-6b8db1326a67440e23f668f0e2b258e5e4127b82.tar.gz linux-3.10-6b8db1326a67440e23f668f0e2b258e5e4127b82.tar.bz2 linux-3.10-6b8db1326a67440e23f668f0e2b258e5e4127b82.zip | |
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>
| -rw-r--r-- | arch/arm/boot/dts/href.dtsi | 11 | ||||
| -rw-r--r-- | arch/arm/boot/dts/hrefprev60.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/hrefv60plus.dts | 6 |
3 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/href.dtsi b/arch/arm/boot/dts/href.dtsi index 27baa440bd0..592fb9dc35b 100644 --- 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 2dd28b99680..0756f97f1ee 100644 --- 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 2a85893e515..4b867b25fd4 100644 --- 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>; + }; + }; }; |