From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D896D200CB; Wed, 12 Mar 2025 17:45:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741801525; cv=none; b=kFT+pwnqIOdqqnusXU26smRy/0bXwPBhJgMGLsW8fB1Ukq9XMUaHX4C3mURf4lbpJsAduHTTuuxaD76PomPHPyUBtauutocR5tZ0wZhemN0K1p4EJxYk8iWMrGcJbdnl7xdPP0rsBsEQETS+xtKXBuBH+8lZUGrYE0G77nxID40= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741801525; c=relaxed/simple; bh=BtOhGRVLO/4z5tXwtnomJn5XJEhbKXaC1bZE6yJRkys=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ntRCkmTa1f/BY2HhbTCey9rJHy9cZiJ3wq4/qkzlbeGK861RvJEdF+d/muapT57V6wjlCwVzhh7hhrIeRKMqMHQgmjw8NB0/rj3G0GEaTlri2juu4dfz9NxbUH2mkt2ycKEKuTsNY0qN8XHlOhdIZzgsTEh41W/MYXkhgZ3GXeY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ntj7boR7; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Ntj7boR7" Received: by smtp.kernel.org (Postfix) with ESMTPS id 6BEA4C4CEEB; Wed, 12 Mar 2025 17:45:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741801524; bh=BtOhGRVLO/4z5tXwtnomJn5XJEhbKXaC1bZE6yJRkys=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Ntj7boR7aNijqOwkm7tVBWyJ7pTKcmoMJFSX0Vi1De5xsSZzEnbRMujiFSiLoTCug c8ZmN64aTwni4zjkt8rZlgEIq21Ly68tEUXYFy3UuSsmYSMg94brR0uq1oFtci2d3n 290x3XW6k1Wm/deRdL6oLmwavEXB2+zdalC+NdkwTq5tPTumh0yV4v6nCJ9q7s3Yd8 0cAShO2b44hFn8UR0SB0SGIKVXoT89w36CbYSY/1KMkgvHoaEv8GnoLgptMvyWDdIX RM8RiOSvA8/7H5DCO0JYjS8EF/a1U2DD0PJsIRv636736CPi6WH0UmfiJUnSQKiszd oSqEOkRy20bqA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 559A8C35FF1; Wed, 12 Mar 2025 17:45:24 +0000 (UTC) From: Dimitri Fedrau via B4 Relay Date: Wed, 12 Mar 2025 18:45:23 +0100 Subject: [PATCH RESEND v4 2/2] can: flexcan: add transceiver capabilities Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250312-flexcan-add-transceiver-caps-v4-2-29e89ae0225a@liebherr.com> References: <20250312-flexcan-add-transceiver-caps-v4-0-29e89ae0225a@liebherr.com> In-Reply-To: <20250312-flexcan-add-transceiver-caps-v4-0-29e89ae0225a@liebherr.com> To: Marc Kleine-Budde , Vincent Mailhol , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-can@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Dimitri Fedrau , Dimitri Fedrau X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1741801523; l=3555; i=dimitri.fedrau@liebherr.com; s=20241202; h=from:subject:message-id; bh=kSxxiQHxl//wCevFJfiq2EaHcqBYYuWBjHktSM+Fwds=; b=AyaNOZsIKwCr/iDwY2md+sZf0aTIm3EaIUXHX7cY4JKTqFM9nvuYvL0r9TSbYDJSrqWDj64sA /klYUbJb9PwCwOMH+b/ZXl54OvwSn3huH7mu48di2Ugu7AYfH4mqHKY X-Developer-Key: i=dimitri.fedrau@liebherr.com; a=ed25519; pk=rT653x09JSQvotxIqQl4/XiI4AOiBZrdOGvxDUbb5m8= X-Endpoint-Received: by B4 Relay for dimitri.fedrau@liebherr.com/20241202 with auth_id=290 X-Original-From: Dimitri Fedrau Reply-To: dimitri.fedrau@liebherr.com From: Dimitri Fedrau Currently the flexcan driver does only support adding PHYs by using the "old" regulator bindings. Add support for CAN transceivers as a PHY. Add the capability to ensure that the PHY is in operational state when the link is set to an "up" state. Signed-off-by: Dimitri Fedrau --- drivers/net/can/flexcan/flexcan-core.c | 27 +++++++++++++++++++++------ drivers/net/can/flexcan/flexcan.h | 1 + 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexcan/flexcan-core.c index b347a1c93536d54efaa5f7d3347bd47c20860b3e..7588cb54a909af065522ddbcb06cc3acb9669893 100644 --- a/drivers/net/can/flexcan/flexcan-core.c +++ b/drivers/net/can/flexcan/flexcan-core.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -644,18 +645,22 @@ static void flexcan_clks_disable(const struct flexcan_priv *priv) static inline int flexcan_transceiver_enable(const struct flexcan_priv *priv) { - if (!priv->reg_xceiver) - return 0; + if (priv->reg_xceiver) + return regulator_enable(priv->reg_xceiver); + else if (priv->transceiver) + return phy_power_on(priv->transceiver); - return regulator_enable(priv->reg_xceiver); + return 0; } static inline int flexcan_transceiver_disable(const struct flexcan_priv *priv) { - if (!priv->reg_xceiver) - return 0; + if (priv->reg_xceiver) + return regulator_disable(priv->reg_xceiver); + else if (priv->transceiver) + return phy_power_off(priv->transceiver); - return regulator_disable(priv->reg_xceiver); + return 0; } static int flexcan_chip_enable(struct flexcan_priv *priv) @@ -2086,6 +2091,7 @@ static int flexcan_probe(struct platform_device *pdev) struct net_device *dev; struct flexcan_priv *priv; struct regulator *reg_xceiver; + struct phy *transceiver; struct clk *clk_ipg = NULL, *clk_per = NULL; struct flexcan_regs __iomem *regs; struct flexcan_platform_data *pdata; @@ -2101,6 +2107,11 @@ static int flexcan_probe(struct platform_device *pdev) else if (IS_ERR(reg_xceiver)) return PTR_ERR(reg_xceiver); + transceiver = devm_phy_optional_get(&pdev->dev, NULL); + if (IS_ERR(transceiver)) + return dev_err_probe(&pdev->dev, PTR_ERR(transceiver), + "failed to get phy\n"); + if (pdev->dev.of_node) { of_property_read_u32(pdev->dev.of_node, "clock-frequency", &clock_freq); @@ -2198,6 +2209,10 @@ static int flexcan_probe(struct platform_device *pdev) priv->clk_per = clk_per; priv->clk_src = clk_src; priv->reg_xceiver = reg_xceiver; + priv->transceiver = transceiver; + + if (transceiver) + priv->can.bitrate_max = transceiver->attrs.max_link_rate; if (priv->devtype_data.quirks & FLEXCAN_QUIRK_NR_IRQ_3) { priv->irq_boff = platform_get_irq(pdev, 1); diff --git a/drivers/net/can/flexcan/flexcan.h b/drivers/net/can/flexcan/flexcan.h index 2cf886618c9621166173b865f266830b3f6c1fb0..16692a2502eba26575eeeec83dfffdf35f07b034 100644 --- a/drivers/net/can/flexcan/flexcan.h +++ b/drivers/net/can/flexcan/flexcan.h @@ -107,6 +107,7 @@ struct flexcan_priv { struct clk *clk_per; struct flexcan_devtype_data devtype_data; struct regulator *reg_xceiver; + struct phy *transceiver; struct flexcan_stop_mode stm; int irq_boff; -- 2.39.5