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: 9842 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 DB90A23E23 for ; Thu, 5 Jul 2012 12:05:52 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 93753A182E1 for ; Thu, 5 Jul 2012 12:05:52 +0000 (UTC) Received: by yhpp61 with SMTP id p61so8745421yhp.11 for ; Thu, 05 Jul 2012 05:05:52 -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:x-gm-message-state; bh=2KT8dLDXHkr9CjOOKPpUq3EfUAFjoJ9NHy1W6g9Skzk=; b=AWJQb7Htkh5Ss8incFg6AUJ3LrbSc4ckCCYy8zrGtcXTokn69baffP1hUMKN1iQATQ YlDxqX6KbIqgu8Yh3JwQcEiXqtUFZwbr08dsS5njCBD84QcXW34dx0rD92+epeEFS11T DsHsM1Fffnn927iYg+GHEZuiK0oxtiMrWs8BzWAO+1CRDMY/ZVl5bMgKw/8Mz3cEJMLG Zc/UGsNrbYyOEyImCxNLu7m+W/MebnJbgda43SQxG/L2VKsT17acSmpOo3A40mANeJH5 D3+nfAgFHmfNI9eaQ/0bqtn7rKPEWJZ/7rYm2GWnPwt4B9gtCck1l91SZUcXS2NpCGN/ t0uw== Received: by 10.50.87.227 with SMTP id bb3mr13767564igb.57.1341489951552; Thu, 05 Jul 2012 05:05:51 -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 v20csp64509ibb; Thu, 5 Jul 2012 05:05:50 -0700 (PDT) Received: by 10.216.145.153 with SMTP id p25mr8174189wej.112.1341489950022; Thu, 05 Jul 2012 05:05:50 -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 g6si15216286wiy.38.2012.07.05.05.05.49 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jul 2012 05:05:50 -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 wgbds11 with SMTP id ds11so8053745wgb.31 for ; Thu, 05 Jul 2012 05:05:49 -0700 (PDT) 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 Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, Lee Jones 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: ALoCoQk6Le1G1H1yrxDSmSVJ41oa7uUBkb4aykt01ZqMbTk7jdbTI00KbSFIT5PDQRk9/f9DByMA 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), {}, };