Commit 580d1712 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

Merge patch series "can: rcar_canfd: Small improvements and cleanups" 

Geert Uytterhoeven <geert+renesas@glider.be> says:

This series contains some improvements and cleanups for the R-Car
CAN-FD driver. It has been tested on R-Car V4H (White Hawk and White
Hawk Single).

Link: https://lore.kernel.org/all/cover.1716973640.git.geert+renesas@glider.be


[mkl: fixed typo in cover letter]
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parents 94833add f9a83965

drivers/net/can/rcar/rcar_canfd.c

+16 −25
Original line number Diff line number Diff line
@@ -508,12 +508,6 @@ 
 */

#define RCANFD_CFFIFO_IDX		0



/* fCAN clock select register settings */

enum rcar_canfd_fcanclk {

	RCANFD_CANFDCLK = 0,		/* CANFD clock */

	RCANFD_EXTCLK,			/* Externally input clock */

};



struct rcar_canfd_global;



struct rcar_canfd_hw_info {
@@ -545,8 +539,8 @@ struct rcar_canfd_global { 
	struct platform_device *pdev;	/* Respective platform device */

	struct clk *clkp;		/* Peripheral clock */

	struct clk *can_clk;		/* fCAN clock */

	enum rcar_canfd_fcanclk fcan;	/* CANFD or Ext clock */

	unsigned long channels_mask;	/* Enabled channels mask */

	bool extclk;			/* CANFD or Ext clock */

	bool fdmode;			/* CAN FD or Classical CAN only mode */

	struct reset_control *rstc1;

	struct reset_control *rstc2;
@@ -633,28 +627,28 @@ static inline void rcar_canfd_update(u32 mask, u32 val, u32 __iomem *reg) 


static inline u32 rcar_canfd_read(void __iomem *base, u32 offset)

{

	return readl(base + (offset));

	return readl(base + offset);

}



static inline void rcar_canfd_write(void __iomem *base, u32 offset, u32 val)

{

	writel(val, base + (offset));

	writel(val, base + offset);

}



static void rcar_canfd_set_bit(void __iomem *base, u32 reg, u32 val)

{

	rcar_canfd_update(val, val, base + (reg));

	rcar_canfd_update(val, val, base + reg);

}



static void rcar_canfd_clear_bit(void __iomem *base, u32 reg, u32 val)

{

	rcar_canfd_update(val, 0, base + (reg));

	rcar_canfd_update(val, 0, base + reg);

}



static void rcar_canfd_update_bit(void __iomem *base, u32 reg,

				  u32 mask, u32 val)

{

	rcar_canfd_update(mask, val, base + (reg));

	rcar_canfd_update(mask, val, base + reg);

}



static void rcar_canfd_get_data(struct rcar_canfd_channel *priv,
@@ -665,7 +659,7 @@ static void rcar_canfd_get_data(struct rcar_canfd_channel *priv, 
	lwords = DIV_ROUND_UP(cf->len, sizeof(u32));

	for (i = 0; i < lwords; i++)

		*((u32 *)cf->data + i) =

			rcar_canfd_read(priv->base, off + (i * sizeof(u32)));

			rcar_canfd_read(priv->base, off + i * sizeof(u32));

}



static void rcar_canfd_put_data(struct rcar_canfd_channel *priv,
@@ -675,7 +669,7 @@ static void rcar_canfd_put_data(struct rcar_canfd_channel *priv, 


	lwords = DIV_ROUND_UP(cf->len, sizeof(u32));

	for (i = 0; i < lwords; i++)

		rcar_canfd_write(priv->base, off + (i * sizeof(u32)),

		rcar_canfd_write(priv->base, off + i * sizeof(u32),

				 *((u32 *)cf->data + i));

}
@@ -777,7 +771,7 @@ static void rcar_canfd_configure_controller(struct rcar_canfd_global *gpriv) 
		cfg |= RCANFD_GCFG_CMPOC;



	/* Set External Clock if selected */

	if (gpriv->fcan != RCANFD_CANFDCLK)

	if (gpriv->extclk)

		cfg |= RCANFD_GCFG_DCS;



	rcar_canfd_set_bit(gpriv->base, RCANFD_GCFG, cfg);
@@ -1941,16 +1935,12 @@ static int rcar_canfd_probe(struct platform_device *pdev) 
			return dev_err_probe(dev, PTR_ERR(gpriv->can_clk),

					     "cannot get canfd clock\n");



		gpriv->fcan = RCANFD_CANFDCLK;



		/* CANFD clock may be further divided within the IP */

		fcan_freq = clk_get_rate(gpriv->can_clk) / info->postdiv;

	} else {

		gpriv->fcan = RCANFD_EXTCLK;

	}

		fcan_freq = clk_get_rate(gpriv->can_clk);



	if (gpriv->fcan == RCANFD_CANFDCLK)

		/* CANFD clock is further divided by (1/2) within the IP */

		fcan_freq /= info->postdiv;

		gpriv->extclk = true;

	}



	addr = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(addr)) {
@@ -2059,8 +2049,9 @@ static int rcar_canfd_probe(struct platform_device *pdev) 
	}



	platform_set_drvdata(pdev, gpriv);

	dev_info(dev, "global operational state (clk %d, fdmode %d)\n",

		 gpriv->fcan, gpriv->fdmode);

	dev_info(dev, "global operational state (%s clk, %s mode)\n",

		 gpriv->extclk ? "ext" : "canfd",

		 gpriv->fdmode ? "fd" : "classical");

	return 0;



fail_channel: