linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/7] ARM: ux500: Add support for gpio-keys and Proximity Sensor for HREF
Date: Thu, 27 Sep 2012 16:12:05 +0100	[thread overview]
Message-ID: <1348758726-25336-7-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1348758726-25336-1-git-send-email-lee.jones@linaro.org>

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       |   11 +++++++++++
 arch/arm/boot/dts/hrefprev60.dts  |    6 ++++++
 arch/arm/boot/dts/hrefv60plus.dts |    6 ++++++
 3 files changed, 23 insertions(+)

diff --git a/arch/arm/boot/dts/href.dtsi b/arch/arm/boot/dts/href.dtsi
index 27baa44..592fb9d 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 at 1 {
+			linux,code = <11>;
+			label = "SFH7741 Proximity Sensor";
+		};
+	};
+
 	soc-u9500 {
 		uart at 80120000 {
 			status = "okay";
diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/hrefprev60.dts
index 2dd28b9..128cf1c 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 at 1 {
+			gpios  = <&tc3589x_gpio 7 0x4>;
+		};
+	};
+
 	soc-u9500 {
 		i2c at 80004000 {
 			tps61052 at 33 {
diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts
index 2a85893..1252d8a 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 at 1 {
+			gpios  = <&gpio6 25 0x4>;
+		};
+	};
 };
-- 
1.7.9.5

  parent reply	other threads:[~2012-09-27 15:12 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-27 15:11 [PATCH 0/7] Next instalment of Device Tree work for ST-Ericsson Lee Jones
2012-09-27 15:12 ` [PATCH 1/7] ARM: ux500: Elaborate on SDI device node names in Device Tree Lee Jones
2012-09-27 15:12 ` [PATCH 2/7] ARM: ux500: Add SDI (MMC) support to the HREF " Lee Jones
2012-09-27 15:12 ` [PATCH 3/7] ARM: ux500: Correct Snowball's external SD/MMC slot's bus width Lee Jones
2012-09-27 15:12 ` [PATCH 4/7] ARM: ux500: Create a DTS hierarchy for ST-Ericsson's HREF boards Lee Jones
2012-09-27 15:12 ` [PATCH 5/7] ARM: ux500: Create a Device Tree for early HREFs Lee Jones
2012-09-27 15:12 ` Lee Jones [this message]
2012-09-27 15:12 ` [PATCH 7/7] ARM: ux500: Remove platform specific device registration when DT is enabled Lee Jones
  -- strict thread matches above, loose matches on Subject: below --
2012-10-01 10:43 [PATCH 0/7] Next instalment of Device Tree work for ST-Ericsson Lee Jones
2012-10-01 10:43 ` [PATCH 6/7] ARM: ux500: Add support for gpio-keys and Proximity Sensor for HREF Lee Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1348758726-25336-7-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).