kernel: update 3.18 to 3.18.16

Changelogs:

* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46011

3 files changed, 3 insertions, 51 deletions

diff --git a/target/linux/mvebu/patches-3.18/010-add_node_alias_to_pinctrl_and_add_base_address.patch b/target/linux/mvebu/patches-3.18/010-add_node_alias_to_pinctrl_and_add_base_address.patch
index 059aeaded9..7224361b66 100644
--- a/target/linux/mvebu/patches-3.18/010-add_node_alias_to_pinctrl_and_add_base_address.patch
+++ b/target/linux/mvebu/patches-3.18/010-add_node_alias_to_pinctrl_and_add_base_address.patch
@@ -81,7 +81,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  					marvell,function = "gpio";
 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
 +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
-@@ -77,7 +77,7 @@
+@@ -81,7 +81,7 @@
  			serial@12100 {
  				status = "okay";
  			};
diff --git a/target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch b/target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch
index 2069c882d5..d10e09269a 100644
--- a/target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch
+++ b/target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch
@@ -231,7 +231,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net>
 +};
 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
 +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
-@@ -77,12 +77,7 @@
+@@ -81,12 +81,7 @@
  			serial@12100 {
  				status = "okay";
  			};
@@ -245,7 +245,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net>
  			leds {
  				compatible = "gpio-leds";
  				pinctrl-names = "default";
-@@ -187,3 +182,10 @@
+@@ -191,3 +186,10 @@
  		};
  	};
  };
diff --git a/target/linux/mvebu/patches-3.18/030-do_not_register_custom_DMA_operations_when_coherency_is_disabled.patch b/target/linux/mvebu/patches-3.18/030-do_not_register_custom_DMA_operations_when_coherency_is_disabled.patch
deleted file mode 100644
index 28cfc9d2d8..0000000000
--- a/target/linux/mvebu/patches-3.18/030-do_not_register_custom_DMA_operations_when_coherency_is_disabled.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-This patch is a partial backport of commit ef01c6c36bb8 ("ARM: mvebu:
-remove Armada 375 Z1 workaround for I/O coherency"). This commit was
-merged in v3.19, so kernel versions later than v3.19 are not affected
-by the problem that this commit fixes.
-
-It does not make a lot of sense to backport this commit entirely,
-since it is mainly removing some no longer useful code. However, this
-commit is also making sure that the bus_register_notifier that
-register the custom DMA operations that should be used for HW I/O
-coherency does not get registered when said HW I/O coherency is not
-enabled.
-
-This is particularly critical since we have decided to disable HW I/O
-coherency completely in all kernels < 4.0, to be on the safe side,
-while experimenting a new implementation of the HW I/O coherency in >=
-4.0.
-
-Without this commit, kernels earlier than 3.18 have the custom DMA
-operations normally used for HW I/O coherency registered (they don't
-do cache maintenance operations), while HW I/O coherency is
-disabled. It essentially causes every DMA transfer to transfer
-garbage.
-
-The issue fixed by this commit was introduced by 5ab5afd8ba83 ("ARM:
-mvebu: implement Armada 375 coherency workaround"), but it was not
-visible until now since it didn't cause any problem when HW I/O
-coherency is enabled.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Cc: <stable@vger.kernel.org> v3.16..v3.18
----
- arch/arm/mach-mvebu/coherency.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/arch/arm/mach-mvebu/coherency.c
-+++ b/arch/arm/mach-mvebu/coherency.c
-@@ -391,8 +391,9 @@ static int __init coherency_late_init(vo
- 			armada_375_coherency_init_wa();
- 	}
- 
--	bus_register_notifier(&platform_bus_type,
--			      &mvebu_hwcc_nb);
-+	if (coherency_available())
-+		bus_register_notifier(&platform_bus_type,
-+				      &mvebu_hwcc_nb);
- 
- 	return 0;
- }