From patchwork Wed Jan 30 17:07:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2068881 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 6A52E3FD2B for ; Wed, 30 Jan 2013 17:10:36 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U0b8o-0003Mu-GU; Wed, 30 Jan 2013 17:08:06 +0000 Received: from wi-in-x0229.1e100.net ([2a00:1450:400c:c05::229] helo=mail-wi0-x229.google.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U0b8g-0003Ie-3y for linux-arm-kernel@lists.infradead.org; Wed, 30 Jan 2013 17:07:58 +0000 Received: by mail-wi0-f169.google.com with SMTP id hq12so4006490wib.2 for ; Wed, 30 Jan 2013 09:07:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent:x-gm-message-state; bh=JmqFMmSPm4BNSVOv1y6M5qV2cXGwp3EYd40trtCC9+A=; b=EoDD//jGGkHHebhKjxK3TlKS2TW5IOmr4dsHmTlBAYQomn28/8Iy5W5ig2oGhdZBDo xHudsVn8L+wo/tGMpv5f4GbFJqvJhIocRipeoCYiJJZhHJ0VE8YJOupwslrDLRSmiOIV epZmV39/JNUlE1R0gJ8f5e1FlXILuuX/SWBdUmj7N8/ncbYvfuyUXEK/8tn8y2HZ+y3E fkoqxo+W1T6faH+SfqPW0uBibLIt/g39islIeShVFr9+2eXlvEzA4zvUsZF892p/Uz6B rDnk/a4GvqhTTjKmFwYFsQr/fia7qx5krwB6Kjjm6ygEvwEv3k7V/bQ+sVuHoOalCPol e4pg== X-Received: by 10.180.90.106 with SMTP id bv10mr10017355wib.12.1359565675890; Wed, 30 Jan 2013 09:07:55 -0800 (PST) Received: from gmail.com (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id ec3sm4175330wib.1.2013.01.30.09.07.52 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 30 Jan 2013 09:07:54 -0800 (PST) Date: Wed, 30 Jan 2013 17:07:50 +0000 From: Lee Jones To: Stephen Warren Subject: [PATCH 1/1] pinctrl: nomadik: Rename Device Tree compatible string Message-ID: <20130130170750.GA5217@gmail.com> References: <1359563102-5934-1-git-send-email-linus.walleij@stericsson.com> <51094E50.4000302@wwwdotorg.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <51094E50.4000302@wwwdotorg.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQlvDguMJHhkVVMkUO54pCpYlriGQT+BfO49EZjss42DwEpmSzBK/vz3D6kJgbfh4dlstoTF X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130130_120758_309993_728ABEE8 X-CRM114-Status: GOOD ( 13.74 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Stephen Warren , Linus Walleij , Linus Walleij , linux-kernel@vger.kernel.org, Anmar Oueja , linux-arm-kernel@lists.infradead.org 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The preference is to use '-' instead of '_' in compatible strings. Signed-off-by: Lee Jones Acked-by: Linus Walleij --- arch/arm/boot/dts/dbx5x0.dtsi | 2 +- arch/arm/mach-ux500/cpu-db8500.c | 2 +- drivers/pinctrl/pinctrl-nomadik.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index 3381ba6..b6256f3 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -171,7 +171,7 @@ }; pinctrl { - compatible = "stericsson,nmk_pinctrl"; + compatible = "stericsson,nmk-pinctrl"; prcm = <&prcmu>; }; diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 5b286e0..b80ad96 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -285,7 +285,7 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL), OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), /* Requires device name bindings. */ - OF_DEV_AUXDATA("stericsson,nmk_pinctrl", U8500_PRCMU_BASE, + OF_DEV_AUXDATA("stericsson,nmk-pinctrl", U8500_PRCMU_BASE, "pinctrl-db8500", NULL), /* Requires clock name and DMA bindings. */ OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000, diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c index 4954302..2081931 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/pinctrl-nomadik.c @@ -1847,7 +1847,7 @@ static struct pinctrl_desc nmk_pinctrl_desc = { static const struct of_device_id nmk_pinctrl_match[] = { { - .compatible = "stericsson,nmk_pinctrl", + .compatible = "stericsson,nmk-pinctrl", .data = (void *)PINCTRL_NMK_DB8500, }, {},