diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
| commit | 6be2305da83471c442dab83366c25be4dfb38793 (patch) | |
| tree | 30cfe6f3fc964dca1936646468c87367b509e929 /target/linux/sunxi/patches-4.1/143-dmaengine-add-h3.patch | |
| parent | 8e69c9f7ef2e1ca40b33a4a33c76b460c1f62861 (diff) | |
| download | upstream-6be2305da83471c442dab83366c25be4dfb38793.tar.gz upstream-6be2305da83471c442dab83366c25be4dfb38793.tar.bz2 upstream-6be2305da83471c442dab83366c25be4dfb38793.zip | |
kernel: update 4.1 to 4.1.5
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46598
Diffstat (limited to 'target/linux/sunxi/patches-4.1/143-dmaengine-add-h3.patch')
| -rw-r--r-- | target/linux/sunxi/patches-4.1/143-dmaengine-add-h3.patch | 8 |
1 files changed, 2 insertions, 6 deletions
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 6610966885..df434a41e8 100644 --- 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, }; |