From patchwork Mon Aug 6 10:46:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10510 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 110492402A for ; Mon, 6 Aug 2012 10:47:09 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id CE004A1838B for ; Mon, 6 Aug 2012 10:47:08 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id f1so2314752ggn.11 for ; Mon, 06 Aug 2012 03:47:08 -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=abQ1+FL9csjnlthoomTzlX/SDSwaU0KBICegvB2pK1w=; b=JMxvYxE1vyr58BAcDem64C27z+MqSekSjplq7Th0tmeHKJqhaME8D82NaQA7LoDHIE TTjsGw9lxDOXM1g+RHIY/cmTjA31MeDhDver3vrMlyB8it0K44csJr99D4LyRlMgdR7B NYGNxSkeXLWiAVu/Ygyb4SV0KJoIIq6eSLd8BkVqtxDyZFqMC9kExprq1X/uRo7+m378 Rci58gLw+fENlirtHUa+0rpx9He7BLpFPWkPe6FjgYRLLnky61ayN9n4+lZm6hM0tYwA ke3fdszwyDZEFVUnCQG7SL/IQEqtnP/TXr/MYdnzdsIAAQXc7pEodTBs21BrYDPkrSVc JOrw== Received: by 10.50.160.168 with SMTP id xl8mr4864708igb.25.1344250028201; Mon, 06 Aug 2012 03:47:08 -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.87.40 with SMTP id u8csp433411igz; Mon, 6 Aug 2012 03:47:07 -0700 (PDT) Received: by 10.180.78.5 with SMTP id x5mr17345891wiw.13.1344250027186; Mon, 06 Aug 2012 03:47:07 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id bt9si14709853wib.0.2012.08.06.03.47.06 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 06 Aug 2012 03:47:07 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 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-f50.google.com with SMTP id ds11so2399744wgb.31 for ; Mon, 06 Aug 2012 03:47:06 -0700 (PDT) Received: by 10.180.100.37 with SMTP id ev5mr17407280wib.5.1344250026698; Mon, 06 Aug 2012 03:47:06 -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 t7sm22043908wix.6.2012.08.06.03.47.05 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 06 Aug 2012 03:47:06 -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, dmitry.torokhov@gmail.com, sameo@linux.intel.com, Lee Jones Subject: [PATCH 5/6] ARM: ux500: Match-up compatible stings with associated MFD cell Date: Mon, 6 Aug 2012 11:46:41 +0100 Message-Id: <1344250002-6011-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344250002-6011-1-git-send-email-lee.jones@linaro.org> References: <1344250002-6011-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQk0B4TqWvfQg8l9sRKxS0YEbAVYr3p0UXiUb6jL6QEP0a82pcFFVMaLEcnAV/CP/6ithYQl Until now, we've either taken the IRQs listed in the MFD cell defined in the AB8500 driver, or the ones in Device Tree when we probed each AB8500 MFD device independently. However, now we make a logical choice based on whether we're running Device Tree or not. For this to happen we need the compatible stings in the AB8500 MFD cell and the DT to match-up. We do that here. 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 83229f7..0282353 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -355,7 +355,7 @@ }; ab8500-ponkey { - compatible = "stericsson,ab8500-ponkey"; + compatible = "stericsson,ab8500-poweron-key"; interrupts = <6 0x4 7 0x4>; interrupt-names = "ONKEY_DBF", "ONKEY_DBR";