From patchwork Thu Jul 5 13:06:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9851 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 090FF23E16 for ; Thu, 5 Jul 2012 13:06:51 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id CCDD7A182EA for ; Thu, 5 Jul 2012 13:06:50 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id z12so7960629ghb.11 for ; Thu, 05 Jul 2012 06:06:50 -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=2KT8dLDXHkr9CjOOKPpUq3EfUAFjoJ9NHy1W6g9Skzk=; b=jmrxLz9aNTdn+KZNcOfGS7Sn3a2Mo+ph22MCb+21jtU1FUu/+bIVMySBUP6ii94NKT oY8FJ8fsTT1szeivMNUYi5FSgWRvkrEMWbPGBZWjnPbNr3WQpGuqewSiRnrkgDVvPada 7w60C1TJRE24o6WQFeqwFdnrHLzvTSSQMWs0EXX+galYUdXAdCBgwAZAqKuFgtgBYMnq Q/vzlWjzMWv7k/WaGJcvCI3SwPbvqL//sHf8gnmt5cUrRN7LCBHXpDJr9pHGsI8KwxBm 3h7lxSJ7zl5B6KOXcAI3L+NSqPpNVlH9+pxYM46eun2zqTj5ArS721dpFq/D2H6feZGl jZLg== Received: by 10.50.40.193 with SMTP id z1mr16193959igk.0.1341493610380; Thu, 05 Jul 2012 06:06:50 -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.231.24.148 with SMTP id v20csp65226ibb; Thu, 5 Jul 2012 06:06:49 -0700 (PDT) Received: by 10.180.99.232 with SMTP id et8mr11927515wib.11.1341493609098; Thu, 05 Jul 2012 06:06:49 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id d59si15719071wed.160.2012.07.05.06.06.48 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 06:06:49 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 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-we0-f178.google.com with SMTP id f13so7479435wer.37 for ; Thu, 05 Jul 2012 06:06:48 -0700 (PDT) Received: by 10.180.105.130 with SMTP id gm2mr41931341wib.6.1341493608606; Thu, 05 Jul 2012 06:06:48 -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 k8sm76767305wia.6.2012.07.05.06.06.47 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 06:06:47 -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, Lee Jones Subject: [PATCH 9/9] ARM: ux500: Over-ride the DT device naming scheme for pinctrl Date: Thu, 5 Jul 2012 14:06:12 +0100 Message-Id: <1341493572-29735-10-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341493572-29735-1-git-send-email-lee.jones@linaro.org> References: <1341493572-29735-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnY1KA3rOVTcU1cX59MK189WdPhZVz0mxENMim/BRYVd3kAfmtPP6mlDbKGYXkEpWZX8ocK 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), {}, };