From patchwork Fri Apr 13 14:05:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7783 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 09E1023E23 for ; Fri, 13 Apr 2012 14:05:28 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id C593CA18163 for ; Fri, 13 Apr 2012 14:05:27 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so5854428iag.11 for ; Fri, 13 Apr 2012 07:05:27 -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=Uqf/4ukJjdWI68KVlmOeSDYuOAGpzKqPOQkdDogUWGA=; b=nxsIvRjrwZV0PNLlnTUa7OR4yMahQCLfS8jdB1S9tYw6enrCjPjuHZcoAaK1TwbTnJ r1HkjsBpvYI52Cyuvw5gK3VPU5n8a8oTivdYxIbZqVUWSOs55NnpUpFd9LxKQ2y4dOXU xygq4x7ZH73Kl+zYn8BSg8a/YG4RnpUCFljokRlr2VGv+trce9cokoVHMcvNJXwH7lDS rPeF70SPUhMMoSCBasMLSUZK/IHrbMGDZBg2SFjZ7GMfXZR9iEUXllK4o1CILRxblosF W/01MK0UvP8lEJ8NXhtO4qkpmhYbioRDIS0FyDQ+R4iiNzKit/jbRK5j+Cbr6eZRK05j 2RhQ== Received: by 10.50.189.232 with SMTP id gl8mr1573133igc.50.1334325927569; Fri, 13 Apr 2012 07:05:27 -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.231.70.69 with SMTP id c5csp30155ibj; Fri, 13 Apr 2012 07:05:26 -0700 (PDT) Received: by 10.213.35.133 with SMTP id p5mr151110ebd.71.1334325926268; Fri, 13 Apr 2012 07:05:26 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id s26si9553401weq.87.2012.04.13.07.05.25 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Apr 2012 07:05:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.178 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-wi0-f178.google.com with SMTP id hq7so2561021wib.13 for ; Fri, 13 Apr 2012 07:05:25 -0700 (PDT) Received: by 10.180.103.35 with SMTP id ft3mr5050377wib.0.1334325925820; Fri, 13 Apr 2012 07:05:25 -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 h8sm8338466wix.4.2012.04.13.07.05.24 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Apr 2012 07:05:25 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, grant.likely@secretlab.ca, cjb@laptop.org, linux@arm.linux.org.uk, Lee Jones Subject: [PATCH 5/7] ARM: ux500: Rename gpio_keys in the Device Tree file Date: Fri, 13 Apr 2012 15:05:07 +0100 Message-Id: <1334325909-5779-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1334325909-5779-1-git-send-email-lee.jones@linaro.org> References: <1334325909-5779-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmrfTI2eKafzA3J1h1GcBS4PvipKZnyqM8GPoPeF19KMOrGE12oPS+5DZRdisckXNCX+Ge/ Ensure each button is individually identifiable by using their correct unique given device names. Signed-off-by: Lee Jones --- arch/arm/boot/dts/snowball.dts | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 738959d..0cec47b 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -36,28 +36,28 @@ debounce_interval = <50>; wakeup = <1>; linux,code = <3>; - label = "userpb"; + label = "extkb1"; gpios = <&gpio4 23 0>; }; button@3 { debounce_interval = <50>; wakeup = <1>; linux,code = <4>; - label = "userpb"; + label = "extkb2"; gpios = <&gpio4 24 0>; }; button@4 { debounce_interval = <50>; wakeup = <1>; linux,code = <5>; - label = "userpb"; + label = "extkb3"; gpios = <&gpio5 1 0>; }; button@5 { debounce_interval = <50>; wakeup = <1>; linux,code = <6>; - label = "userpb"; + label = "extkb4"; gpios = <&gpio5 2 0>; }; };