Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19acdc4f authored Mar 03, 2020 by qctecmdr Committed by Gerrit - the friendly Code Review server Mar 03, 2020

Merge "driver: can: spi: add mcp25xxfd driver"

parents 33ec8830 ba7313eb

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -326,6 +326,12 @@ F: drivers/pci/acpi
		F: drivers/pci//acpi*
		F: tools/power/acpi/

		commit 6f40c42105d5c913cf855320ba7cfbc418314e29
		Author: Meng Jiang <mengjian@codeaurora.org>
		Date: Mon Jan 13 18:20:15 2020 -0400
		MAINTAINERS: add MCP25xxFD driver to support SPI to CAN
		Signed-off-by: Meng Jiang <mengjian@codeaurora.org>

		ACPI APEI
		M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
		M: Len Brown <lenb@kernel.org>

arch/arm64/configs/vendor/kona_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -265,6 +265,8 @@ CONFIG_QRTR=y
		CONFIG_QRTR_SMD=y
		CONFIG_QRTR_MHI=y
		CONFIG_SOCKEV_NLMCAST=y
		CONFIG_CAN=y
		CONFIG_CAN_MCP25XXFD=y
		CONFIG_BT=y
		CONFIG_MSM_BT_POWER=y
		CONFIG_BT_SLIM_QCA6390=y

drivers/net/can/spi/Kconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -14,4 +14,14 @@ config CAN_MCP251X
		Driver for the Microchip MCP251x and MCP25625 SPI CAN
		controllers.

		config CAN_MCP25XXFD
		tristate "Microchip MCP25xxFD SPI CAN controllers"
		depends on HAS_DMA
		help
		The driver for the Microchip MCP25XXFD SPI FD-CAN
		controller family.
		Say yes here to build support for SPI to CAN devices
		mcp25xxfd. To compilethis driver as a module, choose
		M here: the module will be called mcp25xxfd.

		endmenu

drivers/net/can/spi/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,3 +5,4 @@

		obj-$(CONFIG_CAN_HI311X) += hi311x.o
		obj-$(CONFIG_CAN_MCP251X) += mcp251x.o
		obj-$(CONFIG_CAN_MCP25XXFD) += mcp25xxfd.o

drivers/net/can/spi/mcp25xxfd.c

0 → 100644

+4513 −0

File added.

Preview size limit exceeded, changes collapsed.