Commit 7016198b authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

Merge patch series "can: tcan4x5x: Introduce tcan4552/4553" 

Markus Schneider-Pargmann <msp@baylibre.com> says:

This series introduces two new chips tcan-4552 and tcan-4553. The
generic driver works in general but needs a few small changes. These
are caused by the removal of wake and state pins.

Changes in v4:
- Use printk("... %pe\n", ERR_PTR(ret)) for new printks
- Link to v3: https://lore.kernel.org/lkml/20230721135009.1120562-1-msp@baylibre.com

Changes in v3:
- Rebased to v6.5-rc1
- Removed devicetree compatible check in tcan driver. The device version
  is now unconditionally detected using the ID2 register
- Link to v2: https://lore.kernel.org/lkml/20230621093103.3134655-1-msp@baylibre.com

Changes in v2:
- Update the binding documentation to specify tcan4552 and tcan4553 with
  the tcan4x5x as fallback
- Update the driver to use auto detection as well. If compatible differs
  from the ID2 register, use the ID2 register and print a warning.
- Small style changes
- Link to v1: https://lore.kernel.org/lkml/20230314151201.2317134-1-msp@baylibre.com

Link: https://lore.kernel.org/all/20230728141923.162477-1-msp@baylibre.com


Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parents 53b8d2be 35e7aaab

Documentation/devicetree/bindings/net/can/tcan4x5x.txt

+8 −3
Original line number Diff line number Diff line
@@ -4,7 +4,10 @@ Texas Instruments TCAN4x5x CAN Controller 
This file provides device node information for the TCAN4x5x interface contains.



Required properties:

	- compatible: "ti,tcan4x5x"

	- compatible:

		"ti,tcan4552", "ti,tcan4x5x"

		"ti,tcan4553", "ti,tcan4x5x" or

		"ti,tcan4x5x"

	- reg: 0

	- #address-cells: 1

	- #size-cells: 0
@@ -21,8 +24,10 @@ Optional properties: 
	- reset-gpios: Hardwired output GPIO. If not defined then software

		       reset.

	- device-state-gpios: Input GPIO that indicates if the device is in

			      a sleep state or if the device is active.

	- device-wake-gpios: Wake up GPIO to wake up the TCAN device.

			      a sleep state or if the device is active. Not

			      available with tcan4552/4553.

	- device-wake-gpios: Wake up GPIO to wake up the TCAN device. Not

			     available with tcan4552/4553.



Example:

tcan4x5x: tcan4x5x@0 {

drivers/net/can/m_can/m_can.c

+16 −0
Original line number Diff line number Diff line
@@ -1913,6 +1913,22 @@ static int register_m_can_dev(struct net_device *dev) 
	return register_candev(dev);

}



int m_can_check_mram_cfg(struct m_can_classdev *cdev, u32 mram_max_size)

{

	u32 total_size;



	total_size = cdev->mcfg[MRAM_TXB].off - cdev->mcfg[MRAM_SIDF].off +

			cdev->mcfg[MRAM_TXB].num * TXB_ELEMENT_SIZE;

	if (total_size > mram_max_size) {

		dev_err(cdev->dev, "Total size of mram config(%u) exceeds mram(%u)\n",

			total_size, mram_max_size);

		return -EINVAL;

	}



	return 0;

}

EXPORT_SYMBOL_GPL(m_can_check_mram_cfg);



static void m_can_of_parse_mram(struct m_can_classdev *cdev,

				const u32 *mram_config_vals)

{

drivers/net/can/m_can/m_can.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ int m_can_class_register(struct m_can_classdev *cdev); 
void m_can_class_unregister(struct m_can_classdev *cdev);

int m_can_class_get_clocks(struct m_can_classdev *cdev);

int m_can_init_ram(struct m_can_classdev *priv);

int m_can_check_mram_cfg(struct m_can_classdev *cdev, u32 mram_max_size);



int m_can_class_suspend(struct device *dev);

int m_can_class_resume(struct device *dev);

drivers/net/can/m_can/tcan4x5x-core.c

+120 −22
Original line number Diff line number Diff line
@@ -6,8 +6,9 @@ 


#define TCAN4X5X_EXT_CLK_DEF 40000000



#define TCAN4X5X_DEV_ID0 0x00

#define TCAN4X5X_DEV_ID1 0x04

#define TCAN4X5X_DEV_ID1 0x00

#define TCAN4X5X_DEV_ID1_TCAN 0x4e414354 /* ASCII TCAN */

#define TCAN4X5X_DEV_ID2 0x04

#define TCAN4X5X_REV 0x08

#define TCAN4X5X_STATUS 0x0C

#define TCAN4X5X_ERROR_STATUS_MASK 0x10
@@ -80,6 +81,7 @@ 
	 TCAN4X5X_MCAN_IR_RF1F)



