From patchwork Mon Jun 3 07:52:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Edworthy X-Patchwork-Id: 2650971 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 08682DF24C for ; Mon, 3 Jun 2013 07:53:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751197Ab3FCHxQ (ORCPT ); Mon, 3 Jun 2013 03:53:16 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:45182 "EHLO relmlor2.renesas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751100Ab3FCHxQ (ORCPT ); Mon, 3 Jun 2013 03:53:16 -0400 Received: from relmlir2.idc.renesas.com ([10.200.68.152]) by relmlor2.idc.renesas.com ( SJSMS) with ESMTP id <0MNT001L24KQKA10@relmlor2.idc.renesas.com> for linux-sh@vger.kernel.org; Mon, 03 Jun 2013 16:53:14 +0900 (JST) Received: from relmlac1.idc.renesas.com ([10.200.69.21]) by relmlir2.idc.renesas.com ( SJSMS) with ESMTP id <0MNT00B2X4KQ0N00@relmlir2.idc.renesas.com> for linux-sh@vger.kernel.org; Mon, 03 Jun 2013 16:53:14 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 9B8DB80177; Mon, 03 Jun 2013 16:53:14 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 9266280193; Mon, 03 Jun 2013 16:53:14 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id SAB06611; Mon, 03 Jun 2013 16:53:14 +0900 X-IronPort-AV: E=Sophos; i="4.87,791,1363100400"; d="scan'208"; a="129431092" Received: from unknown (HELO relay51.aps.necel.com) ([10.29.19.60]) by relmlii2.idc.renesas.com with ESMTP; Mon, 03 Jun 2013 16:53:14 +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 r537r9ip011128; Mon, 03 Jun 2013 16:53:09 +0900 (JST) Received: by julia (Postfix, from userid 2) id 932CD4EC18; Mon, 03 Jun 2013 09:53:08 +0200 (CEST) Received: from du0smtp.eu.necel.com (unknown [172.29.24.86]) by julia (Postfix) with ESMTP id 88F774EC12; Mon, 03 Jun 2013 09:53:08 +0200 (CEST) Received: from duacsls.ad.ree.renesas.com ([172.29.43.47]) by du0smtp.eu.necel.com (Lotus Domino Release 8.5.3 HF466) with ESMTP id 2013060309530783-810034 ; Mon, 03 Jun 2013 09:53:07 +0200 From: Phil Edworthy To: Simon Cc: linux-sh@vger.kernel.org, Laurent Pinchart , Phil Edworthy Subject: [PATCH v2] pinctrl: sh-pfc: r8a7779: Fix missing MOD_SEL2 entry X-Mailer: git-send-email 1.7.9.5 In-reply-to: <20130531234025.GA3673@verge.net.au> References: <20130531234025.GA3673@verge.net.au> X-TNEFEvaluated: 1 Message-id: <1370245948-2769-1-git-send-email-phil.edworthy@renesas.com> Date: Mon, 03 Jun 2013 08:52:28 +0100 X-MIMETrack: Itemize by SMTP Server on DU0SMTP/EE/NECEE(Release 8.5.3 HF466|March 09, 2012) at 03.06.2013 09:53:08, Serialize by Router on DU0SMTP/EE/NECEE(Release 8.5.3 HF466|March 09, 2012) at 03.06.2013 09:53:08, Serialize complete at 03.06.2013 09:53:08 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. This bug showed up when selecting i2c2_c pins on the Renesas Hurricane board. This bug has been present since pinmux support was added for the r8a7779 SoC by 881023d28b465eb457067dc8bbca0f24d8b34279 ("sh-pfc: Add r8a7779 pinmux support") in v3.8-rc4. Signed-off-by: Phil Edworthy Acked-by: Laurent Pinchart --- v2: Improved the changelog drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c index 13feaa0..5dfeb3e 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c +++ b/drivers/pinctrl/sh-pfc/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] */