From patchwork Wed May 22 14:22:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2602221 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id F04F7DF215 for ; Wed, 22 May 2013 14:39:03 +0000 (UTC) Received: from merlin.infradead.org ([205.233.59.134]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfAB3-0003eY-Uy; Wed, 22 May 2013 14:38:06 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfA5d-0002CU-Il; Wed, 22 May 2013 14:32:29 +0000 Received: from mail-we0-x22a.google.com ([2a00:1450:400c:c03::22a]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UfA5A-00026q-Vt for linux-arm-kernel@lists.infradead.org; Wed, 22 May 2013 14:32:03 +0000 Received: by mail-we0-f170.google.com with SMTP id u59so752748wes.1 for ; Wed, 22 May 2013 07:31:39 -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:in-reply-to:references :x-gm-message-state; bh=9J0Wkd0E7gBooawmPYtbD01BsaOsQ1rUDQRtuDMbPRE=; b=aTvS41F8eNc+/K/mpRBwfZaXHEQ/LIHHDLb3WG16q49IJze/ZNcUR2fAILCmjUUh0m IkQz6QzHmzWcna/rUYGU1+eLWIw8PfUwiroOOANKgWQTFliO7AlJVDNJkeb8iiQHLWCR 1XZu3BBXXkRX4onMLg39gxg2dDAUDo5tq4KWspTqgw2tMKpxgyY8QATa9DGZuVXKiyqp /UdJDFMAEtbY9lku+FpWbJeWKh7X1DfBSx5y9EN7ROocUL0mHEWxjbJ7DXqPv0ybtywF oT+pBU7sYG+eGo+kAAvnjh2142ved2kIMqdhZcyvw9VRYZzYgL7VnSC6nWyo8mDPbU2B VR6Q== X-Received: by 10.180.187.234 with SMTP id fv10mr15484860wic.29.1369233099001; Wed, 22 May 2013 07:31:39 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPSA id q20sm11223096wiv.7.2013.05.22.07.31.37 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 May 2013 07:31:38 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/7] ARM: ux500: Standardise Pinctrl compatible string for Nomadik based platforms Date: Wed, 22 May 2013 15:22:57 +0100 Message-Id: <1369232581-18923-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1369232581-18923-1-git-send-email-lee.jones@linaro.org> References: <1369232581-18923-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkyvrvGhuLozlSzU4fkELIReFDCGBFAeLb/wwnVyYuB39aE3RNrO8yK9hug/B+4tjpaseNo X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130522_103201_305122_196F0FB8 X-CRM114-Status: GOOD ( 10.26 ) 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: Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de, srinidhi.kasagar@stericsson.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Signed-off-by: Lee Jones --- arch/arm/mach-nomadik/cpu-8815.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index 59f6ff5..316fe82 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c @@ -288,7 +288,7 @@ static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = { "gpio.2", NULL), OF_DEV_AUXDATA("st,nomadik-gpio", NOMADIK_GPIO3_BASE, "gpio.3", NULL), - OF_DEV_AUXDATA("stericsson,nmk-pinctrl-stn8815", 0, + OF_DEV_AUXDATA("stericsson,stn8815-pinctrl", 0, "pinctrl-stn8815", NULL), OF_DEV_AUXDATA("arm,primecell", NOMADIK_UART0_BASE, "uart0", NULL),