From patchwork Thu Aug 9 15:57:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10650 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 097BD23E40 for ; Thu, 9 Aug 2012 15:57:25 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id CBE88A18A42 for ; Thu, 9 Aug 2012 15:57:24 +0000 (UTC) Received: by yhpp61 with SMTP id p61so595369yhp.11 for ; Thu, 09 Aug 2012 08:57:24 -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:x-gm-message-state; bh=f9wpJ9/PzURu7KwQt/Qo8YjeKzpvh0IN8tvAtnFwdCc=; b=E+Bt3/dsjW5HHTkm14RzO/u3SjkVoupohTpwwbzZ/Pr0m/9fo1bzvaDSv3hlRoxHtD QG6A5pNtydExsh/bmWyW6814gMbUN/oKri0nWk05m7xCvMEce9y7D9Xspp1+MahF03eu nZngR+D9Cm19Ms39mfCwZz85v5OmbIyUVvZrftXT6NBc7TSLpA0/GdZt3rJEp54+t7lC z3OZKEbELKQzH5gSKIMP5obwzgYSsE16OKwXHSYPsz1TX5WnOkperCM7NBLjfEf19xEb ssEc7FY+U9DPxCBHA7AE6h+4UtzGhfhDvU4ugH85ReOljuGIWA/+Wyb0eyj2lgbGu7w4 aBiA== Received: by 10.50.154.132 with SMTP id vo4mr1618393igb.31.1344527843982; Thu, 09 Aug 2012 08:57:23 -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.200 with SMTP id ew8csp15706igc; Thu, 9 Aug 2012 08:57:23 -0700 (PDT) Received: by 10.217.2.133 with SMTP id p5mr4205755wes.143.1344527842657; Thu, 09 Aug 2012 08:57:22 -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 j18si2981100wiv.29.2012.08.09.08.57.22 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:57:22 -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 wibhm11 with SMTP id hm11so386609wib.13 for ; Thu, 09 Aug 2012 08:57:22 -0700 (PDT) Received: by 10.180.14.35 with SMTP id m3mr3979230wic.16.1344527842104; Thu, 09 Aug 2012 08:57:22 -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 j6sm3557376wiy.4.2012.08.09.08.57.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:57:21 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, Lee Jones Subject: [PATCH 1/1] ARM: ux500: Match Power-On-Key MFD and DTS compatible strings Date: Thu, 9 Aug 2012 16:57:06 +0100 Message-Id: <1344527828-6283-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQnXfkQJH1i7jujOOr8ivQMNJxOsbtz3lZX9BDSeGcQezc3s2Kw4CyqIy3Ve+wcqlyHJXrAf The compatible string found in the Power-On-Key's MFD cell matches the device name provided in the driver. Keeping this naming convention seems like a good idea, so we're changing the one found in the DTS file to match. Signed-off-by: Lee Jones --- arch/arm/boot/dts/dbx5x0.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index 5106662..7d84f46 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -374,7 +374,7 @@ }; ab8500-ponkey { - compatible = "stericsson,ab8500-ponkey"; + compatible = "stericsson,ab8500-poweron-key"; interrupts = <6 0x4 7 0x4>; interrupt-names = "ONKEY_DBF", "ONKEY_DBR";