From patchwork Thu Nov 22 16:28:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Edworthy X-Patchwork-Id: 1787601 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 45817DF24C for ; Thu, 22 Nov 2012 20:14:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754709Ab2KVUO1 (ORCPT ); Thu, 22 Nov 2012 15:14:27 -0500 Received: from relmlor2.renesas.com ([210.160.252.172]:61058 "EHLO relmlor2.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755150Ab2KVUOZ (ORCPT ); Thu, 22 Nov 2012 15:14:25 -0500 Received: from relmlir4.idc.renesas.com ([10.200.68.154]) by relmlor2.idc.renesas.com ( SJSMS) with ESMTP id <0MDW006A2DSRB070@relmlor2.idc.renesas.com> for linux-sh@vger.kernel.org; Fri, 23 Nov 2012 01:29:15 +0900 (JST) Received: from relmlac1.idc.renesas.com ([10.200.69.21]) by relmlir4.idc.renesas.com ( SJSMS) with ESMTP id <0MDW0016NDSR09C0@relmlir4.idc.renesas.com> for linux-sh@vger.kernel.org; Fri, 23 Nov 2012 01:29:15 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 3E7CB80179; Fri, 23 Nov 2012 01:29:15 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 2F47B80177; Fri, 23 Nov 2012 01:29:15 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id BAC24202; Fri, 23 Nov 2012 01:29:15 +0900 X-IronPort-AV: E=Sophos; i="4.83,302,1352041200"; d="scan'208"; a="107365977" Received: from unknown (HELO relay41.aps.necel.com) ([10.29.19.9]) by relmlii2.idc.renesas.com with ESMTP; Fri, 23 Nov 2012 01:29:14 +0900 Received: from julia (du2com5.eu.necel.com [172.29.24.35] (may be forged)) by relay41.aps.necel.com (8.14.4+Sun/8.14.4) with ESMTP id qAMGTEeJ026565; Fri, 23 Nov 2012 01:29:14 +0900 (JST) Received: by julia (Postfix, from userid 2) id EA9E24E822; Thu, 22 Nov 2012 17:29:13 +0100 (CET) Received: from du0nohub.eu.necel.com (unknown [172.29.24.70]) by julia (Postfix) with ESMTP id D14794E823; Thu, 22 Nov 2012 17:29:13 +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 2012112217290958-3258 ; Thu, 22 Nov 2012 17:29:09 +0100 From: Phil Edworthy To: Simon , linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, stable@kernel.org, Magnus , Kuninori Morimoto , Laurent Pinchart , Phil Edworthy Subject: [PATCH] ARM: shmobile: r8a7779: Fix PFC - MOD_SEL2 missed an entry X-Mailer: git-send-email 1.7.5.4 X-TNEFEvaluated: 1 Message-id: <1353601737-21641-1-git-send-email-phil.edworthy@renesas.com> Date: Thu, 22 Nov 2012 16:28:57 +0000 X-MIMETrack: Itemize by SMTP Server on DU0NOHUB/NECEE(Release 8.5.3 HF466|March 09, 2012) at 22.11.2012 17:29:09, Serialize by Router on DU0NOHUB/NECEE(Release 8.5.3 HF466|March 09, 2012) at 22.11.2012 17:29:13, Serialize complete at 22.11.2012 17:29:13 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org The list of functions selected by the MOD_SEL2 register was missing an entry. This caused all entries after this to modify the MOD_SEL2 register incorrectly. Signed-off-by: Phil Edworthy --- arch/arm/mach-shmobile/pfc-r8a7779.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-shmobile/pfc-r8a7779.c b/arch/arm/mach-shmobile/pfc-r8a7779.c index 9fac32e4..15f6a48 100644 --- a/arch/arm/mach-shmobile/pfc-r8a7779.c +++ b/arch/arm/mach-shmobile/pfc-r8a7779.c @@ -2525,7 +2525,7 @@ static struct pinmux_cfg_reg pinmux_config_regs[] = { /* SEL_SCIF [2] */ FN_SEL_SCIF_0, FN_SEL_SCIF_1, FN_SEL_SCIF_2, FN_SEL_SCIF_3, /* SEL_CANCLK [2] */ - FN_SEL_CANCLK_0, FN_SEL_CANCLK_1, FN_SEL_CANCLK_2, + FN_SEL_CANCLK_0, FN_SEL_CANCLK_1, FN_SEL_CANCLK_2, 0, /* SEL_CAN0 [1] */ FN_SEL_CAN0_0, FN_SEL_CAN0_1, /* SEL_HSCIF1 [1] */