#define TCAN4X5X_MRAM_START 0x8000

#define TCAN4X5X_MRAM_SIZE 0x800

#define TCAN4X5X_MCAN_OFFSET 0x1000



#define TCAN4X5X_CLEAR_ALL_INT 0xffffffff
@@ -102,6 +104,37 @@ 
#define TCAN4X5X_WD_3_S_TIMER BIT(29)

#define TCAN4X5X_WD_6_S_TIMER (BIT(28) | BIT(29))



struct tcan4x5x_version_info {

	const char *name;

	u32 id2_register;



	bool has_wake_pin;

	bool has_state_pin;

};



enum {

	TCAN4552 = 0,

	TCAN4553,

	TCAN4X5X,

};



static const struct tcan4x5x_version_info tcan4x5x_versions[] = {

	[TCAN4552] = {

		.name = "4552",

		.id2_register = 0x32353534,

	},

	[TCAN4553] = {

		.name = "4553",

		.id2_register = 0x32353534,

	},

	/* generic version with no id2_register at the end */

	[TCAN4X5X] = {

		.name = "generic",

		.has_wake_pin = true,

		.has_state_pin = true,

	},

};



static inline struct tcan4x5x_priv *cdev_to_priv(struct m_can_classdev *cdev)

{

	return container_of(cdev, struct tcan4x5x_priv, cdev);
@@ -253,11 +286,45 @@ static int tcan4x5x_disable_state(struct m_can_classdev *cdev) 
				  TCAN4X5X_DISABLE_INH_MSK, 0x01);

}



static int tcan4x5x_get_gpios(struct m_can_classdev *cdev)

static const struct tcan4x5x_version_info

*tcan4x5x_find_version(struct tcan4x5x_priv *priv)

{

	u32 val;

	int ret;



	ret = regmap_read(priv->regmap, TCAN4X5X_DEV_ID1, &val);

	if (ret)

		return ERR_PTR(ret);



	if (val != TCAN4X5X_DEV_ID1_TCAN) {

		dev_err(&priv->spi->dev, "Not a tcan device %x\n", val);

		return ERR_PTR(-ENODEV);

	}



	ret = regmap_read(priv->regmap, TCAN4X5X_DEV_ID2, &val);

	if (ret)

		return ERR_PTR(ret);



	for (int i = 0; i != ARRAY_SIZE(tcan4x5x_versions); ++i) {

		const struct tcan4x5x_version_info *vinfo = &tcan4x5x_versions[i];



		if (!vinfo->id2_register || val == vinfo->id2_register) {

			dev_info(&priv->spi->dev, "Detected TCAN device version %s\n",

				 vinfo->name);

			return vinfo;

		}

	}



	return &tcan4x5x_versions[TCAN4X5X];

}



static int tcan4x5x_get_gpios(struct m_can_classdev *cdev,

			      const struct tcan4x5x_version_info *version_info)

