From patchwork Thu Sep 27 15:12:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1514911 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id EF12BDF266 for ; Thu, 27 Sep 2012 15:17:08 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1THFmy-0002Qy-ID; Thu, 27 Sep 2012 15:14:09 +0000 Received: from mail-we0-f177.google.com ([74.125.82.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1THFlM-0001kD-Eu for linux-arm-kernel@lists.infradead.org; Thu, 27 Sep 2012 15:12:32 +0000 Received: by weyu50 with SMTP id u50so716563wey.36 for ; Thu, 27 Sep 2012 08:12:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=L6g9uO1QmVbodCDMLEinUoWX2AAgSd2y5g6hjT+9MDQ=; b=ft91TfIWVqGXnFYx3KA/y8Nk4CKB5UEXJ09x+5125EPZfqpsLp0WkYYl7rHPcnzK8c /HnWIrcmK+uiZiUwST/vmBss5gITcc7lNjvQbeeXQOYSYBRPW5UWRMJzYTZYNaXnfBG4 kVXNcoh0gl+QM8/Opo75VQtqvVxGlWKZPYTqaQqlz99tVtAI5jIwn3kIMGev/u3ZVdr/ k3jfIokdrCeq3QGRd1COAoQIciRPpUxCHfK8AU7V7AuGtxIhZPZ9t8Rn1GoFpalz6ODs OV+9HbAFXV1L2mTA3/MXkiObyWBSY8MZUtahVEs78kXtzrrrgM4dRCu3eLJlLDMGR7lu a3NQ== Received: by 10.180.91.169 with SMTP id cf9mr4757177wib.1.1348758747302; Thu, 27 Sep 2012 08:12:27 -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 t7sm13643780wix.6.2012.09.27.08.12.26 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 08:12:26 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.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 Message-Id: <1348758726-25336-7-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348758726-25336-1-git-send-email-lee.jones@linaro.org> References: <1348758726-25336-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQn3ruJj4OfDx5zq0CbF6OSj03Q62OU7rWRjs++XUqpY+J9YyRZ4XMgagvW9cQap8mOZxTXO X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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..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@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..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@1 { + gpios = <&gpio6 25 0x4>; + }; + }; };