From patchwork Thu Nov 16 03:14:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Kaneko X-Patchwork-Id: 10060623 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EA395604D4 for ; Thu, 16 Nov 2017 03:15:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA81A2A648 for ; Thu, 16 Nov 2017 03:15:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF2CB2A65C; Thu, 16 Nov 2017 03:15:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CBCF2A648 for ; Thu, 16 Nov 2017 03:15:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759067AbdKPDPo (ORCPT ); Wed, 15 Nov 2017 22:15:44 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:52176 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759178AbdKPDPh (ORCPT ); Wed, 15 Nov 2017 22:15:37 -0500 Received: by mail-pg0-f66.google.com with SMTP id p9so19543240pgc.8; Wed, 15 Nov 2017 19:15:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ql05nMBUnAD39LsnljVF+HAF+aX87ijZTnRoYSaNJC0=; b=pP0dgIFEIVgeImhok2jcZceAhZrGMDfaQ/12YVPJ32+Bo+XojsT4vh4uTRXkgEdDzM MndcozpFeKYDda4ZGO+9s4V2JYyfeGSz7cviUYAtvSgFucgPTnW83W1BB/H4xPvWXlFj qsS/J3m9LHTejqr+s00cW4y4idyBZQDzRstkoT5P4BAHI+tVQUTdwZg819n9volijxq5 AopioUueFSynkOKLjkjYjv1dKDontR51wrHuREEsMkDyHd7Idkl9lWB+5xhIFj4pehvv c24w0jeOAF9IeKB/ggRkKUR5OFtNnuBW8YUELGnxXRDTlxmhmQ4r0Jj90T08NTb+VrJv sW4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ql05nMBUnAD39LsnljVF+HAF+aX87ijZTnRoYSaNJC0=; b=MMCR6z7zvOfzdEJthOVM9v9OEWhFxuc/meorplKo7aLN3zDh7KWd4TZKZVKLRwYy7i qGfoJDCG5DXQrqzjtL3eWDLDZSgZeXU2Qny3cIULPdcfUXwoLyDjuTMTpt6KfTgcz8Ca uJmA2b4hTJqUD9IE+qoIRpnWcTwbllo3r6owrNUbCqEhtIMgMBdYaeZXt3gsCk218SER e0RagvV3t/2Z70xOpoE4m6Sw9NRqipR1p6n57g+fg4XeNc5CFEHjRWqZa75M9PoBqYs9 cvpdDcUYV/ScEHQ78MkRbtdaN91HtKRgU1R+uWX9zhenMxXWm9LUeoDXze6VEmXPt3iU q4SA== X-Gm-Message-State: AJaThX4D3Zfdke48jMf9hGyl4m3UjTh5epKQMWrvwIEHfTFoFnZUGyVl cJxXN3rkJnvZHmV+4rFIjxvKtQ== X-Google-Smtp-Source: AGs4zMaw+O+cfUKnYsS2A3rPA61lZkhO7Jnr4rjVad0dFscE9iCuSErJSTjo7rhAsdpGA7WjNy8Shw== X-Received: by 10.84.131.40 with SMTP id 37mr259823pld.302.1510802136084; Wed, 15 Nov 2017 19:15:36 -0800 (PST) Received: from macc.flets-east.jp (p8035-ipngn10101marunouchi.tokyo.ocn.ne.jp. [114.164.103.35]) by smtp.gmail.com with ESMTPSA id k2sm147021pff.126.2017.11.15.19.15.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Nov 2017 19:15:35 -0800 (PST) From: Yoshihiro Kaneko To: linux-gpio@vger.kernel.org Cc: Linus Walleij , Laurent Pinchart , Geert Uytterhoeven , Simon Horman , Magnus Damm , linux-renesas-soc@vger.kernel.org Subject: [PATCH] pinctrl: sh-pfc: r8a7795: Add GP-1-28 port pin support Date: Thu, 16 Nov 2017 12:14:51 +0900 Message-Id: <1510802091-30535-1-git-send-email-ykaneko0929@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Takeshi Kihara This patch supports GP-1-28 port pin of R8A7795 ES2.0 SoC added in Rev.0.54E of the R-Car Gen3 Hardware User's Manual or later version. Signed-off-by: Takeshi Kihara Signed-off-by: Yoshihiro Kaneko Reviewed-by: Geert Uytterhoeven --- This patch is based on the for-next branch of linux-pinctrl tree. drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c index d1cec6d..85699fb 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c @@ -20,7 +20,7 @@ #define CPU_ALL_PORT(fn, sfx) \ PORT_GP_CFG_16(0, fn, sfx, CFG_FLAGS), \ - PORT_GP_CFG_28(1, fn, sfx, CFG_FLAGS), \ + PORT_GP_CFG_29(1, fn, sfx, CFG_FLAGS), \ PORT_GP_CFG_15(2, fn, sfx, CFG_FLAGS), \ PORT_GP_CFG_12(3, fn, sfx, CFG_FLAGS | SH_PFC_PIN_CFG_IO_VOLTAGE), \ PORT_GP_CFG_1(3, 12, fn, sfx, CFG_FLAGS), \ @@ -55,6 +55,7 @@ #define GPSR0_0 F_(D0, IP5_15_12) /* GPSR1 */ +#define GPSR1_28 FM(CLKOUT) #define GPSR1_27 F_(EX_WAIT0_A, IP5_11_8) #define GPSR1_26 F_(WE1_N, IP5_7_4) #define GPSR1_25 F_(WE0_N, IP5_3_0) @@ -368,7 +369,7 @@ GPSR6_31 \ GPSR6_30 \ GPSR6_29 \ - GPSR6_28 \ + GPSR1_28 GPSR6_28 \ GPSR1_27 GPSR6_27 \ GPSR1_26 GPSR6_26 \ GPSR1_25 GPSR5_25 GPSR6_25 \ @@ -548,7 +549,7 @@ FM(AVB_TX_CTL) FM(AVB_TXC) FM(AVB_TD0) FM(AVB_TD1) FM(AVB_TD2) FM(AVB_TD3) \ FM(AVB_RX_CTL) FM(AVB_RXC) FM(AVB_RD0) FM(AVB_RD1) FM(AVB_RD2) FM(AVB_RD3) \ FM(AVB_TXCREFCLK) FM(AVB_MDIO) \ - FM(CLKOUT) FM(PRESETOUT) \ + FM(PRESETOUT) \ FM(DU_DOTCLKIN0) FM(DU_DOTCLKIN1) FM(DU_DOTCLKIN2) FM(DU_DOTCLKIN3) \ FM(TMS) FM(TDO) FM(ASEBRK) FM(MLB_REF) FM(TDI) FM(TCK) FM(TRST) FM(EXTALR) @@ -587,6 +588,7 @@ enum { PINMUX_SINGLE(AVS1), PINMUX_SINGLE(AVS2), + PINMUX_SINGLE(CLKOUT), PINMUX_SINGLE(HDMI0_CEC), PINMUX_SINGLE(HDMI1_CEC), PINMUX_SINGLE(I2C_SEL_0_1), @@ -4644,7 +4646,7 @@ enum { 0, 0, 0, 0, 0, 0, - 0, 0, + GP_1_28_FN, GPSR1_28, GP_1_27_FN, GPSR1_27, GP_1_26_FN, GPSR1_26, GP_1_25_FN, GPSR1_25, @@ -5246,7 +5248,7 @@ enum { { RCAR_GP_PIN(1, 19), 0, 3 }, /* A19 */ } }, { PINMUX_DRIVE_REG("DRVCTRL8", 0xe6060320) { - { PIN_NUMBER('F', 1), 28, 3 }, /* CLKOUT */ + { RCAR_GP_PIN(1, 28), 28, 3 }, /* CLKOUT */ { RCAR_GP_PIN(1, 20), 24, 3 }, /* CS0 */ { RCAR_GP_PIN(1, 21), 20, 3 }, /* CS1_A26 */ { RCAR_GP_PIN(1, 22), 16, 3 }, /* BS */