{

	struct tcan4x5x_priv *tcan4x5x = cdev_to_priv(cdev);

	int ret;



	if (version_info->has_wake_pin) {

		tcan4x5x->device_wake_gpio = devm_gpiod_get(cdev->dev, "device-wake",

							    GPIOD_OUT_HIGH);

		if (IS_ERR(tcan4x5x->device_wake_gpio)) {
@@ -266,6 +333,7 @@ static int tcan4x5x_get_gpios(struct m_can_classdev *cdev) 


			tcan4x5x_disable_wake(cdev);

		}

	}



	tcan4x5x->reset_gpio = devm_gpiod_get_optional(cdev->dev, "reset",

						       GPIOD_OUT_LOW);
@@ -276,6 +344,7 @@ static int tcan4x5x_get_gpios(struct m_can_classdev *cdev) 
	if (ret)

		return ret;



	if (version_info->has_state_pin) {

		tcan4x5x->device_state_gpio = devm_gpiod_get_optional(cdev->dev,

								      "device-state",

								      GPIOD_IN);
@@ -283,6 +352,7 @@ static int tcan4x5x_get_gpios(struct m_can_classdev *cdev) 
			tcan4x5x->device_state_gpio = NULL;

			tcan4x5x_disable_state(cdev);

		}

	}



	return 0;

}
@@ -298,6 +368,7 @@ static struct m_can_ops tcan4x5x_ops = { 


static int tcan4x5x_can_probe(struct spi_device *spi)

{

	const struct tcan4x5x_version_info *version_info;

	struct tcan4x5x_priv *priv;

	struct m_can_classdev *mcan_class;

	int freq, ret;
@@ -307,6 +378,10 @@ static int tcan4x5x_can_probe(struct spi_device *spi) 
	if (!mcan_class)

		return -ENOMEM;



	ret = m_can_check_mram_cfg(mcan_class, TCAN4X5X_MRAM_SIZE);

	if (ret)

		goto out_m_can_class_free_dev;



	priv = cdev_to_priv(mcan_class);



	priv->power = devm_regulator_get_optional(&spi->dev, "vsup");
@@ -327,6 +402,8 @@ static int tcan4x5x_can_probe(struct spi_device *spi) 


	/* Sanity check */

	if (freq < 20000000 || freq > TCAN4X5X_EXT_CLK_DEF) {

		dev_err(&spi->dev, "Clock frequency is out of supported range %d\n",

			freq);

		ret = -ERANGE;

		goto out_m_can_class_free_dev;

	}
@@ -345,28 +422,49 @@ static int tcan4x5x_can_probe(struct spi_device *spi) 
	/* Configure the SPI bus */

	spi->bits_per_word = 8;

	ret = spi_setup(spi);

	if (ret)

	if (ret) {

		dev_err(&spi->dev, "SPI setup failed %pe\n", ERR_PTR(ret));

		goto out_m_can_class_free_dev;

	}



	ret = tcan4x5x_regmap_init(priv);

	if (ret)

	if (ret) {

		dev_err(&spi->dev, "regmap init failed %pe\n", ERR_PTR(ret));

		goto out_m_can_class_free_dev;

	}



	ret = tcan4x5x_power_enable(priv->power, 1);

	if (ret)

	if (ret) {

		dev_err(&spi->dev, "Enabling regulator failed %pe\n",

			ERR_PTR(ret));

		goto out_m_can_class_free_dev;

	}



	ret = tcan4x5x_get_gpios(mcan_class);

	if (ret)

	version_info = tcan4x5x_find_version(priv);

	if (IS_ERR(version_info)) {

		ret = PTR_ERR(version_info);

		goto out_power;

	}



	ret = tcan4x5x_get_gpios(mcan_class, version_info);

	if (ret) {

		dev_err(&spi->dev, "Getting gpios failed %pe\n", ERR_PTR(ret));

		goto out_power;

	}



	ret = tcan4x5x_init(mcan_class);

	if (ret)

	if (ret) {

		dev_err(&spi->dev, "tcan initialization failed %pe\n",

			ERR_PTR(ret));

		goto out_power;

	}



	ret = m_can_class_register(mcan_class);

	if (ret)

	if (ret) {

		dev_err(&spi->dev, "Failed registering m_can device %pe\n",

			ERR_PTR(ret));

		goto out_power;

	}



	netdev_info(mcan_class->net, "TCAN4X5X successfully initialized.\n");

	return 0;

drivers/net/can/m_can/tcan4x5x-regmap.c

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ static const struct regmap_range tcan4x5x_reg_table_wr_range[] = { 
	regmap_reg_range(0x000c, 0x0010),

	/* Device configuration registers and Interrupt Flags*/

	regmap_reg_range(0x0800, 0x080c),

	regmap_reg_range(0x0814, 0x0814),

	regmap_reg_range(0x0820, 0x0820),

	regmap_reg_range(0x0830, 0x0830),

	/* M_CAN */