From patchwork Tue Dec 18 09:02: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: 13635 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 1B9C323E2A for ; Tue, 18 Dec 2012 09:02:24 +0000 (UTC) Received: from mail-ia0-f170.google.com (mail-ia0-f170.google.com [209.85.210.170]) by fiordland.canonical.com (Postfix) with ESMTP id BBB45A183F3 for ; Tue, 18 Dec 2012 09:02:23 +0000 (UTC) Received: by mail-ia0-f170.google.com with SMTP id i1so317759iaa.1 for ; Tue, 18 Dec 2012 01:02:23 -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=YEYcx51z/xzOgiBzhXWCIiiSK9X97acMSnuLv7FBoSKxDuTgky3VhfAFr8q7FDKmKa xm00k4z6Lry4+0qOU0lqyEfrdgCdSxgZuqQs3wDvkiJAGeIxC5/zT5K01IwDegBV2gY5 +yy/mvpeg/Vo2D7+gBDsVh1MHmFRD3TIHqu97jtB5cTzLUDW7Nh7ydZhZkWinCazMsgf SYKYPRqEX0ERPEzNa3esMi1zpnVf9laNYYblupMaRwCLYh3Jhbu/4FiWAG1+1781O3gY GoghhlmhDACk416nyY/xZZTwNCiqlHQV4H4HBojC0MDhtNcg3YQyWlHPhpEX1j4M8CLo +o9w== X-Received: by 10.50.36.164 with SMTP id r4mr1322661igj.57.1355821343126; Tue, 18 Dec 2012 01:02:23 -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 n20csp127935igt; Tue, 18 Dec 2012 01:02:22 -0800 (PST) X-Received: by 10.180.99.1 with SMTP id em1mr2483103wib.20.1355821341714; Tue, 18 Dec 2012 01:02:21 -0800 (PST) Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by mx.google.com with ESMTPS id cu9si13476087wib.3.2012.12.18.01.02.21 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Dec 2012 01:02:21 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.46 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=74.125.82.46; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.46 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-wg0-f46.google.com with SMTP id dr13so157015wgb.13 for ; Tue, 18 Dec 2012 01:02:21 -0800 (PST) X-Received: by 10.180.79.37 with SMTP id g5mr2720676wix.8.1355821341209; Tue, 18 Dec 2012 01:02:21 -0800 (PST) Received: from localhost ([2a01:2003:1:1d66:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPS id y3sm14937735wix.6.2012.12.18.01.02.19 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Dec 2012 01:02:20 -0800 (PST) From: Fabio Baltieri To: Linus Walleij 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:02:12 +0100 Message-Id: <1355821332-13900-2-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1355821332-13900-1-git-send-email-fabio.baltieri@linaro.org> References: <1355821332-13900-1-git-send-email-fabio.baltieri@linaro.org> X-Gm-Message-State: ALoCoQmxgabT1mQ/qx7bWQb38s1wCqSDd7RaHigO+3mQnxwWcHrSrJVrzzYKlLalxE8ZbiJolFAz 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),