Skip to content

Commit

Permalink
ARM: ux500: Add support for gpio-keys and Proximity Sensor for HREF
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lee Jones committed Nov 1, 2012
1 parent dd06faf commit 6b8db13
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 0 deletions.
11 changes: 11 additions & 0 deletions arch/arm/boot/dts/href.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/hrefprev60.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/hrefv60plus.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
};
};

0 comments on commit 6b8db13

Please sign in to comment.