diff options
| -rw-r--r-- | drivers/net/can/spi/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/net/can/spi/Makefile | 2 | ||||
| -rw-r--r-- | drivers/net/can/spi/mcp251xfd/Kconfig (renamed from drivers/net/can/spi/mcp25xxfd/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/net/can/spi/mcp251xfd/Makefile | 8 | ||||
| -rw-r--r-- | drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c (renamed from drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c) | 2 | ||||
| -rw-r--r-- | drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c (renamed from drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c) | 2 | ||||
| -rw-r--r-- | drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c (renamed from drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c) | 2 | ||||
| -rw-r--r-- | drivers/net/can/spi/mcp251xfd/mcp251xfd.h (renamed from drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h) | 0 | ||||
| -rw-r--r-- | drivers/net/can/spi/mcp25xxfd/Makefile | 8 |
9 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/can/spi/Kconfig b/drivers/net/can/spi/Kconfig index a82240628c33..f45449210047 100644 --- a/drivers/net/can/spi/Kconfig +++ b/drivers/net/can/spi/Kconfig @@ -13,6 +13,6 @@ config CAN_MCP251X Driver for the Microchip MCP251x and MCP25625 SPI CAN controllers. -source "drivers/net/can/spi/mcp25xxfd/Kconfig" +source "drivers/net/can/spi/mcp251xfd/Kconfig" endmenu diff --git a/drivers/net/can/spi/Makefile b/drivers/net/can/spi/Makefile index 20c18ac96b1c..33e3f60bbc10 100644 --- a/drivers/net/can/spi/Makefile +++ b/drivers/net/can/spi/Makefile @@ -6,4 +6,4 @@ obj-$(CONFIG_CAN_HI311X) += hi311x.o obj-$(CONFIG_CAN_MCP251X) += mcp251x.o -obj-y += mcp25xxfd/ +obj-y += mcp251xfd/ diff --git a/drivers/net/can/spi/mcp25xxfd/Kconfig b/drivers/net/can/spi/mcp251xfd/Kconfig index 9eb596019a58..9eb596019a58 100644 --- a/drivers/net/can/spi/mcp25xxfd/Kconfig +++ b/drivers/net/can/spi/mcp251xfd/Kconfig diff --git a/drivers/net/can/spi/mcp251xfd/Makefile b/drivers/net/can/spi/mcp251xfd/Makefile new file mode 100644 index 000000000000..e943e6a2db0c --- /dev/null +++ b/drivers/net/can/spi/mcp251xfd/Makefile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0-only + +obj-$(CONFIG_CAN_MCP25XXFD) += mcp25xxfd.o + +mcp25xxfd-objs := +mcp25xxfd-objs += mcp251xfd-core.o +mcp25xxfd-objs += mcp251xfd-crc16.o +mcp25xxfd-objs += mcp251xfd-regmap.o diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c index 181207139343..7cd14531ab1e 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c @@ -23,7 +23,7 @@ #include <asm/unaligned.h> -#include "mcp25xxfd.h" +#include "mcp251xfd.h" #define DEVICE_NAME "mcp25xxfd" diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c index 79d09aaebf33..bc90afb34df2 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c @@ -12,7 +12,7 @@ // Copyright (c) 2019 Martin Sperl <kernel@martin.sperl.org> // -#include "mcp25xxfd.h" +#include "mcp251xfd.h" /* The standard crc16 in linux/crc16.h is unfortunately not computing * the correct results (left shift vs. right shift). So here an diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c index 376649c7e443..3511317bb49b 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c @@ -6,7 +6,7 @@ // Marc Kleine-Budde <kernel@pengutronix.de> // -#include "mcp25xxfd.h" +#include "mcp251xfd.h" #include <asm/unaligned.h> diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h index b1b5d7fd33ea..b1b5d7fd33ea 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h diff --git a/drivers/net/can/spi/mcp25xxfd/Makefile b/drivers/net/can/spi/mcp25xxfd/Makefile deleted file mode 100644 index 4e17f592e22e..000000000000 --- a/drivers/net/can/spi/mcp25xxfd/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -obj-$(CONFIG_CAN_MCP25XXFD) += mcp25xxfd.o - -mcp25xxfd-objs := -mcp25xxfd-objs += mcp25xxfd-core.o -mcp25xxfd-objs += mcp25xxfd-crc16.o -mcp25xxfd-objs += mcp25xxfd-regmap.o |