From patchwork Thu Apr 5 09:55:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 7658 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 8327223ED0 for ; Thu, 5 Apr 2012 09:56:10 +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 39D3CA18598 for ; Thu, 5 Apr 2012 09:56:10 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id e36so2131028iag.11 for ; Thu, 05 Apr 2012 02:56:10 -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=Foc3GN/2TvDu7HmvTX1jXQMlN0SInOoIpFqO0ASWk8arfnE58u8p+wUYB8rkvQ58Hg h+cClLIOrtAy+yr0arlUCe5AcAhw99YBWHTvCLf2YmnSFJ25OJzZH8Q3szAFQmHNdXJ0 9WNeSlLnK2MQJBpMVhKuRzEcIZYYFF0BZpG3WGtIfL1wL2u8sBN1iDK1VsJ1e0fV9CCb XKrwb1YYZ/oyt3OpN432NCvydK1mNIJvc4uMVewcxzeszwHIVeaCc6kGlKlb1qw3h95c KkHdGqJJ4BHebzYLqAsjPUX1L6ntBKSWARNLf37MOH02JZ5QU0Rva55GCJv3yZeBwyT6 Px6A== Received: by 10.42.155.9 with SMTP id s9mr923838icw.51.1333619769960; Thu, 05 Apr 2012 02:56:09 -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.164.217 with SMTP id f25csp52734iby; Thu, 5 Apr 2012 02:56:09 -0700 (PDT) Received: by 10.180.88.169 with SMTP id bh9mr3282226wib.5.1333619768443; Thu, 05 Apr 2012 02:56:08 -0700 (PDT) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id gg1si4189593wib.43.2012.04.05.02.56.08 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Apr 2012 02:56:08 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.172; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by wibhj6 with SMTP id hj6so1142136wib.13 for ; Thu, 05 Apr 2012 02:56:08 -0700 (PDT) Received: by 10.180.79.135 with SMTP id j7mr11301333wix.19.1333619767853; Thu, 05 Apr 2012 02:56:07 -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 e6sm12308845wix.8.2012.04.05.02.56.06 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Apr 2012 02:56:06 -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: Thu, 5 Apr 2012 10:55:46 +0100 Message-Id: <1333619748-16126-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1333619748-16126-1-git-send-email-lee.jones@linaro.org> References: <1333619748-16126-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlOsfpJxfd0ssRUTq39QTF1i3cpvepVP4NTcgo3J+TGueMY8GQGtPeq2st1tDIbM+EP6cdd 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>; }; };