From: Greg Kroah-Hartman Date: Thu, 19 Apr 2018 16:25:49 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.9.95~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dceebc4b89c4948f8cf9144b640d71a17a5dc94d;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: arm-dts-at91-at91sam9g25-fix-mux-mask-pinctrl-property.patch arm-dts-at91-sama5d4-fix-pinctrl-compatible-string.patch --- diff --git a/queue-4.4/arm-dts-at91-at91sam9g25-fix-mux-mask-pinctrl-property.patch b/queue-4.4/arm-dts-at91-at91sam9g25-fix-mux-mask-pinctrl-property.patch new file mode 100644 index 00000000000..d4fa72bce76 --- /dev/null +++ b/queue-4.4/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 +Date: Tue, 13 Mar 2018 16:20:05 +0100 +Subject: ARM: dts: at91: at91sam9g25: fix mux-mask pinctrl property + +From: Nicolas Ferre + +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 +Signed-off-by: Nicolas Ferre +Cc: # v3.8+ +Signed-off-by: Alexandre Belloni +Signed-off-by: Greg Kroah-Hartman + +--- + 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 +@@ -21,7 +21,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-4.4/arm-dts-at91-sama5d4-fix-pinctrl-compatible-string.patch b/queue-4.4/arm-dts-at91-sama5d4-fix-pinctrl-compatible-string.patch new file mode 100644 index 00000000000..efa2c6242e2 --- /dev/null +++ b/queue-4.4/arm-dts-at91-sama5d4-fix-pinctrl-compatible-string.patch @@ -0,0 +1,35 @@ +From 9a06757dcc8509c162ac00488c8c82fc98e04227 Mon Sep 17 00:00:00 2001 +From: Santiago Esteban +Date: Thu, 18 Jan 2018 15:38:47 +0100 +Subject: ARM: dts: at91: sama5d4: fix pinctrl compatible string + +From: Santiago Esteban + +commit 9a06757dcc8509c162ac00488c8c82fc98e04227 upstream. + +The compatible string is incorrect. Add atmel,sama5d3-pinctrl since +it's the appropriate compatible string. Remove the +atmel,at91rm9200-pinctrl compatible string, this fallback is +useless, there are too many changes. + +Signed-off-by: Santiago Esteban +Signed-off-by: Ludovic Desroches +Cc: stable@vger.kernel.org #v3.18 +Signed-off-by: Alexandre Belloni +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/sama5d4.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/sama5d4.dtsi ++++ b/arch/arm/boot/dts/sama5d4.dtsi +@@ -1354,7 +1354,7 @@ + pinctrl@fc06a000 { + #address-cells = <1>; + #size-cells = <1>; +- compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus"; ++ compatible = "atmel,sama5d3-pinctrl", "atmel,at91sam9x5-pinctrl", "simple-bus"; + ranges = <0xfc068000 0xfc068000 0x100 + 0xfc06a000 0xfc06a000 0x4000>; + /* WARNING: revisit as pin spec has changed */ diff --git a/queue-4.4/series b/queue-4.4/series index 6228e098057..c7554ebb06d 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -28,3 +28,5 @@ resource-fix-integer-overflow-at-reallocation.patch ipc-shm-fix-use-after-free-of-shm-file-via-remap_file_pages.patch mm-slab-reschedule-cache_reap-on-the-same-cpu.patch usb-musb-gadget-misplaced-out-of-bounds-check.patch +arm-dts-at91-at91sam9g25-fix-mux-mask-pinctrl-property.patch +arm-dts-at91-sama5d4-fix-pinctrl-compatible-string.patch