From patchwork Thu Sep 20 12:12:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11547 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 E3C2A1B4E37 for ; Thu, 20 Sep 2012 12:13:22 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 4A7783D098F4 for ; Thu, 20 Sep 2012 12:13:22 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so2722067iej.11 for ; Thu, 20 Sep 2012 05:13:22 -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=Pdl2XW+gLrid9d61OnoEzr7tYEPPa5HiK66nkze6hxw=; b=RDReYrjx9zNVWcVeYuhMdj9IuGwYna9F+vVtjNQbNnqXsKs8JjnC+jmNyzLHT85dnO JbpMRihuMqKvUDX79yHBQcKWqY1UUvFOyc6WQuccArvbBtxjQDE1krjg6hvjrIPVLQkK O6n+1zxyf6b8zgmJOqd8rxLbko0KnP4NCl1gDCrihWJHQDG3K8PE8EyCEsGeo9mWy7Gf fgysHj2eN3GJr1TD+xbElYxKIQa6k+NdUWSOoJYuR6Ewb82XmQ+r7SCIrV1+R+g3pmvj 0RLvzfjQvdjtXWBN3AF8kdUtsN50nlIs4HWHvRxGgvavS7bZwra3WDBhDPkpW3OV6Q6N rtpw== Received: by 10.50.217.229 with SMTP id pb5mr1463652igc.28.1348143202085; Thu, 20 Sep 2012 05:13:22 -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.232 with SMTP id ex8csp71606igc; Thu, 20 Sep 2012 05:13:21 -0700 (PDT) Received: by 10.216.205.166 with SMTP id j38mr862557weo.186.1348143200740; Thu, 20 Sep 2012 05:13:20 -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 d10si41848223wiy.36.2012.09.20.05.13.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:20 -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 16so1635552wgi.31 for ; Thu, 20 Sep 2012 05:13:20 -0700 (PDT) Received: by 10.180.97.135 with SMTP id ea7mr5631788wib.11.1348143200294; Thu, 20 Sep 2012 05:13:20 -0700 (PDT) Received: from localhost.localdomain (LPuteaux-156-14-44-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPS id w7sm32394460wiz.0.2012.09.20.05.13.18 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 05:13:19 -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, olof.johansson@gmail.com, Lee Jones Subject: [PATCH 10/32] ARM: ux500: Match Power-On-Key MFD and DTS compatible strings Date: Thu, 20 Sep 2012 14:12:28 +0200 Message-Id: <1348143170-2130-11-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> References: <1348143170-2130-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQle7le2LwYCaewCJIZee0mNDJnv4OH+ftNbohXI08A6bgwbrz2wkT2sUaOHem5hBmGj9DNJ 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. Acked-by: Linus Walleij 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 daedefe..dc290d0 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";