main/linux-rpi: apply rotary-encoder dts fix and rpi mmc-spi fix

fixes #4973

1 files changed, 67 insertions, 0 deletions

diff --git a/main/linux-rpi/issue-4973.patch b/main/linux-rpi/issue-4973.patch
new file mode 100644
index 0000000000..810c72e190
--- /dev/null
+++ b/main/linux-rpi/issue-4973.patch
@@ -0,0 +1,67 @@
+https://bugs.alpinelinux.org/issues/4973
+https://github.com/raspberrypi/linux/issues/911
+https://github.com/raspberrypi/linux/pull/1135
+https://github.com/msperl/linux-rpi/commit/aef50a19f335ae3d2eb43ac5496c7f03930b394f
+
+This is not a proper fix, but as this is rasperry pi specific kernel,
+we've applied this workaround for now.
+
+From aef50a19f335ae3d2eb43ac5496c7f03930b394f Mon Sep 17 00:00:00 2001
+From: Martin Sperl <kernel@martin.sperl.org>
+Date: Tue, 15 Sep 2015 07:26:07 +0000
+Subject: [PATCH] mmc: spi: disable dma mapping code, as it does not work
+
+since:
+	commit 0589342c27944e50ebd7a54f5215002b6598b748
+	Author: Rob Herring <rob.herring@calxeda.com>
+	Date:   Tue Oct 29 23:36:46 2013 -0500
+
+	     of: set dma_mask to point to coherent_dma_mask
+
+	     Platform devices created by DT code don't initialize dma_mask pointer to
+	     anything. Set it to coherent_dma_mask by default if the architecture
+	     code has not set it.
+
+the mmc-spi driver no longer detects the sd-cards any longer.
+
+This patch disables the offending section in mmc_spi
+so that the driver works again and detects the sd card normally.
+
+There is no real negative impact as the spi-framework
+does no longer rely on driver-provided DMA mappings but
+maps the transfers transparently.
+
+Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
+---
+ drivers/mmc/host/mmc_spi.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
+index ae19d83..16946e2 100644
+--- a/drivers/mmc/host/mmc_spi.c
++++ b/drivers/mmc/host/mmc_spi.c
+@@ -1387,6 +1387,16 @@ static int mmc_spi_probe(struct spi_device *spi)
+ 	if (!host->data)
+ 		goto fail_nobuf1;
+ 
++	/* for some reason mmc_spi does not work with this enabled
++	 * it is not needed anyway, as the SPI framework does DMA
++	 * transfers now automatically
++	 * the patch that introduced this was:
++	 * commit 0589342c27944e50ebd7a54f5215002b6598b748
++	 * Author: Rob Herring <rob.herring@calxeda.com>
++	 * Date:   Tue Oct 29 23:36:46 2013 -0500
++	 *      of: set dma_mask to point to coherent_dma_mask
++	 */
++#if 0
+ 	if (spi->master->dev.parent->dma_mask) {
+ 		struct device	*dev = spi->master->dev.parent;
+ 
+@@ -1402,6 +1412,7 @@ static int mmc_spi_probe(struct spi_device *spi)
+ 				host->data_dma, sizeof(*host->data),
+ 				DMA_BIDIRECTIONAL);
+ 	}
++#endif
+ 
+ 	/* setup message for status/busy readback */
+ 	spi_message_init(&host->readback);