Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

can: mcp251xfd: rename driver files and subdir to mcp251xfd

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 the name of the driver subdir and the
individual files accordinly.

[1] http://lore.kernel.org/r/CAMuHMdVkwGjr6dJuMyhQNqFoJqbh6Ec5V2b5LenCshwpM2SDsQ@mail.gmail.com

Link: https://lore.kernel.org/r/20200930091424.792165-8-mkl@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

+13 -13
+1 -1
drivers/net/can/spi/Kconfig
··· 13 13 Driver for the Microchip MCP251x and MCP25625 SPI CAN 14 14 controllers. 15 15 16 - source "drivers/net/can/spi/mcp25xxfd/Kconfig" 16 + source "drivers/net/can/spi/mcp251xfd/Kconfig" 17 17 18 18 endmenu
+1 -1
drivers/net/can/spi/Makefile
··· 6 6 7 7 obj-$(CONFIG_CAN_HI311X) += hi311x.o 8 8 obj-$(CONFIG_CAN_MCP251X) += mcp251x.o 9 - obj-y += mcp25xxfd/ 9 + obj-y += mcp251xfd/
+8
drivers/net/can/spi/mcp251xfd/Makefile
··· 1 + # SPDX-License-Identifier: GPL-2.0-only 2 + 3 + obj-$(CONFIG_CAN_MCP25XXFD) += mcp25xxfd.o 4 + 5 + mcp25xxfd-objs := 6 + mcp25xxfd-objs += mcp251xfd-core.o 7 + mcp25xxfd-objs += mcp251xfd-crc16.o 8 + mcp25xxfd-objs += mcp251xfd-regmap.o
drivers/net/can/spi/mcp25xxfd/Kconfig drivers/net/can/spi/mcp251xfd/Kconfig
-8
drivers/net/can/spi/mcp25xxfd/Makefile
··· 1 - # SPDX-License-Identifier: GPL-2.0-only 2 - 3 - obj-$(CONFIG_CAN_MCP25XXFD) += mcp25xxfd.o 4 - 5 - mcp25xxfd-objs := 6 - mcp25xxfd-objs += mcp25xxfd-core.o 7 - mcp25xxfd-objs += mcp25xxfd-crc16.o 8 - mcp25xxfd-objs += mcp25xxfd-regmap.o
+1 -1
drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
··· 23 23 24 24 #include <asm/unaligned.h> 25 25 26 - #include "mcp25xxfd.h" 26 + #include "mcp251xfd.h" 27 27 28 28 #define DEVICE_NAME "mcp25xxfd" 29 29
+1 -1
drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c
··· 12 12 // Copyright (c) 2019 Martin Sperl <kernel@martin.sperl.org> 13 13 // 14 14 15 - #include "mcp25xxfd.h" 15 + #include "mcp251xfd.h" 16 16 17 17 /* The standard crc16 in linux/crc16.h is unfortunately not computing 18 18 * the correct results (left shift vs. right shift). So here an
+1 -1
drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
··· 6 6 // Marc Kleine-Budde <kernel@pengutronix.de> 7 7 // 8 8 9 - #include "mcp25xxfd.h" 9 + #include "mcp251xfd.h" 10 10 11 11 #include <asm/unaligned.h> 12 12
drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h drivers/net/can/spi/mcp251xfd/mcp251xfd.h