From: Thomas Kopp <thomas.kopp@microchip.com>
To: <mkl@pengutronix.de>, <manivannan.sadhasivam@linaro.org>,
<o.rempel@pengutronix.de>, <geert@linux-m68k.org>
Cc: <linux-can@vger.kernel.org>, <thomas.kopp@microchip.com>,
<dev.kurt@vandijck-laurijssen.be>, <devicetree@vger.kernel.org>,
<robh+dt@kernel.org>, <wg@grandegger.com>
Subject: [PATCH 1/2] can: mcp25xxfd: narrow down wildcards in device tree bindings
Date: Wed, 30 Sep 2020 11:14:22 +0200 [thread overview]
Message-ID: <20200930091423.755-1-thomas.kopp@microchip.com> (raw)
The wildcard should be narrowed down to prevent existing and
future devices that are not compatible from matching.
It is very unlikely that incompatible devices will be released
that do not match the wildcard.
Discussion Reference: https://lore.kernel.org/r/CAMuHMdVkwGjr6dJuMyhQNqFoJqbh6Ec5V2b5LenCshwpM2SDsQ@mail.gmail.com/
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Thomas Kopp <thomas.kopp@microchip.com>
---
drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c | 18 +++++++++---------
drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
index 5557b2d1e774..672d5f24e325 100644
--- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
+++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
@@ -41,10 +41,10 @@ static const struct mcp25xxfd_devtype_data mcp25xxfd_devtype_data_mcp2518fd = {
};
/* Autodetect model, start with CRC enabled. */
-static const struct mcp25xxfd_devtype_data mcp25xxfd_devtype_data_mcp25xxfd = {
+static const struct mcp25xxfd_devtype_data mcp25xxfd_devtype_data_mcp251xfd = {
.quirks = MCP25XXFD_QUIRK_CRC_REG | MCP25XXFD_QUIRK_CRC_RX |
MCP25XXFD_QUIRK_CRC_TX | MCP25XXFD_QUIRK_ECC,
- .model = MCP25XXFD_MODEL_MCP25XXFD,
+ .model = MCP25XXFD_MODEL_MCP251XFD,
};
static const struct can_bittiming_const mcp25xxfd_bittiming_const = {
@@ -78,8 +78,8 @@ static const char *__mcp25xxfd_get_model_str(enum mcp25xxfd_model model)
return "MCP2517FD"; break;
case MCP25XXFD_MODEL_MCP2518FD:
return "MCP2518FD"; break;
- case MCP25XXFD_MODEL_MCP25XXFD:
- return "MCP25xxFD"; break;
+ case MCP25XXFD_MODEL_MCP251XFD:
+ return "MCP251xFD"; break;
}
return "<unknown>";
@@ -2498,7 +2498,7 @@ static int mcp25xxfd_register_chip_detect(struct mcp25xxfd_priv *priv)
else
devtype_data = &mcp25xxfd_devtype_data_mcp2517fd;
- if (!mcp25xxfd_is_25XX(priv) &&
+ if (!mcp25xxfd_is_251X(priv) &&
priv->devtype_data.model != devtype_data->model) {
netdev_info(ndev,
"Detected %s, but firmware specifies a %s. Fixing up.",
@@ -2707,8 +2707,8 @@ static const struct of_device_id mcp25xxfd_of_match[] = {
.compatible = "microchip,mcp2518fd",
.data = &mcp25xxfd_devtype_data_mcp2518fd,
}, {
- .compatible = "microchip,mcp25xxfd",
- .data = &mcp25xxfd_devtype_data_mcp25xxfd,
+ .compatible = "microchip,mcp251xfd",
+ .data = &mcp25xxfd_devtype_data_mcp251xfd,
}, {
/* sentinel */
},
@@ -2723,8 +2723,8 @@ static const struct spi_device_id mcp25xxfd_id_table[] = {
.name = "mcp2518fd",
.driver_data = (kernel_ulong_t)&mcp25xxfd_devtype_data_mcp2518fd,
}, {
- .name = "mcp25xxfd",
- .driver_data = (kernel_ulong_t)&mcp25xxfd_devtype_data_mcp25xxfd,
+ .name = "mcp251xfd",
+ .driver_data = (kernel_ulong_t)&mcp25xxfd_devtype_data_mcp251xfd,
}, {
/* sentinel */
},
diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h
index 3bc799204cb0..b1b5d7fd33ea 100644
--- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h
+++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h
@@ -553,7 +553,7 @@ struct mcp25xxfd_regs_status {
enum mcp25xxfd_model {
MCP25XXFD_MODEL_MCP2517FD = 0x2517,
MCP25XXFD_MODEL_MCP2518FD = 0x2518,
- MCP25XXFD_MODEL_MCP25XXFD = 0xffff, /* autodetect model */
+ MCP25XXFD_MODEL_MCP251XFD = 0xffff, /* autodetect model */
};
struct mcp25xxfd_devtype_data {
@@ -607,7 +607,7 @@ mcp25xxfd_is_##_model(const struct mcp25xxfd_priv *priv) \
MCP25XXFD_IS(2517);
MCP25XXFD_IS(2518);
-MCP25XXFD_IS(25XX);
+MCP25XXFD_IS(251X);
static inline u8 mcp25xxfd_first_byte_set(u32 mask)
{
--
2.25.1
next reply other threads:[~2020-09-30 9:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-30 9:14 Thomas Kopp [this message]
2020-09-30 9:14 ` [PATCH 2/2] can: mcp25xxfd: narrow down wildcards in device tree bindings Thomas Kopp
2020-09-30 9:15 ` [PATCH 1/2] " Marc Kleine-Budde
2020-09-30 9:26 ` Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200930091423.755-1-thomas.kopp@microchip.com \
--to=thomas.kopp@microchip.com \
--cc=dev.kurt@vandijck-laurijssen.be \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=linux-can@vger.kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=mkl@pengutronix.de \
--cc=o.rempel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=wg@grandegger.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox