From patchwork Thu Jul 5 12:05:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1159931 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id DC913DFB7C for ; Thu, 5 Jul 2012 12:18:58 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmkuM-00021Y-MD; Thu, 05 Jul 2012 12:11:43 +0000 Received: from mail-wi0-f171.google.com ([209.85.212.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Smkow-0000yV-U7 for linux-arm-kernel@lists.infradead.org; Thu, 05 Jul 2012 12:06:07 +0000 Received: by wibhq4 with SMTP id hq4so4846221wib.0 for ; Thu, 05 Jul 2012 05:05:49 -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=2KT8dLDXHkr9CjOOKPpUq3EfUAFjoJ9NHy1W6g9Skzk=; b=mEcjrWF1LRG9IOR5yOqoTUebk0ZSx62w5VMc+V6ck81iXk9l64Bq3FMav72Lexcyu3 qI6CAWY7vVZY+Xs65FCuPaZVMjmkszhM7PrW1KwspXYfhaeOQWWn8FMRbovm1RrZEu6x fqpvvyAECxgk4XGfPWysOAhcwX1ZuMYLuz3nzl7xLNSPVnMAsQ1X6dXFY9GOSG5SjXBl MN4dZtV2J5oWf8r/JscBOCkK2b8TTWI6Op00aOg7bhqxq8qPMgNfRZGjQK0dtMMTcx+v l+7XicbkjOp+9xh6E+FJPQI7syW9dkzPyTXC5zBwz/71XIoJCXaqP3uIkHIK0Zenvlm+ V1hw== Received: by 10.216.4.147 with SMTP id 19mr8001238wej.109.1341489949429; Thu, 05 Jul 2012 05:05:49 -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 w10sm2780965wix.9.2012.07.05.05.05.48 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 05:05:48 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: ux500: Over-ride the DT device naming scheme for pinctrl Date: Thu, 5 Jul 2012 13:05:31 +0100 Message-Id: <1341489931-29464-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQmfxXgBlatUcsXBAj33FP8e8+0J5D/UF54gOiqXqm70/4fOpUHLEcRwwbF12FjRn4KmnIHI 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 ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.171 listed in list.dnswl.org] 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 When pin control mapping tables are written the registered device name is supplied for use in name-based searches within the pinctrl driver. In the case of the DB8500 the string "pinctrl-db8500" is used. However, when we register the driver with Device Tree, its naming convention uses something that looks more like "pinctrl.2". To work around the device naming inconsistencies between devices registered via platform code and the ones registered by Device Tree, we use AUXDATA to over-ride the Device Tree naming scheme. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index c12cd97..eb9198e 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -769,6 +769,7 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("st,nomadik-i2c", 0x80128000, "nmk-i2c.2", NULL), OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL), OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), + OF_DEV_AUXDATA("stericsson,nmk_pinctrl", 0, "pinctrl-db8500", NULL), {}, };