From patchwork Sun Nov 18 17:29:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 999527 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Zg0j/nMZ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42yf8y5nFFz9s6w for ; Mon, 19 Nov 2018 04:29:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726366AbeKSDuL (ORCPT ); Sun, 18 Nov 2018 22:50:11 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:46173 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727120AbeKSDuL (ORCPT ); Sun, 18 Nov 2018 22:50:11 -0500 Received: by mail-wr1-f65.google.com with SMTP id l9so16703678wrt.13; Sun, 18 Nov 2018 09:29:20 -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=J3OiH6SQ+04PO9sNCNIYcxyy5CrtJFVfSoQy6XGY9Jk=; b=Zg0j/nMZ4rkuQf1GBaucf31Yz8gcVh1InWlFRHhOnz7aK8LuY7t4NqG1odKvKDRi9H bhUAfXBYYiCWAvFYHNkCRSpNOzO64Sx33MRMPeTCZkwHDnJfXEob22LZ0O52FoQ09PvI izHnmmLBBKpWTdLYGKPuMosSjnFSPVqwOAxXqea7Cc2kxfUrhwJyTNzum50MsSMzGAqK 3jXlwIsIgnhzaarziaU2L3LbGCcU8gfR3PT5EsjHaMIHrvxBLj46LuDMCOCSLdk3XM1W yciX/TiiPLyMX8SI9jfEBEnhOLmJ2Bgd0729rQOgOWy1bPZE0AF90mkFtdh2zoA6Un8j eIHg== 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=J3OiH6SQ+04PO9sNCNIYcxyy5CrtJFVfSoQy6XGY9Jk=; b=BT8WW1/oeujS8wIlrYHA6OLXlkXg/X6StcUNT6tEury8JOHZ2kiqR86Uwdk6dg9d6B TxeUoBCJb5DpU2YqIxm4Y4Gi49LcbuvsPe/AyQI4NI9jIXL1kLEqJVCS39Yn864KNmy0 y4a8ZhZ6Vj72tAlFoSDspWf855I3DaRdp2soXGnHlboJegTCInIz5Hsv2WPi0pEZQ9fl xDS49ZEZdy9dJB3xjo7BHfDxLI76XKiHJNfuwxTLrsD/othL47UL0i45CUg0owt9oscn kQLQ1dzGSxIkeqFt4v0j8Gt3jy0GMcLTajoNWeARuej8MRB85+o3XPmxwskyEhTWXXes QDQQ== X-Gm-Message-State: AGRZ1gIM/cqwLWrDXe2swNpRMRInRQvU/30JIiu0SOY7JPZZmWD0u+uU ScAkGyJw2mGwqNqkpWL5/hJZjoNS X-Google-Smtp-Source: AJdET5fU6D5SfFZSD4G4kW+NDBM9D2i1GQlQRu3y2oBz/jbJc+iejufKJwbHlHmEniSll1V01gjSew== X-Received: by 2002:a5d:4bd2:: with SMTP id l18-v6mr15790603wrt.168.1542562159642; Sun, 18 Nov 2018 09:29:19 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Nov 2018 09:29:18 -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 2/4] pinctrl: sh-pfc: r8a77965: Add CAN FD pins, groups and functions Date: Sun, 18 Nov 2018 18:29:01 +0100 Message-Id: <20181118172903.4481-2-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-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Takeshi Kihara This patch adds CAN FD{0,1} pins, groups and functions to the R8A77965 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-r8a77965.c | 42 +++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a77965.c b/drivers/pinctrl/sh-pfc/pfc-r8a77965.c index 759b10e91d74..e26d101fe51c 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a77965.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a77965.c @@ -1822,6 +1822,34 @@ static const unsigned int can_clk_mux[] = { CAN_CLK_MARK, }; +/* - CAN FD --------------------------------------------------------------- */ +static const unsigned int canfd0_data_a_pins[] = { + /* TX, RX */ + RCAR_GP_PIN(1, 23), RCAR_GP_PIN(1, 24), +}; + +static const unsigned int canfd0_data_a_mux[] = { + CANFD0_TX_A_MARK, CANFD0_RX_A_MARK, +}; + +static const unsigned int canfd0_data_b_pins[] = { + /* TX, RX */ + RCAR_GP_PIN(2, 0), RCAR_GP_PIN(2, 1), +}; + +static const unsigned int canfd0_data_b_mux[] = { + CANFD0_TX_B_MARK, CANFD0_RX_B_MARK, +}; + +static const unsigned int canfd1_data_pins[] = { + /* TX, RX */ + RCAR_GP_PIN(1, 22), RCAR_GP_PIN(1, 26), +}; + +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] */ @@ -3796,6 +3824,9 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { SH_PFC_PIN_GROUP(can0_data_b), SH_PFC_PIN_GROUP(can1_data), SH_PFC_PIN_GROUP(can_clk), + SH_PFC_PIN_GROUP(canfd0_data_a), + SH_PFC_PIN_GROUP(canfd0_data_b), + SH_PFC_PIN_GROUP(canfd1_data), SH_PFC_PIN_GROUP(du_rgb666), SH_PFC_PIN_GROUP(du_rgb888), SH_PFC_PIN_GROUP(du_clk_out_0), @@ -4091,6 +4122,15 @@ static const char * const can_clk_groups[] = { "can_clk", }; +static const char * const canfd0_groups[] = { + "canfd0_data_a", + "canfd0_data_b", +}; + +static const char * const canfd1_groups[] = { + "canfd1_data", +}; + static const char * const du_groups[] = { "du_rgb666", "du_rgb888", @@ -4453,6 +4493,8 @@ static const struct sh_pfc_function pinmux_functions[] = { 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(hscif0), SH_PFC_FUNCTION(hscif1),