On 2/27/19 9:46 AM, Marc Kleine-Budde wrote: > On 12/13/18 8:07 AM, Joakim Zhang wrote: >> The patch set intends to add support for PE clock source select. The >> FlexCAN controller can parse "fsl,clk-source" property from device tree >> to select clock source. >> >> Dong Aisheng (2): >> Documentation: can: flexcan: add PE clock source property to device >> tree >> can: flexcan: add support for PE clock source select >> >> .../bindings/net/can/fsl-flexcan.txt | 8 ++++++++ >> drivers/net/can/flexcan.c | 18 ++++++++++++++---- >> 2 files changed, 22 insertions(+), 4 deletions(-) > > Added to linux-can-next. With one change: > @@ -1369,7 +1371,10 @@ static int register_flexcandev(struct net_device *dev) > goto out_clks_disable; > > reg = priv->read(®s->ctrl); > - reg |= FLEXCAN_CTRL_CLK_SRC; > + if (priv->clk_src) > + reg |= FLEXCAN_CTRL_CLK_SRC; > + else > + reg &= ~FLEXCAN_CTRL_CLK_SRC; ...the FLEXCAN_CTRL_CLK_SRC bit is cleared now. Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
Attachment:
signature.asc
Description: OpenPGP digital signature