From patchwork Wed Jul 4 14:34: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: 1156491 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 731C2DFF0F for ; Wed, 4 Jul 2012 14:46:16 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SmQlb-0003LA-S1; Wed, 04 Jul 2012 14:41:20 +0000 Received: from mail-wi0-f177.google.com ([209.85.212.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SmQfV-0001pv-KO for linux-arm-kernel@lists.infradead.org; Wed, 04 Jul 2012 14:35:09 +0000 Received: by wibhm11 with SMTP id hm11so4176373wib.0 for ; Wed, 04 Jul 2012 07:34:29 -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=veZ/ZD0VpthcTyQiEaUlf5goDwJnppqP3u4uYg8Vv7M=; b=LZV6pxVuzDxvbBguOxOfwjNgpCROgQ6ad86H2VKsoc7+lmU4G3Me7McLfP9rxCugri hl0CZEQW5CarUStZawbQY2RgAdBfqRMgW/tr3e99squlIzEfda5ymH8QQ1219mFBksbE q06iVKj9m7OH3QpUOh45443Tg1NS94nnv9+cAvsHb9gIAuNx9QbbbLgGUWT31dRtvHAR eKFi4EuCDaw9EY9EAMKjDqH/DJ3201OVH4PmiWdSnvFzWCQtK44ibhr2o4YZZb5vxaYJ 7OfCyXKSujP1hx5gchBhfc/jDN1pfQORAlB01CCNQs5VBUD65BIEHPj5b+bYLneN1xV6 1TEA== Received: by 10.216.201.79 with SMTP id a57mr5713649weo.164.1341412469319; Wed, 04 Jul 2012 07:34:29 -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 t8sm37114705wiy.3.2012.07.04.07.34.25 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 Jul 2012 07:34:28 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linus.walleij@stericsson.com, arnd@arndb.de Subject: [PATCH] ARM: ux500: Register pinctrl from platform code until it's been DT:ed Date: Wed, 4 Jul 2012 15:34:12 +0100 Message-Id: <1341412452-3808-1-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Gm-Message-State: ALoCoQnr+Hm5FrL91TErkqOo6Yj2KAnwanDGJ/toqMDjZBXLKsQZgS5BQaSL2wYl8tiyqoIioFGG 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 [209.85.212.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lee Jones 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 There are some inconsistencies with the way pinctrl devices are named when registered from platform code to the ones registered by Device Tree. Platform devices look like 'pinctrl-db8500', whereas the ones registered from Device Tree look more like 'pinctrl.2'. This leads to failure when carrying out name-based searches for known devices. Until the correct DT bindings have been applied to the pinctrl driver it will fail to function correctly. For instance, during a Device Tree boot on Snowball no bootlog is visible due to a UART port probe failure. Regulators fail in a similar way. This patch prevents Device Tree from probing the pinctrl driver and ensures registration is completed from platform code instead. Signed-off-by: Lee Jones --- arch/arm/boot/dts/db8500.dtsi | 1 + arch/arm/mach-ux500/board-mop500.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi index 4ad5160..0e9ca87 100644 --- a/arch/arm/boot/dts/db8500.dtsi +++ b/arch/arm/boot/dts/db8500.dtsi @@ -172,6 +172,7 @@ pinctrl { compatible = "stericsson,nmk_pinctrl"; + status = "disabled"; }; usb@a03e0000 { diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 461012a..2a5d46f 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -824,6 +824,8 @@ static void __init u8500_init_machine(void) /* automatically probe child nodes of db8500 device */ of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); + dbx500_add_pinctrl(parent, "pinctrl-db8500"); + if (of_machine_is_compatible("st-ericsson,mop500")) { mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR;