From 76d079204df113afa9e382a43abb5e1a2135150d Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Thu, 21 May 2015 19:32:46 +0000 Subject: kernel: update 3.18 to 3.18.14 Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14 Build tested on brcm63xx and ipq806x, runtested on brcm63xx. Signed-off-by: Jonas Gorski SVN-Revision: 45711 --- .../ipq806x/patches-3.18/001-spi-qup-Add-DMA-capabilities.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/ipq806x/patches-3.18/001-spi-qup-Add-DMA-capabilities.patch') diff --git a/target/linux/ipq806x/patches-3.18/001-spi-qup-Add-DMA-capabilities.patch b/target/linux/ipq806x/patches-3.18/001-spi-qup-Add-DMA-capabilities.patch index 62badd5387..e110bf726c 100644 --- a/target/linux/ipq806x/patches-3.18/001-spi-qup-Add-DMA-capabilities.patch +++ b/target/linux/ipq806x/patches-3.18/001-spi-qup-Add-DMA-capabilities.patch @@ -443,7 +443,7 @@ Signed-off-by: Andy Gross exit: spi_qup_set_state(controller, QUP_STATE_RESET); spin_lock_irqsave(&controller->lock, flags); -@@ -553,6 +816,7 @@ static int spi_qup_probe(struct platform +@@ -554,6 +817,7 @@ static int spi_qup_probe(struct platform master->transfer_one = spi_qup_transfer_one; master->dev.of_node = pdev->dev.of_node; master->auto_runtime_pm = true; @@ -451,7 +451,7 @@ Signed-off-by: Andy Gross platform_set_drvdata(pdev, master); -@@ -618,6 +882,56 @@ static int spi_qup_probe(struct platform +@@ -619,6 +883,56 @@ static int spi_qup_probe(struct platform QUP_ERROR_INPUT_UNDER_RUN | QUP_ERROR_OUTPUT_UNDER_RUN, base + QUP_ERROR_FLAGS_EN); @@ -508,7 +508,7 @@ Signed-off-by: Andy Gross writel_relaxed(0, base + SPI_CONFIG); writel_relaxed(SPI_IO_C_NO_TRI_STATE, base + SPI_IO_CONTROL); -@@ -730,6 +1044,11 @@ static int spi_qup_remove(struct platfor +@@ -731,6 +1045,11 @@ static int spi_qup_remove(struct platfor if (ret) return ret; -- cgit v1.2.3