cd54b2d42b
- Refreshed all patches - Removed upstreamed - Adapted 4 patches: 473-fix-marvell-phy-initialization-issues.patch ----------------------------------------------- Removed hunk 5 which got upstreamed 403-net-phy-avoid-setting-unsupported-EEE-advertisments.patch 404-net-phy-restart-phy-autonegotiation-after-EEE-advert.patch -------------------------------------------------------------- Adapted these 2 RFC patches, merging the delta's from an upstream commit (see below) which made it before these 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux- stable.git/commit/?h=v4.9.36&id=97ace183074d306942b903a148aebd5d061758f0 180-usb-xhci-add-support-for-performing-fake-doorbell.patch ----------------------------------------------------------- - Moved fake_doorbell bitmask due to new item Compile tested on: cns3xxx, imx6 Run tested on: cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
51 lines
1.6 KiB
Diff
51 lines
1.6 KiB
Diff
--- a/drivers/spi/Kconfig
|
|
+++ b/drivers/spi/Kconfig
|
|
@@ -199,6 +199,13 @@ config SPI_CLPS711X
|
|
This enables dedicated general purpose SPI/Microwire1-compatible
|
|
master mode interface (SSI1) for CLPS711X-based CPUs.
|
|
|
|
+config SPI_CNS3XXX
|
|
+ tristate "CNS3XXX SPI controller"
|
|
+ depends on ARCH_CNS3XXX && SPI_MASTER
|
|
+ select SPI_BITBANG
|
|
+ help
|
|
+ This enables using the CNS3XXX SPI controller in master mode.
|
|
+
|
|
config SPI_COLDFIRE_QSPI
|
|
tristate "Freescale Coldfire QSPI controller"
|
|
depends on (M520x || M523x || M5249 || M525x || M527x || M528x || M532x)
|
|
--- a/drivers/spi/Makefile
|
|
+++ b/drivers/spi/Makefile
|
|
@@ -29,6 +29,7 @@ obj-$(CONFIG_SPI_BITBANG) += spi-bitban
|
|
obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o
|
|
obj-$(CONFIG_SPI_CADENCE) += spi-cadence.o
|
|
obj-$(CONFIG_SPI_CLPS711X) += spi-clps711x.o
|
|
+obj-$(CONFIG_SPI_CNS3XXX) += spi-cns3xxx.o
|
|
obj-$(CONFIG_SPI_COLDFIRE_QSPI) += spi-coldfire-qspi.o
|
|
obj-$(CONFIG_SPI_DAVINCI) += spi-davinci.o
|
|
obj-$(CONFIG_SPI_DLN2) += spi-dln2.o
|
|
--- a/include/linux/spi/spi.h
|
|
+++ b/include/linux/spi/spi.h
|
|
@@ -763,6 +763,10 @@ struct spi_transfer {
|
|
u32 speed_hz;
|
|
|
|
struct list_head transfer_list;
|
|
+
|
|
+#ifdef CONFIG_ARCH_CNS3XXX
|
|
+ unsigned last_in_message_list;
|
|
+#endif
|
|
};
|
|
|
|
/**
|
|
--- a/drivers/spi/spi.c
|
|
+++ b/drivers/spi/spi.c
|
|
@@ -985,6 +985,9 @@ static int spi_transfer_one_message(stru
|
|
list_for_each_entry(xfer, &msg->transfers, transfer_list) {
|
|
trace_spi_transfer_start(msg, xfer);
|
|
|
|
+ xfer->last_in_message_list =
|
|
+ list_is_last(&xfer->transfer_list, &msg->transfers);
|
|
+
|
|
spi_statistics_add_transfer_stats(statm, xfer, master);
|
|
spi_statistics_add_transfer_stats(stats, xfer, master);
|
|
|