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: 1160831 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 01F63DFB7C for ; Thu, 5 Jul 2012 13:47:38 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmmJm-0000Au-5V; Thu, 05 Jul 2012 13:42:02 +0000 Received: from mail-wg0-f49.google.com ([74.125.82.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Smlli-0008JB-OM for linux-arm-kernel@lists.infradead.org; Thu, 05 Jul 2012 13:07:03 +0000 Received: by wgbds1 with SMTP id ds1so5732489wgb.18 for ; Thu, 05 Jul 2012 06:06:48 -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=2KT8dLDXHkr9CjOOKPpUq3EfUAFjoJ9NHy1W6g9Skzk=; b=M0lVAMExaa6gJIwXnjo4XXg/6/3aQ6DLPiSboDVMfqzHeqG6YIEk9i3V+Limdu124Z Zgw360h1LfYovEaNSNslqTX23w6RhkE6ACbcrN0yqUKPusKErrvRH8FFJbjOB5kuRgmS xqjAxaVnJx6cAzlICNrwBK0rm9Rh1HmLC1R82wXGKJIgybztZkpkKglbTQQKWvCPGR69 YwfZan01g1NqA1Ts8GFshg0+n5i0E0VldHcm4j1tyzFPPL/v5lb6WFLScS2W3qRGbBh7 +kwYAUKYEBBkYUg84FcrnZvX+prUEN4xQurIF+FMQDftMXvKlIABkNQf+CebVah3rqPV zCoQ== 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 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: ALoCoQnMAtRaSZjw54qAawxwVGaOsGnnbT04XpAkUZ6qEjzCJuCZ9GHOdbEykmeXsNOVsoBSE+57 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 ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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 Acked-by: Linus Walleij --- 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), {}, };