[PATCH 4/8] can: rcar_canfd: Allow the CAN FD clock to be sourced from fck
Claudiu Beznea <[email protected]>
| Newsgroups | org.kernel.vger.linux-renesas-soc,org.kernel.vger.linux-can,org.kernel.vger.linux-clk,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
From: Claudiu Beznea <[email protected]> On the Renesas RZ/G3S, the CAN FD clock can be sourced either from fck (the peripheral clock) or from an external clock (can_clk). When fck is used, it is divided internally by the CAN FD controller. Adjust the existing canfd clock handling code to support the RZ/G3S CAN. The existing struct rcar_canfd_hw_info instances were updated to address the request in the Link discussion. Link: https://lore.kernel.org/all/[email protected] Signed-off-by: Claudiu Beznea <[email protected]> --- drivers/net/can/rcar/rcar_canfd.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c index 879f31c97276..75512d41e3ee 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c @@ -444,6 +444,7 @@ struct rcar_canfd_hw_info { unsigned ch_interface_mode:1; /* Has channel interface mode */ unsigned shared_can_regs:1; /* Has shared classical can registers */ unsigned external_clk:1; /* Has external clock */ + unsigned fcan_pclk:1; /* Has fcan sourced from pclk. */ }; /* Channel priv data */ @@ -617,6 +618,7 @@ static const struct rcar_canfd_hw_info rcar_gen3_hw_info = { .ch_interface_mode = 0, .shared_can_regs = 0, .external_clk = 1, + .fcan_pclk = 0, }; static const struct rcar_canfd_hw_info rcar_gen4_hw_info = { @@ -634,6 +636,7 @@ static const struct rcar_canfd_hw_info rcar_gen4_hw_info = { .ch_interface_mode = 1, .shared_can_regs = 1, .external_clk = 1, + .fcan_pclk = 0, }; static const struct rcar_canfd_hw_info rzg2l_hw_info = { @@ -651,6 +654,7 @@ static const struct rcar_canfd_hw_info rzg2l_hw_info = { .ch_interface_mode = 0, .shared_can_regs = 0, .external_clk = 1, + .fcan_pclk = 0, }; static const struct rcar_canfd_hw_info r9a09g047_hw_info = { @@ -668,6 +672,7 @@ static const struct rcar_canfd_hw_info r9a09g047_hw_info = { .ch_interface_mode = 1, .shared_can_regs = 1, .external_clk = 0, + .fcan_pclk = 0, }; static const struct rcar_canfd_hw_info r9a09g077_hw_info = { @@ -685,6 +690,7 @@ static const struct rcar_canfd_hw_info r9a09g077_hw_info = { .ch_interface_mode = 1, .shared_can_regs = 1, .external_clk = 1, + .fcan_pclk = 0, }; /* Helper functions */ @@ -2191,13 +2197,18 @@ static int rcar_canfd_probe(struct platform_device *pdev) */ gpriv->can_clk = devm_clk_get(dev, "can_clk"); if (IS_ERR(gpriv->can_clk) || (clk_get_rate(gpriv->can_clk) == 0)) { - gpriv->can_clk = devm_clk_get(dev, "canfd"); + gpriv->can_clk = devm_clk_get_optional(dev, "canfd"); if (IS_ERR(gpriv->can_clk)) return dev_err_probe(dev, PTR_ERR(gpriv->can_clk), "cannot get canfd clock\n"); + if (gpriv->can_clk) + fcan_freq = clk_get_rate(gpriv->can_clk); + else if (info->fcan_pclk) + fcan_freq = clk_get_rate(gpriv->clkp); + /* CANFD clock may be further divided within the IP */ - fcan_freq = clk_get_rate(gpriv->can_clk) / info->postdiv; + fcan_freq /= info->postdiv; } else { fcan_freq = clk_get_rate(gpriv->can_clk); gpriv->extclk = gpriv->info->external_clk; -- 2.43.0