From patchwork Wed Aug 26 18:02:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 7079091 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3A82FBEEC1 for ; Wed, 26 Aug 2015 18:02:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A6AF2094D for ; Wed, 26 Aug 2015 18:02:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 827F420949 for ; Wed, 26 Aug 2015 18:02:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756223AbbHZSC2 (ORCPT ); Wed, 26 Aug 2015 14:02:28 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:46230 "EHLO albert.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751819AbbHZSC2 (ORCPT ); Wed, 26 Aug 2015 14:02:28 -0400 Received: from ayla.of.borg ([31.5.182.137]) by albert.telenet-ops.be with bizsmtp id 9W2R1r0092yGKqv06W2RKj; Wed, 26 Aug 2015 20:02:26 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1ZUf1l-0004Fq-4H; Wed, 26 Aug 2015 20:02:25 +0200 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1ZUf1n-0004P4-KY; Wed, 26 Aug 2015 20:02:27 +0200 From: Geert Uytterhoeven To: Kuninori Morimoto , Takeshi Kihara , Laurent Pinchart , Linus Walleij , Simon Horman , Magnus Damm Cc: linux-sh@vger.kernel.org, linux-gpio@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 2/5] pinctrl: sh-pfc: r8a7795: Extend SCIF2 pin data Date: Wed, 26 Aug 2015 20:02:21 +0200 Message-Id: <1440612144-16877-3-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1440612144-16877-1-git-send-email-geert+renesas@glider.be> References: <1440612144-16877-1-git-send-email-geert+renesas@glider.be> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add missing alternative data pins. Note that this renames "scif2_data" to "scif2_data_a", and thus requires a DTS update. Signed-off-by: Geert Uytterhoeven --- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c index 459929d215f9b8aa..83cce48da9f928b7 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c @@ -2288,11 +2288,11 @@ static const unsigned int scif1_data_b_mux[] = { RX1_B_MARK, TX1_B_MARK, }; /* - SCIF2 ------------------------------------------------------------------ */ -static const unsigned int scif2_data_pins[] = { +static const unsigned int scif2_data_a_pins[] = { /* RX, TX */ RCAR_GP_PIN(5, 11), RCAR_GP_PIN(5, 10), }; -static const unsigned int scif2_data_mux[] = { +static const unsigned int scif2_data_a_mux[] = { RX2_A_MARK, TX2_A_MARK, }; static const unsigned int scif2_clk_pins[] = { @@ -2302,6 +2302,13 @@ static const unsigned int scif2_clk_pins[] = { static const unsigned int scif2_clk_mux[] = { SCK2_MARK, }; +static const unsigned int scif2_data_b_pins[] = { + /* RX, TX */ + RCAR_GP_PIN(5, 15), RCAR_GP_PIN(5, 16), +}; +static const unsigned int scif2_data_b_mux[] = { + RX2_B_MARK, TX2_B_MARK, +}; /* - SCIF3 ------------------------------------------------------------------ */ static const unsigned int scif3_data_a_pins[] = { /* RX, TX */ @@ -2793,8 +2800,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(scif1_clk), SH_PFC_PIN_GROUP(scif1_ctrl), SH_PFC_PIN_GROUP(scif1_data_b), - SH_PFC_PIN_GROUP(scif2_data), + SH_PFC_PIN_GROUP(scif2_data_a), SH_PFC_PIN_GROUP(scif2_clk), + SH_PFC_PIN_GROUP(scif2_data_b), SH_PFC_PIN_GROUP(scif3_data_a), SH_PFC_PIN_GROUP(scif3_clk), SH_PFC_PIN_GROUP(scif3_ctrl), @@ -2992,8 +3000,9 @@ static const char * const scif1_groups[] = { }; static const char * const scif2_groups[] = { - "scif2_data", + "scif2_data_a", "scif2_clk", + "scif2_data_b", }; static const char * const scif3_groups[] = {