From patchwork Tue Dec 11 11:34:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Edworthy X-Patchwork-Id: 1861891 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 0E5C0DF2F9 for ; Tue, 11 Dec 2012 11:34:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752807Ab2LKLei (ORCPT ); Tue, 11 Dec 2012 06:34:38 -0500 Received: from relmlor1.renesas.com ([210.160.252.171]:61211 "EHLO relmlor1.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752726Ab2LKLeh (ORCPT ); Tue, 11 Dec 2012 06:34:37 -0500 Received: from relmlir4.idc.renesas.com ([10.200.68.154]) by relmlor1.idc.renesas.com ( SJSMS) with ESMTP id <0MEV00DBE6TONR30@relmlor1.idc.renesas.com> for linux-sh@vger.kernel.org; Tue, 11 Dec 2012 20:34:36 +0900 (JST) Received: from relmlac2.idc.renesas.com ([10.200.69.22]) by relmlir4.idc.renesas.com ( SJSMS) with ESMTP id <0MEV008AE6TOBBB0@relmlir4.idc.renesas.com> for linux-sh@vger.kernel.org; Tue, 11 Dec 2012 20:34:36 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 84942280A5; Tue, 11 Dec 2012 20:34:36 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 7F01B280A0; Tue, 11 Dec 2012 20:34:36 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id WAJ17900; Tue, 11 Dec 2012 20:34:36 +0900 X-IronPort-AV: E=Sophos; i="4.84,259,1355065200"; d="scan'208"; a="109703382" Received: from unknown (HELO relay51.aps.necel.com) ([10.29.19.60]) by relmlii2.idc.renesas.com with ESMTP; Tue, 11 Dec 2012 20:34:36 +0900 Received: from julia (du2com5.eu.necel.com [172.29.24.35] (may be forged)) by relay51.aps.necel.com (8.14.4+Sun/8.14.4) with ESMTP id qBBBYW6k028607; Tue, 11 Dec 2012 20:34:33 +0900 (JST) Received: by julia (Postfix, from userid 2) id 5BC7F7F25; Tue, 11 Dec 2012 12:34:32 +0100 (CET) Received: from du0nohub.eu.necel.com (unknown [172.29.24.70]) by julia (Postfix) with ESMTP id 4DC547F0F; Tue, 11 Dec 2012 12:34:32 +0100 (CET) Received: from duacsls.ad.ree.renesas.com ([172.29.43.47]) by du0nohub.eu.necel.com (Lotus Domino Release 8.5.3 HF466) with ESMTP id 2012121112343162-45478 ; Tue, 11 Dec 2012 12:34:31 +0100 From: Phil Edworthy To: Simon , linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus , Laurent Pinchart , Phil Edworthy Subject: [PATCH v2] ARM: shmobile: r8a7779: Fix GPIO input reg addresses X-Mailer: git-send-email 1.7.5.4 In-reply-to: <16942826.W5hEBZUpzF@avalon> References: <16942826.W5hEBZUpzF@avalon> X-TNEFEvaluated: 1 Message-id: <1355225657-18731-1-git-send-email-phil.edworthy@renesas.com> Date: Tue, 11 Dec 2012 11:34:17 +0000 X-MIMETrack: Itemize by SMTP Server on DU0NOHUB/NECEE(Release 8.5.3 HF466|March 09, 2012) at 11.12.2012 12:34:31, Serialize by Router on DU0NOHUB/NECEE(Release 8.5.3 HF466|March 09, 2012) at 11.12.2012 12:34:32, Serialize complete at 11.12.2012 12:34:32 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org The INDTx register addresses were wrong. Signed-off-by: Phil Edworthy Acked-by: Laurent Pinchart --- v2: Included SoB line this time - doh! arch/arm/mach-shmobile/pfc-r8a7779.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-shmobile/pfc-r8a7779.c b/arch/arm/mach-shmobile/pfc-r8a7779.c index 15f6a48..717e058 100644 --- a/arch/arm/mach-shmobile/pfc-r8a7779.c +++ b/arch/arm/mach-shmobile/pfc-r8a7779.c @@ -2585,13 +2585,13 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { }; static struct pinmux_data_reg pinmux_data_regs[] = { - { PINMUX_DATA_REG("INDT0", 0xffc40008, 32) { GP_INDT(0) } }, - { PINMUX_DATA_REG("INDT1", 0xffc41008, 32) { GP_INDT(1) } }, - { PINMUX_DATA_REG("INDT2", 0xffc42008, 32) { GP_INDT(2) } }, - { PINMUX_DATA_REG("INDT3", 0xffc43008, 32) { GP_INDT(3) } }, - { PINMUX_DATA_REG("INDT4", 0xffc44008, 32) { GP_INDT(4) } }, - { PINMUX_DATA_REG("INDT5", 0xffc45008, 32) { GP_INDT(5) } }, - { PINMUX_DATA_REG("INDT6", 0xffc46008, 32) { + { PINMUX_DATA_REG("INDT0", 0xffc4000c, 32) { GP_INDT(0) } }, + { PINMUX_DATA_REG("INDT1", 0xffc4100c, 32) { GP_INDT(1) } }, + { PINMUX_DATA_REG("INDT2", 0xffc4200c, 32) { GP_INDT(2) } }, + { PINMUX_DATA_REG("INDT3", 0xffc4300c, 32) { GP_INDT(3) } }, + { PINMUX_DATA_REG("INDT4", 0xffc4400c, 32) { GP_INDT(4) } }, + { PINMUX_DATA_REG("INDT5", 0xffc4500c, 32) { GP_INDT(5) } }, + { PINMUX_DATA_REG("INDT6", 0xffc4600c, 32) { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, GP_6_8_DATA, GP_6_7_DATA, GP_6_6_DATA, GP_6_5_DATA, GP_6_4_DATA,