kernel: update 4.1 to 4.1.5

[openwrt/openwrt.git] / target / linux / sunxi / patches-4.1 / 143-dmaengine-add-h3.patch

diff --git a/target/linux/sunxi/patches-4.1/143-dmaengine-add-h3.patch b/target/linux/sunxi/patches-4.1/143-dmaengine-add-h3.patch
index 661096688539118dcd5cbb8a2874058cf26bf89e..df434a41e801ac6f6e9104daa66e1a00d879217a 100644 (file)
--- a/target/linux/sunxi/patches-4.1/143-dmaengine-add-h3.patch
+++ b/target/linux/sunxi/patches-4.1/143-dmaengine-add-h3.patch
@@ -1,8 +1,6 @@
-diff --git a/Documentation/devicetree/bindings/dma/sun6i-dma.txt b/Documentation/devicetree/bindings/dma/sun6i-dma.txt
-index 9cdcba24d..d13c136 100644
 --- a/Documentation/devicetree/bindings/dma/sun6i-dma.txt
 +++ b/Documentation/devicetree/bindings/dma/sun6i-dma.txt
-@@ -4,7 +4,10 @@ This driver follows the generic DMA bindings defined in dma.txt.
+@@ -4,7 +4,10 @@ This driver follows the generic DMA bind
  
  Required properties:
  
@@ -14,11 +12,9 @@ index 9cdcba24d..d13c136 100644
  - reg:                Should contain the registers base address and length
  - interrupts: Should contain a reference to the interrupt used by this device
  - clocks:     Should contain a reference to the parent AHB clock
-diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c
-index 11e5365..842ff97 100644
 --- a/drivers/dma/sun6i-dma.c
 +++ b/drivers/dma/sun6i-dma.c
-@@ -891,9 +891,21 @@ static struct sun6i_dma_config sun8i_a23_dma_cfg = {
+@@ -891,9 +891,21 @@ static struct sun6i_dma_config sun8i_a23
        .nr_max_vchans   = 37,
  };