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: 1302321 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 03D3F3FC23 for ; Thu, 9 Aug 2012 16:45:16 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SzVmZ-0000Nm-2D; Thu, 09 Aug 2012 16:40:23 +0000 Received: from mail-wg0-f49.google.com ([74.125.82.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SzV6y-0000FA-94 for linux-arm-kernel@lists.infradead.org; Thu, 09 Aug 2012 15:57:34 +0000 Received: by wgbez12 with SMTP id ez12so383546wgb.18 for ; Thu, 09 Aug 2012 08:57:22 -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:x-gm-message-state; bh=f9wpJ9/PzURu7KwQt/Qo8YjeKzpvh0IN8tvAtnFwdCc=; b=AXorLC73L5FuIjVglp4yqWtELTTNOZ1E4/599T13Rwn+b58ZIDk3uHTcQuRhWvLzdm KbbFLwbv3QG5X7OEfkPT+sQaq219tc8H2I1NCS9wpHBKD008wy6t1igaxbtF6zZp5jx+ jmChNqjCG8l136RpuLynRFSHomRIOrIxGyANb6Is1sPxzLdW4lGubD3yHLxycmN4teh8 WBszl4/yCzi/RgTnbPYBRd7JHtnUo4SBZv+N6nrtIUqKgv3soPubQnolrkUNNqwO5+zb 1ARdDOYFEQbltba0sdGS5WWpO4KjD1MIR4ST2sgUvIlURUF+40XFPt94KBcfkZz2Msvq BHIA== 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 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: ALoCoQnY8o1Exe8YDXQnRACayaP0Sxg8/1hMj5TClnYV46SQkq7lagqmhETlSELj+sTIfWTDMl0D 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.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: STEricsson_nomadik_linux@list.st.com, 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 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 Acked-by: Linus Walleij --- 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";