3.18-stable patches

added patches:
	arm-dts-at91-at91sam9g25-fix-mux-mask-pinctrl-property.patch

diff --git a/queue-3.18/arm-dts-at91-at91sam9g25-fix-mux-mask-pinctrl-property.patch b/queue-3.18/arm-dts-at91-at91sam9g25-fix-mux-mask-pinctrl-property.patch
new file mode 100644 (file)
index 0000000..8e1ada3
--- /dev/null
+++ b/queue-3.18/arm-dts-at91-at91sam9g25-fix-mux-mask-pinctrl-property.patch
@@ -0,0 +1,34 @@
+From e8fd0adf105e132fd84545997bbef3d5edc2c9c1 Mon Sep 17 00:00:00 2001
+From: Nicolas Ferre <nicolas.ferre@microchip.com>
+Date: Tue, 13 Mar 2018 16:20:05 +0100
+Subject: ARM: dts: at91: at91sam9g25: fix mux-mask pinctrl property
+
+From: Nicolas Ferre <nicolas.ferre@microchip.com>
+
+commit e8fd0adf105e132fd84545997bbef3d5edc2c9c1 upstream.
+
+There are only 19 PIOB pins having primary names PB0-PB18. Not all of them
+have a 'C' function. So the pinctrl property mask ends up being the same as the
+other SoC of the at91sam9x5 series.
+
+Reported-by: Marek Sieranski <marek.sieranski@microchip.com>
+Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
+Cc: <stable@vger.kernel.org> # v3.8+
+Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/at91sam9g25.dtsi |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/at91sam9g25.dtsi
++++ b/arch/arm/boot/dts/at91sam9g25.dtsi
+@@ -20,7 +20,7 @@
+                               atmel,mux-mask = <
+                                     /*    A         B          C     */
+                                      0xffffffff 0xffe0399f 0xc000001c  /* pioA */
+-                                     0x0007ffff 0x8000fe3f 0x00000000  /* pioB */
++                                     0x0007ffff 0x00047e3f 0x00000000  /* pioB */
+                                      0x80000000 0x07c0ffff 0xb83fffff  /* pioC */
+                                      0x003fffff 0x003f8000 0x00000000  /* pioD */
+                                     >;

diff --git a/queue-3.18/series b/queue-3.18/series
index 8aaa3d77bba9d3d8af110ccf1926ddc7b050c1f9..59aa888ffd21e50aa5591680e8e91d2bfe54d35e 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -10,3 +10,4 @@ ubi-reject-mlc-nand.patch
 fs-reiserfs-journal.c-add-missing-resierfs_warning-arg.patch
 resource-fix-integer-overflow-at-reallocation.patch
 usb-musb-gadget-misplaced-out-of-bounds-check.patch
+arm-dts-at91-at91sam9g25-fix-mux-mask-pinctrl-property.patch