Skip to content

Commit 1f0e21a

Browse files
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/[email protected] Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent dba1572 commit 1f0e21a

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

drivers/net/can/spi/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ config CAN_MCP251X
1313
Driver for the Microchip MCP251x and MCP25625 SPI CAN
1414
controllers.
1515

16-
source "drivers/net/can/spi/mcp25xxfd/Kconfig"
16+
source "drivers/net/can/spi/mcp251xfd/Kconfig"
1717

1818
endmenu

drivers/net/can/spi/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
obj-$(CONFIG_CAN_HI311X) += hi311x.o
88
obj-$(CONFIG_CAN_MCP251X) += mcp251x.o
9-
obj-y += mcp25xxfd/
9+
obj-y += mcp251xfd/
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
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/mcp25xxfd-core.c renamed to drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <asm/unaligned.h>
2525

26-
#include "mcp25xxfd.h"
26+
#include "mcp251xfd.h"
2727

2828
#define DEVICE_NAME "mcp25xxfd"
2929

drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c renamed to drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Copyright (c) 2019 Martin Sperl <[email protected]>
1313
//
1414

15-
#include "mcp25xxfd.h"
15+
#include "mcp251xfd.h"
1616

1717
/* The standard crc16 in linux/crc16.h is unfortunately not computing
1818
* the correct results (left shift vs. right shift). So here an

drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c renamed to drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Marc Kleine-Budde <[email protected]>
77
//
88

9-
#include "mcp25xxfd.h"
9+
#include "mcp251xfd.h"
1010

1111
#include <asm/unaligned.h>
1212

drivers/net/can/spi/mcp25xxfd/Makefile

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)