@@ -1,14 +1,14 @@
# SPDX-License-Identifier: GPL-2.0-only
-config CAN_MCP25XXFD
- tristate "Microchip MCP25xxFD SPI CAN controllers"
+config CAN_MCP251XFD
+ tristate "Microchip MCP251xFD SPI CAN controllers"
select REGMAP
help
- Driver for the Microchip MCP25XXFD SPI FD-CAN controller
+ Driver for the Microchip MCP251XFD SPI FD-CAN controller
family.
-config CAN_MCP25XXFD_SANITY
- depends on CAN_MCP25XXFD
+config CAN_MCP251XFD_SANITY
+ depends on CAN_MCP251XFD
bool "Additional Sanity Checks"
help
This option enables additional sanity checks in the driver,
@@ -1,8 +1,8 @@
# SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_CAN_MCP25XXFD) += mcp25xxfd.o
+obj-$(CONFIG_CAN_MCP251XFD) += mcp251xfd.o
-mcp25xxfd-objs :=
-mcp25xxfd-objs += mcp251xfd-core.o
-mcp25xxfd-objs += mcp251xfd-crc16.o
-mcp25xxfd-objs += mcp251xfd-regmap.o
+mcp251xfd-objs :=
+mcp251xfd-objs += mcp251xfd-core.o
+mcp251xfd-objs += mcp251xfd-crc16.o
+mcp251xfd-objs += mcp251xfd-regmap.o
@@ -25,7 +25,7 @@
#include "mcp251xfd.h"
-#define DEVICE_NAME "mcp25xxfd"
+#define DEVICE_NAME "mcp251xfd"
static const struct mcp25xxfd_devtype_data mcp25xxfd_devtype_data_mcp2517fd = {
.quirks = MCP25XXFD_QUIRK_MAB_NO_WARN | MCP25XXFD_QUIRK_CRC_REG |
@@ -2923,5 +2923,5 @@ static struct spi_driver mcp25xxfd_driver = {
module_spi_driver(mcp25xxfd_driver);
MODULE_AUTHOR("Marc Kleine-Budde <mkl@pengutronix.de>");
-MODULE_DESCRIPTION("Microchip MCP25xxFD Family CAN controller driver");
+MODULE_DESCRIPTION("Microchip MCP251xFD Family CAN controller driver");
MODULE_LICENSE("GPL v2");
In [1] Geert noted that the autodetect compatible for the mcp25xxfd driver, which is "microchip,mcp25xxfd" might be too generic and overlap with upcoming, but incompatible chips. In the previous patch the autodetect DT compatbile has been renamed to "microchip,mcp251xfd", this patch changes all user facing strings from "mcp25xxfd" to "mcp251xfd" and "MCP25XXFD" to "MCP251XFD", including: - kconfig symbols - name of kernel module - DT and SPI compatible [1] http://lore.kernel.org/r/CAMuHMdVkwGjr6dJuMyhQNqFoJqbh6Ec5V2b5LenCshwpM2SDsQ@mail.gmail.com Link: https://lore.kernel.org/r/20200930091424.792165-9-mkl@pengutronix.de Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- drivers/net/can/spi/mcp251xfd/Kconfig | 10 +++++----- drivers/net/can/spi/mcp251xfd/Makefile | 10 +++++----- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)