From patchwork Sun Nov 18 17:29:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 10687995 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-2.web.codeaurora.org (Postfix) with ESMTP id 70B0014BD for ; Sun, 18 Nov 2018 17:29:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50C2C29AF9 for ; Sun, 18 Nov 2018 17:29:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 446C929AFB; Sun, 18 Nov 2018 17:29:26 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,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 0DDDC29AFA for ; Sun, 18 Nov 2018 17:29:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727166AbeKSDuO (ORCPT ); Sun, 18 Nov 2018 22:50:14 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:51288 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727131AbeKSDuO (ORCPT ); Sun, 18 Nov 2018 22:50:14 -0500 Received: by mail-wm1-f65.google.com with SMTP id w7-v6so3078214wmc.1; Sun, 18 Nov 2018 09:29:23 -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:in-reply-to:references; bh=7282K/48A/m/BG1sCrjCAL5xLAed06/0uYgQFDwABiU=; b=HdYY1+3mjchkZR5vbNcipmOdyQqEwjcR96QcDWBPELaUD+JATFzQqnAe2uhkfFM3WK SqI6XqChcC1oWE1h0zwywSvFD+sXJrsVFE7E53407T02SbI+5VYwXs7wOufu8T5TTmb3 NEfQdlbC/maQp7V5C5NuR2SgAMx/NVQIR3xTxChd3D3LiewiDG0mpxAXlGS2qipHHAls M86CP51fbuN17J9UihJq6Ucak6eWV82+8VEGYy657qs5BsjqYgCYs7XlTWNkyAJ8nZEX GAbyWimIKUb0NlulyzNkllPFXXonUIlSlOsatQezhq5kyNTVyiN7d7pWke7ut2XUdVGD c4CQ== 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:in-reply-to :references; bh=7282K/48A/m/BG1sCrjCAL5xLAed06/0uYgQFDwABiU=; b=jUT+KhVwIim5ZSor41zGvkFwoUmjZMEmLzcLmPaWOYJv5weVXWHPE4bwcN1DDB4kf9 bANvzgMX4lCt/HrjhhTOVtpy/XFhXTuZB1d/7V5OcYTUmwHr7WDfsSf2nDaGF6n7Z6D1 EXAaQolq4gGABMjepJ4fkTjAAtMPk0rJFIuAVMf904dM37uxj7VBoR9DoYjtKXi3uFTV vAB2gQFQ4tGXIy8sVUfCQz8d/gO+JSpsyuslwzHKU2d9Paijch5mvGPdig5v8899LINY mGq5QRen+e/SQVnZhgzRHsCP8NjCL/PjXeezlNIVn/sSZDTOjDKnhMHpezJAOBBo+7vt 99Pw== X-Gm-Message-State: AGRZ1gJCgmXrZUNwhXie1okzrs5Xkm1GaMQ3i17b+pNDBPQnXuyRAbEY MqCioXfheqj0AMLhwkNp5f8VRmUe X-Google-Smtp-Source: AFSGD/V8sdnkBVD3Vb1MSsUWY8Hac0Vdkfjt40E+ZxtEJ4VXIRkGd3AqCXXXdH6H/ExCsqMfnVh8Mg== X-Received: by 2002:a1c:d1cd:: with SMTP id i196mr4541244wmg.107.1542562162536; Sun, 18 Nov 2018 09:29:22 -0800 (PST) Received: from kurokawa.lan (ip-86-49-110-70.net.upcbroadband.cz. [86.49.110.70]) by smtp.gmail.com with ESMTPSA id n15sm3509746wrt.21.2018.11.18.09.29.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Nov 2018 09:29:21 -0800 (PST) From: Marek Vasut X-Google-Original-From: Marek Vasut To: linux-gpio@vger.kernel.org Cc: Takeshi Kihara , Marek Vasut , Geert Uytterhoeven , Simon Horman , Wolfram Sang , Yoshihiro Shimoda , linux-renesas-soc@vger.kernel.org Subject: [PATCH 4/4] pinctrl: sh-pfc: r8a77990: Add CAN FD pins, groups and functions Date: Sun, 18 Nov 2018 18:29:03 +0100 Message-Id: <20181118172903.4481-4-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181118172903.4481-1-marek.vasut+renesas@gmail.com> References: <20181118172903.4481-1-marek.vasut+renesas@gmail.com> 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 adds CAN FD{0,1} pins, groups and functions to the R8A77990 SoC. Signed-off-by: Takeshi Kihara Signed-off-by: Marek Vasut Cc: Geert Uytterhoeven Cc: Simon Horman Cc: Wolfram Sang Cc: Yoshihiro Shimoda Cc: linux-renesas-soc@vger.kernel.org Reviewed-by: Geert Uytterhoeven --- drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 35 +++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c index db000acc880c..96c2f4fcdb8e 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a77990.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a77990.c @@ -1404,6 +1404,25 @@ static const unsigned int can_clk_mux[] = { CAN_CLK_MARK, }; +/* - CAN FD --------------------------------------------------------------- */ +static const unsigned int canfd0_data_pins[] = { + /* TX, RX */ + RCAR_GP_PIN(0, 12), RCAR_GP_PIN(0, 13), +}; + +static const unsigned int canfd0_data_mux[] = { + CANFD0_TX_MARK, CANFD0_RX_MARK, +}; + +static const unsigned int canfd1_data_pins[] = { + /* TX, RX */ + RCAR_GP_PIN(0, 4), RCAR_GP_PIN(0, 7), +}; + +static const unsigned int canfd1_data_mux[] = { + CANFD1_TX_MARK, CANFD1_RX_MARK, +}; + /* - DU --------------------------------------------------------------------- */ static const unsigned int du_rgb666_pins[] = { /* R[7:2], G[7:2], B[7:2] */ @@ -2635,7 +2654,7 @@ static const unsigned int usb30_id_mux[] = { }; static const struct { - struct sh_pfc_pin_group common[143]; + struct sh_pfc_pin_group common[145]; struct sh_pfc_pin_group automotive[0]; } pinmux_groups = { .common = { @@ -2649,6 +2668,8 @@ static const struct { SH_PFC_PIN_GROUP(can0_data), SH_PFC_PIN_GROUP(can1_data), SH_PFC_PIN_GROUP(can_clk), + SH_PFC_PIN_GROUP(canfd0_data), + SH_PFC_PIN_GROUP(canfd1_data), SH_PFC_PIN_GROUP(du_rgb666), SH_PFC_PIN_GROUP(du_rgb888), SH_PFC_PIN_GROUP(du_clk_in_0), @@ -2807,6 +2828,14 @@ static const char * const can_clk_groups[] = { "can_clk", }; +static const char * const canfd0_groups[] = { + "canfd0_data", +}; + +static const char * const canfd1_groups[] = { + "canfd1_data", +}; + static const char * const du_groups[] = { "du_rgb666", "du_rgb888", @@ -3034,7 +3063,7 @@ static const char * const usb30_groups[] = { }; static const struct { - struct sh_pfc_function common[35]; + struct sh_pfc_function common[37]; struct sh_pfc_function automotive[0]; } pinmux_functions = { .common = { @@ -3042,6 +3071,8 @@ static const struct { SH_PFC_FUNCTION(can0), SH_PFC_FUNCTION(can1), SH_PFC_FUNCTION(can_clk), + SH_PFC_FUNCTION(canfd0), + SH_PFC_FUNCTION(canfd1), SH_PFC_FUNCTION(du), SH_PFC_FUNCTION(i2c1), SH_PFC_FUNCTION(i2c2),