Hi Simon,
On Tue, Mar 14, 2023 at 05:22:02PM +0100, Simon Horman wrote:
> On Tue, Mar 14, 2023 at 04:12:01PM +0100, Markus Schneider-Pargmann wrote:
> > tcan4552 and tcan4553 do not have wake or state pins, so they are
> > currently not compatible with the generic driver. The generic driver
> > uses tcan4x5x_disable_state() and tcan4x5x_disable_wake() if the gpios
> > are not defined. These functions use register bits that are not
> > available in tcan4552/4553.
> >
> > This patch adds support by introducing version information to reflect if
> > the chip has wake and state pins. Also the version is now checked.
> >
> > Signed-off-by: Markus Schneider-Pargmann
>
> Hi Markus,
>
> you forgot your email address in the signed-off-by line.
Thank you, I am wondering how I managed to do that :D.
>
> > ---
> > drivers/net/can/m_can/tcan4x5x-core.c | 113 ++++++++++++++++++++------
> > 1 file changed, 89 insertions(+), 24 deletions(-)
> >
> > diff --git a/drivers/net/can/m_can/tcan4x5x-core.c b/drivers/net/can/m_can/tcan4x5x-core.c
> > index fb9375fa20ec..e7fa509dacc9 100644
> > --- a/drivers/net/can/m_can/tcan4x5x-core.c
> > +++ b/drivers/net/can/m_can/tcan4x5x-core.c
>
> ...
>
> > @@ -254,18 +262,53 @@ 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 int tcan4x5x_verify_version(
> > + struct tcan4x5x_priv *priv,
> > + const struct tcan4x5x_version_info *version_info)
>
> nit:
>
> static int
> tcan4x5x_verify_version(struct tcan4x5x_priv *priv, const struct tcan4x5x_version_info *version_info)
>
> or:
>
> static int tcan4x5x_verify_version(struct tcan4x5x_priv *priv, const struct tcan4x5x_version_info *version_info)
>
> Your could make the line shorter by renaming the 'version_info' parameter,
> say to 'info'.
Thanks, fixed. I would like to keep version_info as it is used like that
everywhere else. I think/hope breaking the 80c here is fine.
>
> ...
>
> > @@ -394,21 +448,32 @@ static void tcan4x5x_can_remove(struct spi_device *spi)
> > m_can_class_free_dev(priv->cdev.net);
> > }
> >
> > +static const struct tcan4x5x_version_info tcan4x5x_generic = {
> > + .has_state_pin = true,
> > + .has_wake_pin = true,
> > +};
> > +
> > +static const struct tcan4x5x_version_info tcan4x5x_tcan4552 = {
> > + .id2_register = 0x32353534, /* ASCII = 4552 */
> > +};
> > +
> > +static const struct tcan4x5x_version_info tcan4x5x_tcan4553 = {
> > + .id2_register = 0x33353534, /* ASCII = 4553 */
> > +};
> > +
> > static const struct of_device_id tcan4x5x_of_match[] = {
> > - {
> > - .compatible = "ti,tcan4x5x",
> > - }, {
> > - /* sentinel */
> > - },
> > + { .compatible = "ti,tcan4x5x", .data = &tcan4x5x_generic },
> > + { .compatible = "ti,tcan4552", .data = &tcan4x5x_tcan4552 },
> > + { .compatible = "ti,tcan4553", .data = &tcan4x5x_tcan4553 },
> > + { /* sentinel */ }
> > };
> > MODULE_DEVICE_TABLE(of, tcan4x5x_of_match);
> >
> > static const struct spi_device_id tcan4x5x_id_table[] = {
> > - {
> > - .name = "tcan4x5x",
> > - }, {
> > - /* sentinel */
> > - },
> > + { .name = "tcan4x5x", .driver_data = (unsigned long) &tcan4x5x_generic, },
> > + { .name = "tcan4552", .driver_data = (unsigned long) &tcan4x5x_tcan4552, },
> > + { .name = "tcan4553", .driver_data = (unsigned long) &tcan4x5x_tcan4553, },
>
> nit: checkpatch tells me that no space is necessary after a cast.
Fixed as well.
Thanks for reviewing.
Best,
Markus
