Skip to content

Commit

Permalink
can: mcp251xfd: rename driver files and subdir to mcp251xfd
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marc Kleine-Budde committed Sep 30, 2020
1 parent dba1572 commit 1f0e21a
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion drivers/net/can/spi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion drivers/net/can/spi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

obj-$(CONFIG_CAN_HI311X) += hi311x.o
obj-$(CONFIG_CAN_MCP251X) += mcp251x.o
obj-y += mcp25xxfd/
obj-y += mcp251xfd/
File renamed without changes.
8 changes: 8 additions & 0 deletions drivers/net/can/spi/mcp251xfd/Makefile
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include <asm/unaligned.h>

#include "mcp25xxfd.h"
#include "mcp251xfd.h"

#define DEVICE_NAME "mcp25xxfd"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// Marc Kleine-Budde <kernel@pengutronix.de>
//

#include "mcp25xxfd.h"
#include "mcp251xfd.h"

#include <asm/unaligned.h>

Expand Down
File renamed without changes.
8 changes: 0 additions & 8 deletions drivers/net/can/spi/mcp25xxfd/Makefile

This file was deleted.

0 comments on commit 1f0e21a

Please sign in to comment.