From patchwork Mon Oct 1 10:43:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11887 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A241723E57 for ; Mon, 1 Oct 2012 10:44:14 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3983CA18AE8 for ; Mon, 1 Oct 2012 10:44:14 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so11252231iej.11 for ; Mon, 01 Oct 2012 03:44:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=8LMej9vQGP4OZwtEnVaInjHBKW2ee171iktTdZD0nxg=; b=RaVZT6vl71SGDHWHEevc7oePYPRmPoWDACHzofWb948MHBc6kAb0ObrbEMKqm6tI2q ZE2et3renXHmCtfkhLSsD+JZU0G+0ZHluCmr9BsrOp22sLGPNO2Tu1ENvr3bGvju6Vrn WB18O8yOHYNmSObgidEBJpgIOYA1pkm7LvNqINlhhFnJzOjTr1q0Cw5VhNiOYnrQRFfY /C7VKzNlx+tPLFaiNZOYwR+Ouh7MlOE6dsl5OKBl1+MuTYK7i41RuJoDcyCGQJViKtFt sS9JdtlNkm/zO8acdUONq/lIq2uIP8i1z3LSZKvWJNt1XKQKlYy0L06vcuErE3sPNhXl YMKw== Received: by 10.50.154.137 with SMTP id vo9mr4613393igb.28.1349088253966; Mon, 01 Oct 2012 03:44:13 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp17903igc; Mon, 1 Oct 2012 03:44:13 -0700 (PDT) Received: by 10.180.79.34 with SMTP id g2mr8455779wix.19.1349088252425; Mon, 01 Oct 2012 03:44:12 -0700 (PDT) Received: from mail-wg0-f42.google.com (mail-wg0-f42.google.com [74.125.82.42]) by mx.google.com with ESMTPS id cx7si16496649wib.15.2012.10.01.03.44.12 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 03:44:12 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.42 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.42; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.42 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f42.google.com with SMTP id fm10so1509356wgb.1 for ; Mon, 01 Oct 2012 03:44:12 -0700 (PDT) Received: by 10.216.194.222 with SMTP id m72mr8184732wen.34.1349088251843; Mon, 01 Oct 2012 03:44:11 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id v3sm15856944wiw.7.2012.10.01.03.44.10 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 03:44:11 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 6/7] ARM: ux500: Add support for gpio-keys and Proximity Sensor for HREF Date: Mon, 1 Oct 2012 11:43:47 +0100 Message-Id: <1349088228-8582-7-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349088228-8582-1-git-send-email-lee.jones@linaro.org> References: <1349088228-8582-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmCX3J6GFzXUsYbC08VtPAEyp+7n200GaciHnCWaUHfA3nA6TBSUOTlMheosbNZsM2DAYaO Here we ensure the SFH7741 Proximity Sensor is registered through gpio-keys when booting with Device Tree enabled. Acked-by: Linus Walleij Signed-off-by: Lee Jones --- 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@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 2dd28b9..0756f97 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 2a85893..4b867b2 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>; + }; + }; };