From patchwork Tue Dec 18 09:12:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 13637 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 36EC323E2A for ; Tue, 18 Dec 2012 09:12:34 +0000 (UTC) Received: from mail-ie0-f182.google.com (mail-ie0-f182.google.com [209.85.223.182]) by fiordland.canonical.com (Postfix) with ESMTP id E125BA19394 for ; Tue, 18 Dec 2012 09:12:33 +0000 (UTC) Received: by mail-ie0-f182.google.com with SMTP id s9so482458iec.27 for ; Tue, 18 Dec 2012 01:12:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=3shI8lDJJ74mZLBKgg7/3i+badH3IoPCnx+rlwRGfXY=; b=OIQfJWjD2gZ/TAU9rkZiFC6N8Biad1l5opAp3CXThUW4tglvHlNtV2EYzwOmFChNC4 I08Qb6HEX3NSvND7pe2YKwoUjx1hkWfwbJTWyDfry6pqWyg+1Wgv+mS/KvXl8CEjmTBZ PUoNDNs7qHPviyC1mjXE3ThCJXtyYHrydT224Ayhs67GXjDTtEE0SIKSaqyYrhfdnu2P y1fP6e2QRc4gC/df17cHY95zKhoJePIhsi9E0qIAs/B3xJJq112iv3rEMN9aV0E8NpZL EmpnClBjdrCj7E0lIHkBVqhzscrVlbcRiOtdS3Ih5i1D+/C8xo8gGwzP0dGomrZjLCS6 3ibg== X-Received: by 10.50.161.169 with SMTP id xt9mr1675161igb.62.1355821953336; Tue, 18 Dec 2012 01:12:33 -0800 (PST) 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.50.67.148 with SMTP id n20csp128358igt; Tue, 18 Dec 2012 01:12:32 -0800 (PST) X-Received: by 10.194.76.137 with SMTP id k9mr2630931wjw.29.1355821951989; Tue, 18 Dec 2012 01:12:31 -0800 (PST) Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by mx.google.com with ESMTPS id j4si1332578wiy.35.2012.12.18.01.12.31 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Dec 2012 01:12:31 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.171 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=74.125.82.171; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.171 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) smtp.mail=fabio.baltieri@linaro.org Received: by mail-we0-f171.google.com with SMTP id u3so167231wey.16 for ; Tue, 18 Dec 2012 01:12:31 -0800 (PST) X-Received: by 10.194.236.166 with SMTP id uv6mr2598138wjc.34.1355821951522; Tue, 18 Dec 2012 01:12:31 -0800 (PST) Received: from localhost ([2a01:2003:1:1d66:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPS id bd7sm1691252wib.8.2012.12.18.01.12.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Dec 2012 01:12:31 -0800 (PST) From: Fabio Baltieri To: Linus Walleij , Srinidhi Kasagar Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Fabio Baltieri Subject: [PATCH 2/2] ARM: ux500: add pinctrl address resources Date: Tue, 18 Dec 2012 10:12:12 +0100 Message-Id: <1355821932-15799-2-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1355821932-15799-1-git-send-email-fabio.baltieri@linaro.org> References: <1355821932-15799-1-git-send-email-fabio.baltieri@linaro.org> X-Gm-Message-State: ALoCoQnu9IIhibGC5cmPUZzYXHpefzG+WAuSIx8wjYHwv55dpwPtvgvn59wuIW9QPNCsUZlYhrrV Current nmk_pinctrl driver is not PRCMU dependent anymore, so it needs its own DT address resources to work properly, as done for platform_device in: f482833 ARM: ux500: add PRCM register base for pinctrl Reviewed-by: Linus Walleij Signed-off-by: Fabio Baltieri --- arch/arm/boot/dts/dbx5x0.dtsi | 3 ++- arch/arm/mach-ux500/cpu-db8500.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi index 2efd9c8..16552d4 100644 --- a/arch/arm/boot/dts/dbx5x0.dtsi +++ b/arch/arm/boot/dts/dbx5x0.dtsi @@ -170,7 +170,8 @@ gpio-bank = <8>; }; - pinctrl { + pinctrl@80157000 { + reg = <0x80157000 0x2000>; compatible = "stericsson,nmk_pinctrl"; }; diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index db0bb75..5b286e0 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -285,7 +285,8 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL), OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), /* Requires device name bindings. */ - OF_DEV_AUXDATA("stericsson,nmk_pinctrl", 0, "pinctrl-db8500", NULL), + OF_DEV_AUXDATA("stericsson,nmk_pinctrl", U8500_PRCMU_BASE, + "pinctrl-db8500", NULL), /* Requires clock name and DMA bindings. */ OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000, "ux500-msp-i2s.0", &msp0_platform_data),