From: Sasha Levin Date: Wed, 21 Jul 2021 10:46:18 +0000 (-0400) Subject: Fixes for 4.14 X-Git-Tag: v5.4.135~38 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0fa966a2afcd18577b82a35d8f5a87cd6c2a1b2;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/arm-brcmstb-dts-fix-nand-nodes-names.patch b/queue-4.14/arm-brcmstb-dts-fix-nand-nodes-names.patch new file mode 100644 index 00000000000..9ffe9baf142 --- /dev/null +++ b/queue-4.14/arm-brcmstb-dts-fix-nand-nodes-names.patch @@ -0,0 +1,55 @@ +From d40fc2df858d79178b6cdd1f9f1e8b3b3401dc71 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 16 Apr 2021 15:37:49 +0200 +Subject: ARM: brcmstb: dts: fix NAND nodes names +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rafał Miłecki + +[ Upstream commit 9a800ce1aada6e0f56b78e4713f4858c8990c1f7 ] + +This matches nand-controller.yaml requirements. + +Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 4 ++-- + arch/arm/boot/dts/bcm7445.dtsi | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts +index 8006c69a3fdf..5931c0288283 100644 +--- a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts ++++ b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts +@@ -14,10 +14,10 @@ + }; + }; + +-&nand { ++&nand_controller { + status = "okay"; + +- nandcs@1 { ++ nand@1 { + compatible = "brcm,nandcs"; + reg = <1>; + nand-ecc-step-size = <512>; +diff --git a/arch/arm/boot/dts/bcm7445.dtsi b/arch/arm/boot/dts/bcm7445.dtsi +index c859aa6f358c..b06845e92acd 100644 +--- a/arch/arm/boot/dts/bcm7445.dtsi ++++ b/arch/arm/boot/dts/bcm7445.dtsi +@@ -150,7 +150,7 @@ + reg-names = "aon-ctrl", "aon-sram"; + }; + +- nand: nand@3e2800 { ++ nand_controller: nand-controller@3e2800 { + status = "disabled"; + #address-cells = <1>; + #size-cells = <0>; +-- +2.30.2 + diff --git a/queue-4.14/arm-cygnus-dts-fix-nand-nodes-names.patch b/queue-4.14/arm-cygnus-dts-fix-nand-nodes-names.patch new file mode 100644 index 00000000000..3891801690d --- /dev/null +++ b/queue-4.14/arm-cygnus-dts-fix-nand-nodes-names.patch @@ -0,0 +1,85 @@ +From b852bc84f664ee273ae99a7c7fe266dd1893f48a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 16 Apr 2021 15:37:50 +0200 +Subject: ARM: Cygnus: dts: fix NAND nodes names +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rafał Miłecki + +[ Upstream commit e256b48a3b07ee1ae4bfa60abbf509ba8e386862 ] + +This matches nand-controller.yaml requirements. + +Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/bcm-cygnus.dtsi | 2 +- + arch/arm/boot/dts/bcm911360_entphn.dts | 4 ++-- + arch/arm/boot/dts/bcm958300k.dts | 4 ++-- + arch/arm/boot/dts/bcm958305k.dts | 4 ++-- + 4 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/arch/arm/boot/dts/bcm-cygnus.dtsi b/arch/arm/boot/dts/bcm-cygnus.dtsi +index b822952c29f8..79acf9278aca 100644 +--- a/arch/arm/boot/dts/bcm-cygnus.dtsi ++++ b/arch/arm/boot/dts/bcm-cygnus.dtsi +@@ -446,7 +446,7 @@ + status = "disabled"; + }; + +- nand: nand@18046000 { ++ nand_controller: nand-controller@18046000 { + compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; + reg = <0x18046000 0x600>, <0xf8105408 0x600>, + <0x18046f00 0x20>; +diff --git a/arch/arm/boot/dts/bcm911360_entphn.dts b/arch/arm/boot/dts/bcm911360_entphn.dts +index 53f990defd6a..423a29a46b77 100644 +--- a/arch/arm/boot/dts/bcm911360_entphn.dts ++++ b/arch/arm/boot/dts/bcm911360_entphn.dts +@@ -84,8 +84,8 @@ + status = "okay"; + }; + +-&nand { +- nandcs@1 { ++&nand_controller { ++ nand@1 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; +diff --git a/arch/arm/boot/dts/bcm958300k.dts b/arch/arm/boot/dts/bcm958300k.dts +index b4a1392bd5a6..dda3e11b711f 100644 +--- a/arch/arm/boot/dts/bcm958300k.dts ++++ b/arch/arm/boot/dts/bcm958300k.dts +@@ -60,8 +60,8 @@ + status = "okay"; + }; + +-&nand { +- nandcs@1 { ++&nand_controller { ++ nand@1 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; +diff --git a/arch/arm/boot/dts/bcm958305k.dts b/arch/arm/boot/dts/bcm958305k.dts +index 3378683321d3..ea3c6b88b313 100644 +--- a/arch/arm/boot/dts/bcm958305k.dts ++++ b/arch/arm/boot/dts/bcm958305k.dts +@@ -68,8 +68,8 @@ + status = "okay"; + }; + +-&nand { +- nandcs@1 { ++&nand_controller { ++ nand@1 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; +-- +2.30.2 + diff --git a/queue-4.14/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch b/queue-4.14/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch new file mode 100644 index 00000000000..d070caf359f --- /dev/null +++ b/queue-4.14/arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch @@ -0,0 +1,133 @@ +From d70a816c3f04b292217180e2759206c8ddd5bc90 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 25 May 2021 20:58:54 +0300 +Subject: ARM: dts: am335x: align GPIO hog names with dt-schema + +From: Grygorii Strashko + +[ Upstream commit fb97f63106f3174992a22fe5e42dda96a0810750 ] + +The GPIO Hog dt-schema node naming convention expect GPIO hogs node names +to end with a 'hog' suffix. + +Signed-off-by: Grygorii Strashko +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 2 +- + arch/arm/boot/dts/am335x-boneblue.dts | 2 +- + arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 4 ++-- + arch/arm/boot/dts/am335x-icev2.dts | 4 ++-- + arch/arm/boot/dts/am335x-shc.dts | 8 ++++---- + 5 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts +index 83f49f616b19..d8a712938a70 100644 +--- a/arch/arm/boot/dts/am335x-boneblack-wireless.dts ++++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts +@@ -105,7 +105,7 @@ + }; + + &gpio3 { +- ls_buf_en { ++ ls-buf-en-hog { + gpio-hog; + gpios = <10 GPIO_ACTIVE_HIGH>; + output-high; +diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts +index cdc1b2be792f..d32abbfcd6fb 100644 +--- a/arch/arm/boot/dts/am335x-boneblue.dts ++++ b/arch/arm/boot/dts/am335x-boneblue.dts +@@ -451,7 +451,7 @@ + }; + + &gpio3 { +- ls_buf_en { ++ ls-buf-en-hog { + gpio-hog; + gpios = <10 GPIO_ACTIVE_HIGH>; + output-high; +diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts +index 57731f0daf10..04c52194fa91 100644 +--- a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts ++++ b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts +@@ -105,7 +105,7 @@ + }; + + &gpio1 { +- ls_buf_en { ++ ls-buf-en-hog { + gpio-hog; + gpios = <29 GPIO_ACTIVE_HIGH>; + output-high; +@@ -122,7 +122,7 @@ + /* an external pulldown on U21 pin 4. */ + + &gpio3 { +- bt_aud_in { ++ bt-aud-in-hog { + gpio-hog; + gpios = <16 GPIO_ACTIVE_HIGH>; + output-low; +diff --git a/arch/arm/boot/dts/am335x-icev2.dts b/arch/arm/boot/dts/am335x-icev2.dts +index f2005ecca74f..be81b98da71e 100644 +--- a/arch/arm/boot/dts/am335x-icev2.dts ++++ b/arch/arm/boot/dts/am335x-icev2.dts +@@ -448,14 +448,14 @@ + }; + + &gpio3 { +- p4 { ++ pr1-mii-ctl-hog { + gpio-hog; + gpios = <4 GPIO_ACTIVE_HIGH>; + output-high; + line-name = "PR1_MII_CTRL"; + }; + +- p10 { ++ mux-mii-hog { + gpio-hog; + gpios = <10 GPIO_ACTIVE_HIGH>; + /* ETH1 mux: Low for MII-PRU, high for RMII-CPSW */ +diff --git a/arch/arm/boot/dts/am335x-shc.dts b/arch/arm/boot/dts/am335x-shc.dts +index 4f6a286ea293..961a422256cf 100644 +--- a/arch/arm/boot/dts/am335x-shc.dts ++++ b/arch/arm/boot/dts/am335x-shc.dts +@@ -146,14 +146,14 @@ + }; + + &gpio1 { +- hmtc_rst { ++ hmtc-rst-hog { + gpio-hog; + gpios = <24 GPIO_ACTIVE_LOW>; + output-high; + line-name = "homematic_reset"; + }; + +- hmtc_prog { ++ hmtc-prog-hog { + gpio-hog; + gpios = <27 GPIO_ACTIVE_LOW>; + output-high; +@@ -162,14 +162,14 @@ + }; + + &gpio3 { +- zgb_rst { ++ zgb-rst-hog { + gpio-hog; + gpios = <18 GPIO_ACTIVE_LOW>; + output-low; + line-name = "zigbee_reset"; + }; + +- zgb_boot { ++ zgb-boot-hog { + gpio-hog; + gpios = <19 GPIO_ACTIVE_HIGH>; + output-high; +-- +2.30.2 + diff --git a/queue-4.14/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch b/queue-4.14/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch new file mode 100644 index 00000000000..ddd8d5023b3 --- /dev/null +++ b/queue-4.14/arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch @@ -0,0 +1,58 @@ +From 1ecc8ee2afb41b1b2e6a3e001036e5425cf007e1 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 25 May 2021 20:58:55 +0300 +Subject: ARM: dts: am437x: align gpio hog names with dt-schema + +From: Grygorii Strashko + +[ Upstream commit bd551acdde3ad40da1a97391abd6e0db7852bf66 ] + +The GPIO Hog dt-schema node naming convention expect GPIO hogs node names +to end with a 'hog' suffix. + +Signed-off-by: Grygorii Strashko +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/am437x-gp-evm.dts | 4 ++-- + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts +index 051823b7e5a1..f36cb4105d18 100644 +--- a/arch/arm/boot/dts/am437x-gp-evm.dts ++++ b/arch/arm/boot/dts/am437x-gp-evm.dts +@@ -696,7 +696,7 @@ + pinctrl-0 = <&gpio0_pins>; + status = "okay"; + +- p23 { ++ sel-emmc-nand-hog { + gpio-hog; + gpios = <23 GPIO_ACTIVE_HIGH>; + /* SelEMMCorNAND selects between eMMC and NAND: +@@ -729,7 +729,7 @@ + status = "okay"; + ti,no-reset-on-init; + +- p8 { ++ sel-lcd-hdmi-hog { + /* + * SelLCDorHDMI selects between display and audio paths: + * Low: HDMI display with audio via HDMI +diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts +index c4279b0b9f12..22ab85fa895d 100644 +--- a/arch/arm/boot/dts/am43x-epos-evm.dts ++++ b/arch/arm/boot/dts/am43x-epos-evm.dts +@@ -527,7 +527,7 @@ + pinctrl-0 = <&display_mux_pins>; + status = "okay"; + +- p1 { ++ sel-lcd-hdmi-hog { + /* + * SelLCDorHDMI selects between display and audio paths: + * Low: HDMI display with audio via HDMI +-- +2.30.2 + diff --git a/queue-4.14/arm-dts-bcm63xx-fix-nand-nodes-names.patch b/queue-4.14/arm-dts-bcm63xx-fix-nand-nodes-names.patch new file mode 100644 index 00000000000..54111b90b62 --- /dev/null +++ b/queue-4.14/arm-dts-bcm63xx-fix-nand-nodes-names.patch @@ -0,0 +1,55 @@ +From bab48718b3b848d1d8f33d9b423206db49493054 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 16 Apr 2021 15:37:52 +0200 +Subject: ARM: dts: BCM63xx: Fix NAND nodes names +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rafał Miłecki + +[ Upstream commit 75e2f012f6e34b93124d1d86eaa8f27df48e9ea0 ] + +This matches nand-controller.yaml requirements. + +Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/bcm63138.dtsi | 2 +- + arch/arm/boot/dts/bcm963138dvt.dts | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi +index 6df61518776f..557098f5c8d5 100644 +--- a/arch/arm/boot/dts/bcm63138.dtsi ++++ b/arch/arm/boot/dts/bcm63138.dtsi +@@ -175,7 +175,7 @@ + status = "disabled"; + }; + +- nand: nand@2000 { ++ nand_controller: nand-controller@2000 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand"; +diff --git a/arch/arm/boot/dts/bcm963138dvt.dts b/arch/arm/boot/dts/bcm963138dvt.dts +index c61673638fa8..5445fccec5a5 100644 +--- a/arch/arm/boot/dts/bcm963138dvt.dts ++++ b/arch/arm/boot/dts/bcm963138dvt.dts +@@ -30,10 +30,10 @@ + status = "okay"; + }; + +-&nand { ++&nand_controller { + status = "okay"; + +- nandcs@0 { ++ nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-ecc-strength = <4>; +-- +2.30.2 + diff --git a/queue-4.14/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch b/queue-4.14/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch new file mode 100644 index 00000000000..b27ced4c4f5 --- /dev/null +++ b/queue-4.14/arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch @@ -0,0 +1,78 @@ +From 3117adbaa626263e39fa2c9e504cd7eeae95b4c4 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 21 May 2021 09:54:06 +0200 +Subject: ARM: dts: dra7x-evm: Align GPIO hog names with dt-schema + +From: Geert Uytterhoeven + +[ Upstream commit 0c149400c2f676e7b4cc68e517db29005a7a38c7 ] + +The dt-schema for nxp,pcf8575 expects GPIO hogs node names to end with a +'hog' suffix. + +Signed-off-by: Geert Uytterhoeven +Reviewed-by: Laurent Pinchart +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/dra7-evm.dts | 2 +- + arch/arm/boot/dts/dra71-evm.dts | 2 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +- + arch/arm/boot/dts/dra76-evm.dts | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts +index aa426dabb6c3..c3990325f7e6 100644 +--- a/arch/arm/boot/dts/dra7-evm.dts ++++ b/arch/arm/boot/dts/dra7-evm.dts +@@ -315,7 +315,7 @@ + reg = <0x26>; + gpio-controller; + #gpio-cells = <2>; +- p1 { ++ hdmi-audio-hog { + /* vin6_sel_s0: high: VIN6, low: audio */ + gpio-hog; + gpios = <1 GPIO_ACTIVE_HIGH>; +diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts +index 64363f75c01a..cf1db1b71bab 100644 +--- a/arch/arm/boot/dts/dra71-evm.dts ++++ b/arch/arm/boot/dts/dra71-evm.dts +@@ -160,7 +160,7 @@ + }; + + &pcf_hdmi { +- p0 { ++ hdmi-i2c-disable-hog { + /* + * PM_OEn to High: Disable routing I2C3 to PM_I2C + * With this PM_SEL(p3) should not matter +diff --git a/arch/arm/boot/dts/dra72-evm-common.dtsi b/arch/arm/boot/dts/dra72-evm-common.dtsi +index 2e485a13dfd7..a5e65c1a568e 100644 +--- a/arch/arm/boot/dts/dra72-evm-common.dtsi ++++ b/arch/arm/boot/dts/dra72-evm-common.dtsi +@@ -272,7 +272,7 @@ + */ + lines-initial-states = <0x0f2b>; + +- p1 { ++ hdmi-audio-hog { + /* vin6_sel_s0: high: VIN6, low: audio */ + gpio-hog; + gpios = <1 GPIO_ACTIVE_HIGH>; +diff --git a/arch/arm/boot/dts/dra76-evm.dts b/arch/arm/boot/dts/dra76-evm.dts +index f64aab450315..51ff6321199d 100644 +--- a/arch/arm/boot/dts/dra76-evm.dts ++++ b/arch/arm/boot/dts/dra76-evm.dts +@@ -314,7 +314,7 @@ + reg = <0x26>; + gpio-controller; + #gpio-cells = <2>; +- p1 { ++ hdmi-audio-hog { + /* vin6_sel_s0: high: VIN6, low: audio */ + gpio-hog; + gpios = <1 GPIO_ACTIVE_HIGH>; +-- +2.30.2 + diff --git a/queue-4.14/arm-dts-gemini-add-device_type-on-pci.patch b/queue-4.14/arm-dts-gemini-add-device_type-on-pci.patch new file mode 100644 index 00000000000..1572d631626 --- /dev/null +++ b/queue-4.14/arm-dts-gemini-add-device_type-on-pci.patch @@ -0,0 +1,33 @@ +From dc5243972458467b2a6b5b9a32a8b76206ae8fe6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 3 May 2021 18:52:28 +0000 +Subject: ARM: dts: gemini: add device_type on pci + +From: Corentin Labbe + +[ Upstream commit 483f3645b3f7acfd1c78a19d51b80c0656161974 ] + +Fixes DT warning on pci node by adding the missing device_type. + +Signed-off-by: Corentin Labbe +Signed-off-by: Linus Walleij +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/gemini.dtsi | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm/boot/dts/gemini.dtsi b/arch/arm/boot/dts/gemini.dtsi +index b9b07d0895cf..52c35bf816f0 100644 +--- a/arch/arm/boot/dts/gemini.dtsi ++++ b/arch/arm/boot/dts/gemini.dtsi +@@ -275,6 +275,7 @@ + clock-names = "PCLK", "PCICLK"; + pinctrl-names = "default"; + pinctrl-0 = <&pci_default_pins>; ++ device_type = "pci"; + #address-cells = <3>; + #size-cells = <2>; + #interrupt-cells = <1>; +-- +2.30.2 + diff --git a/queue-4.14/arm-dts-imx6-phyflex-fix-uart-hardware-flow-control.patch b/queue-4.14/arm-dts-imx6-phyflex-fix-uart-hardware-flow-control.patch new file mode 100644 index 00000000000..bf0dcaa3f23 --- /dev/null +++ b/queue-4.14/arm-dts-imx6-phyflex-fix-uart-hardware-flow-control.patch @@ -0,0 +1,49 @@ +From 49804522c2721e856377d5050dcd819339cedb85 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 12 Apr 2021 08:24:50 +0200 +Subject: ARM: dts: imx6: phyFLEX: Fix UART hardware flow control + +From: Primoz Fiser + +[ Upstream commit 14cdc1f243d79e0b46be150502b7dba9c5a6bdfd ] + +Serial interface uart3 on phyFLEX board is capable of 5-wire connection +including signals RTS and CTS for hardware flow control. + +Fix signals UART3_CTS_B and UART3_RTS_B padmux assignments and add +missing property "uart-has-rtscts" to allow serial interface to be +configured and used with the hardware flow control. + +Signed-off-by: Primoz Fiser +Signed-off-by: Shawn Guo +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +index d2c31eae9fef..cce680a563f7 100644 +--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +@@ -306,8 +306,8 @@ + fsl,pins = < + MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 +- MX6QDL_PAD_EIM_D30__UART3_RTS_B 0x1b0b1 +- MX6QDL_PAD_EIM_D31__UART3_CTS_B 0x1b0b1 ++ MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1 ++ MX6QDL_PAD_EIM_D30__UART3_CTS_B 0x1b0b1 + >; + }; + +@@ -394,6 +394,7 @@ + &uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; ++ uart-has-rtscts; + status = "disabled"; + }; + +-- +2.30.2 + diff --git a/queue-4.14/arm-dts-omap5-board-common-align-gpio-hog-names-with.patch b/queue-4.14/arm-dts-omap5-board-common-align-gpio-hog-names-with.patch new file mode 100644 index 00000000000..e0e5601c6a2 --- /dev/null +++ b/queue-4.14/arm-dts-omap5-board-common-align-gpio-hog-names-with.patch @@ -0,0 +1,35 @@ +From 351457f9ee06ec1f2811e123045f6c4c3ef59fdf Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 25 May 2021 20:58:57 +0300 +Subject: ARM: dts: omap5-board-common: align gpio hog names with dt-schema + +From: Grygorii Strashko + +[ Upstream commit 4823117cb80eedf31ddbc126b9bd92e707bd9a26 ] + +The GPIO Hog dt-schema node naming convention expect GPIO hogs node names +to end with a 'hog' suffix. + +Signed-off-by: Grygorii Strashko +Signed-off-by: Tony Lindgren +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/omap5-board-common.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi +index c58f14de0145..62c3dd76e6c1 100644 +--- a/arch/arm/boot/dts/omap5-board-common.dtsi ++++ b/arch/arm/boot/dts/omap5-board-common.dtsi +@@ -146,7 +146,7 @@ + + &gpio8 { + /* TI trees use GPIO instead of msecure, see also muxing */ +- p234 { ++ msecure-hog { + gpio-hog; + gpios = <10 GPIO_ACTIVE_HIGH>; + output-high; +-- +2.30.2 + diff --git a/queue-4.14/arm-dts-rockchip-fix-pinctrl-sleep-nodename-for-rk30.patch b/queue-4.14/arm-dts-rockchip-fix-pinctrl-sleep-nodename-for-rk30.patch new file mode 100644 index 00000000000..142179794a9 --- /dev/null +++ b/queue-4.14/arm-dts-rockchip-fix-pinctrl-sleep-nodename-for-rk30.patch @@ -0,0 +1,57 @@ +From 2b804ea6c17b83e74f5c69862d5858760cbd8e8c Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 26 Jan 2021 12:02:20 +0100 +Subject: ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and + rk3288 + +From: Johan Jonker + +[ Upstream commit dfbfb86a43f9a5bbd166d88bca9e07ee4e1bff31 ] + +A test with the command below aimed at powerpc generates +notifications in the Rockchip ARM tree. + +Fix pinctrl "sleep" nodename by renaming it to "suspend" +for rk3036-kylin and rk3288 + +make ARCH=arm dtbs_check +DT_SCHEMA_FILES=Documentation/devicetree/bindings/powerpc/sleep.yaml + +Signed-off-by: Johan Jonker +Link: https://lore.kernel.org/r/20210126110221.10815-1-jbx6244@gmail.com +Signed-off-by: Heiko Stuebner +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/rk3036-kylin.dts | 2 +- + arch/arm/boot/dts/rk3288.dtsi | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts +index fdb1570bc7d3..3371bc921aef 100644 +--- a/arch/arm/boot/dts/rk3036-kylin.dts ++++ b/arch/arm/boot/dts/rk3036-kylin.dts +@@ -424,7 +424,7 @@ + }; + }; + +- sleep { ++ suspend { + global_pwroff: global-pwroff { + rockchip,pins = <2 7 RK_FUNC_1 &pcfg_pull_none>; + }; +diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi +index 23907d9ce89a..5dd37d09c1f1 100644 +--- a/arch/arm/boot/dts/rk3288.dtsi ++++ b/arch/arm/boot/dts/rk3288.dtsi +@@ -1453,7 +1453,7 @@ + drive-strength = <12>; + }; + +- sleep { ++ suspend { + global_pwroff: global-pwroff { + rockchip,pins = <0 0 RK_FUNC_1 &pcfg_pull_none>; + }; +-- +2.30.2 + diff --git a/queue-4.14/arm-dts-rockchip-fix-power-controller-node-names-for.patch b/queue-4.14/arm-dts-rockchip-fix-power-controller-node-names-for.patch new file mode 100644 index 00000000000..8789ddc616c --- /dev/null +++ b/queue-4.14/arm-dts-rockchip-fix-power-controller-node-names-for.patch @@ -0,0 +1,65 @@ +From 6ebb15bcf44f9b2456d394e4bc1c88ceef96593d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 17 Apr 2021 13:29:40 +0200 +Subject: ARM: dts: rockchip: Fix power-controller node names for rk3288 + +From: Elaine Zhang + +[ Upstream commit 970cdc53cb1afa73602028c103dbfb6a230080be ] + +Use more generic names (as recommended in the device tree specification +or the binding documentation) + +Signed-off-by: Elaine Zhang +Reviewed-by: Enric Balletbo i Serra +Signed-off-by: Johan Jonker +Link: https://lore.kernel.org/r/20210417112952.8516-4-jbx6244@gmail.com +Signed-off-by: Heiko Stuebner +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/rk3288.dtsi | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi +index 8abf0990c691..9adb58930c08 100644 +--- a/arch/arm/boot/dts/rk3288.dtsi ++++ b/arch/arm/boot/dts/rk3288.dtsi +@@ -745,7 +745,7 @@ + * *_HDMI HDMI + * *_MIPI_* MIPI + */ +- pd_vio@RK3288_PD_VIO { ++ power-domain@RK3288_PD_VIO { + reg = ; + clocks = <&cru ACLK_IEP>, + <&cru ACLK_ISP>, +@@ -787,7 +787,7 @@ + * Note: The following 3 are HEVC(H.265) clocks, + * and on the ACLK_HEVC_NIU (NOC). + */ +- pd_hevc@RK3288_PD_HEVC { ++ power-domain@RK3288_PD_HEVC { + reg = ; + clocks = <&cru ACLK_HEVC>, + <&cru SCLK_HEVC_CABAC>, +@@ -801,7 +801,7 @@ + * (video endecoder & decoder) clocks that on the + * ACLK_VCODEC_NIU and HCLK_VCODEC_NIU (NOC). + */ +- pd_video@RK3288_PD_VIDEO { ++ power-domain@RK3288_PD_VIDEO { + reg = ; + clocks = <&cru ACLK_VCODEC>, + <&cru HCLK_VCODEC>; +@@ -812,7 +812,7 @@ + * Note: ACLK_GPU is the GPU clock, + * and on the ACLK_GPU_NIU (NOC). + */ +- pd_gpu@RK3288_PD_GPU { ++ power-domain@RK3288_PD_GPU { + reg = ; + clocks = <&cru ACLK_GPU>; + pm_qos = <&qos_gpu_r>, +-- +2.30.2 + diff --git a/queue-4.14/arm-dts-rockchip-fix-the-timer-clocks-order.patch b/queue-4.14/arm-dts-rockchip-fix-the-timer-clocks-order.patch new file mode 100644 index 00000000000..8fe21567bdb --- /dev/null +++ b/queue-4.14/arm-dts-rockchip-fix-the-timer-clocks-order.patch @@ -0,0 +1,65 @@ +From 15dbf43615fe131c592cafa97769a43ab79193cc Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 6 May 2021 08:11:35 -0300 +Subject: ARM: dts: rockchip: Fix the timer clocks order + +From: Ezequiel Garcia + +[ Upstream commit 7b46d674ac000b101fdad92cf16cc11d90b72f86 ] + +Fixed order is the device-tree convention. +The timer driver currently gets clocks by name, +so no changes are needed there. + +Signed-off-by: Ezequiel Garcia +Link: https://lore.kernel.org/r/20210506111136.3941-3-ezequiel@collabora.com +Signed-off-by: Heiko Stuebner +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/rk3188.dtsi | 8 ++++---- + arch/arm/boot/dts/rk3288.dtsi | 4 ++-- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi +index 1399bc04ea77..74eb1dfa2f6c 100644 +--- a/arch/arm/boot/dts/rk3188.dtsi ++++ b/arch/arm/boot/dts/rk3188.dtsi +@@ -110,16 +110,16 @@ + compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer"; + reg = <0x2000e000 0x20>; + interrupts = ; +- clocks = <&cru SCLK_TIMER3>, <&cru PCLK_TIMER3>; +- clock-names = "timer", "pclk"; ++ clocks = <&cru PCLK_TIMER3>, <&cru SCLK_TIMER3>; ++ clock-names = "pclk", "timer"; + }; + + timer6: timer@200380a0 { + compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer"; + reg = <0x200380a0 0x20>; + interrupts = ; +- clocks = <&cru SCLK_TIMER6>, <&cru PCLK_TIMER0>; +- clock-names = "timer", "pclk"; ++ clocks = <&cru PCLK_TIMER0>, <&cru SCLK_TIMER6>; ++ clock-names = "pclk", "timer"; + }; + + i2s0: i2s@1011a000 { +diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi +index 5dd37d09c1f1..8abf0990c691 100644 +--- a/arch/arm/boot/dts/rk3288.dtsi ++++ b/arch/arm/boot/dts/rk3288.dtsi +@@ -220,8 +220,8 @@ + compatible = "rockchip,rk3288-timer"; + reg = <0x0 0xff810000 0x0 0x20>; + interrupts = ; +- clocks = <&xin24m>, <&cru PCLK_TIMER>; +- clock-names = "timer", "pclk"; ++ clocks = <&cru PCLK_TIMER>, <&xin24m>; ++ clock-names = "pclk", "timer"; + }; + + display-subsystem { +-- +2.30.2 + diff --git a/queue-4.14/arm-dts-stm32-fix-rcc-node-name-on-stm32f429-mcu.patch b/queue-4.14/arm-dts-stm32-fix-rcc-node-name-on-stm32f429-mcu.patch new file mode 100644 index 00000000000..60876b0a1d3 --- /dev/null +++ b/queue-4.14/arm-dts-stm32-fix-rcc-node-name-on-stm32f429-mcu.patch @@ -0,0 +1,36 @@ +From e8c24fa2ecd5ca3484d96cc88d42831ac6509960 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 15 Apr 2021 12:10:26 +0200 +Subject: ARM: dts: stm32: fix RCC node name on stm32f429 MCU + +From: Alexandre Torgue + +[ Upstream commit e4b948415a89a219d13e454011cdcf9e63ecc529 ] + +This prevent warning observed with "make dtbs_check W=1" + +Warning (simple_bus_reg): /soc/rcc@40023810: simple-bus unit address format +error, expected "40023800" + +Signed-off-by: Alexandre Torgue +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/stm32f429.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi +index 5b36eb114ddc..d65a03d0da65 100644 +--- a/arch/arm/boot/dts/stm32f429.dtsi ++++ b/arch/arm/boot/dts/stm32f429.dtsi +@@ -597,7 +597,7 @@ + status = "disabled"; + }; + +- rcc: rcc@40023810 { ++ rcc: rcc@40023800 { + #reset-cells = <1>; + #clock-cells = <2>; + compatible = "st,stm32f42xx-rcc", "st,stm32-rcc"; +-- +2.30.2 + diff --git a/queue-4.14/arm-imx-pm-imx5-fix-references-to-imx5_cpu_suspend_i.patch b/queue-4.14/arm-imx-pm-imx5-fix-references-to-imx5_cpu_suspend_i.patch new file mode 100644 index 00000000000..7d8119fadf3 --- /dev/null +++ b/queue-4.14/arm-imx-pm-imx5-fix-references-to-imx5_cpu_suspend_i.patch @@ -0,0 +1,44 @@ +From d5a33883890452ed2a542debaa1df1b9ea70d654 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 24 Apr 2021 14:37:28 +0200 +Subject: ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Jonathan Neuschäfer + +[ Upstream commit 89b759469d525f4d5f9c29cd3b1f490311c67f85 ] + +The name of the struct, as defined in arch/arm/mach-imx/pm-imx5.c, +is imx5_cpu_suspend_info. + +Signed-off-by: Jonathan Neuschäfer +Reviewed-by: Fabio Estevam +Signed-off-by: Shawn Guo +Signed-off-by: Sasha Levin +--- + arch/arm/mach-imx/suspend-imx53.S | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-imx/suspend-imx53.S b/arch/arm/mach-imx/suspend-imx53.S +index 5ed078ad110a..f12d24104075 100644 +--- a/arch/arm/mach-imx/suspend-imx53.S ++++ b/arch/arm/mach-imx/suspend-imx53.S +@@ -33,11 +33,11 @@ + * ^ + * ^ + * imx53_suspend code +- * PM_INFO structure(imx53_suspend_info) ++ * PM_INFO structure(imx5_cpu_suspend_info) + * ======================== low address ======================= + */ + +-/* Offsets of members of struct imx53_suspend_info */ ++/* Offsets of members of struct imx5_cpu_suspend_info */ + #define SUSPEND_INFO_MX53_M4IF_V_OFFSET 0x0 + #define SUSPEND_INFO_MX53_IOMUXC_V_OFFSET 0x4 + #define SUSPEND_INFO_MX53_IO_COUNT_OFFSET 0x8 +-- +2.30.2 + diff --git a/queue-4.14/arm-nsp-dts-fix-nand-nodes-names.patch b/queue-4.14/arm-nsp-dts-fix-nand-nodes-names.patch new file mode 100644 index 00000000000..340ffbdba5d --- /dev/null +++ b/queue-4.14/arm-nsp-dts-fix-nand-nodes-names.patch @@ -0,0 +1,165 @@ +From 808ed1501685000de359687d710e9d5150fd8eff Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 16 Apr 2021 15:37:51 +0200 +Subject: ARM: NSP: dts: fix NAND nodes names +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Rafał Miłecki + +[ Upstream commit 0484594be733d5cdf976f55a2d4e8d887f351b69 ] + +This matches nand-controller.yaml requirements. + +Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli +Signed-off-by: Sasha Levin +--- + arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- + arch/arm/boot/dts/bcm958522er.dts | 4 ++-- + arch/arm/boot/dts/bcm958525er.dts | 4 ++-- + arch/arm/boot/dts/bcm958525xmc.dts | 4 ++-- + arch/arm/boot/dts/bcm958622hr.dts | 4 ++-- + arch/arm/boot/dts/bcm958623hr.dts | 4 ++-- + arch/arm/boot/dts/bcm958625hr.dts | 4 ++-- + arch/arm/boot/dts/bcm958625k.dts | 4 ++-- + arch/arm/boot/dts/bcm988312hr.dts | 4 ++-- + 9 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi +index e975f9cabe84..3bd3412b29a8 100644 +--- a/arch/arm/boot/dts/bcm-nsp.dtsi ++++ b/arch/arm/boot/dts/bcm-nsp.dtsi +@@ -259,7 +259,7 @@ + dma-coherent; + }; + +- nand: nand@26000 { ++ nand_controller: nand-controller@26000 { + compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; + reg = <0x026000 0x600>, + <0x11b408 0x600>, +diff --git a/arch/arm/boot/dts/bcm958522er.dts b/arch/arm/boot/dts/bcm958522er.dts +index f9dd342cc2ae..56f9181975b1 100644 +--- a/arch/arm/boot/dts/bcm958522er.dts ++++ b/arch/arm/boot/dts/bcm958522er.dts +@@ -74,8 +74,8 @@ + status = "okay"; + }; + +-&nand { +- nandcs@0 { ++&nand_controller { ++ nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; +diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts +index 374508a9cfbf..93a3e23ec7ae 100644 +--- a/arch/arm/boot/dts/bcm958525er.dts ++++ b/arch/arm/boot/dts/bcm958525er.dts +@@ -74,8 +74,8 @@ + status = "okay"; + }; + +-&nand { +- nandcs@0 { ++&nand_controller { ++ nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; +diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts +index 403250c5ad8e..fad974212d8a 100644 +--- a/arch/arm/boot/dts/bcm958525xmc.dts ++++ b/arch/arm/boot/dts/bcm958525xmc.dts +@@ -90,8 +90,8 @@ + }; + }; + +-&nand { +- nandcs@0 { ++&nand_controller { ++ nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; +diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts +index fd8b8c689ffe..26b5ed56b604 100644 +--- a/arch/arm/boot/dts/bcm958622hr.dts ++++ b/arch/arm/boot/dts/bcm958622hr.dts +@@ -78,8 +78,8 @@ + status = "okay"; + }; + +-&nand { +- nandcs@0 { ++&nand_controller { ++ nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; +diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts +index b8bde13de90a..789fb77e17ad 100644 +--- a/arch/arm/boot/dts/bcm958623hr.dts ++++ b/arch/arm/boot/dts/bcm958623hr.dts +@@ -78,8 +78,8 @@ + status = "okay"; + }; + +-&nand { +- nandcs@0 { ++&nand_controller { ++ nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; +diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts +index f0e2008f7490..88d51eb3083d 100644 +--- a/arch/arm/boot/dts/bcm958625hr.dts ++++ b/arch/arm/boot/dts/bcm958625hr.dts +@@ -76,8 +76,8 @@ + status = "okay"; + }; + +-&nand { +- nandcs@0 { ++&nand_controller { ++ nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; +diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts +index 2cf2392483b2..22d321e06a31 100644 +--- a/arch/arm/boot/dts/bcm958625k.dts ++++ b/arch/arm/boot/dts/bcm958625k.dts +@@ -69,8 +69,8 @@ + status = "okay"; + }; + +-&nand { +- nandcs@0 { ++&nand_controller { ++ nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; +diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts +index bce251a68591..b62b91fa942f 100644 +--- a/arch/arm/boot/dts/bcm988312hr.dts ++++ b/arch/arm/boot/dts/bcm988312hr.dts +@@ -78,8 +78,8 @@ + status = "okay"; + }; + +-&nand { +- nandcs@0 { ++&nand_controller { ++ nand@0 { + compatible = "brcm,nandcs"; + reg = <0>; + nand-on-flash-bbt; +-- +2.30.2 + diff --git a/queue-4.14/arm64-dts-juno-update-scpi-nodes-as-per-the-yaml-sch.patch b/queue-4.14/arm64-dts-juno-update-scpi-nodes-as-per-the-yaml-sch.patch new file mode 100644 index 00000000000..1be10c3e11d --- /dev/null +++ b/queue-4.14/arm64-dts-juno-update-scpi-nodes-as-per-the-yaml-sch.patch @@ -0,0 +1,52 @@ +From aed3ccc229cab7bf2033fcab7310639ff4896c92 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 8 Jun 2021 15:51:33 +0100 +Subject: arm64: dts: juno: Update SCPI nodes as per the YAML schema + +From: Sudeep Holla + +[ Upstream commit 70010556b158a0fefe43415fb0c58347dcce7da0 ] + +The SCPI YAML schema expects standard node names for clocks and +power domain controllers. Fix those as per the schema for Juno +platforms. + +Link: https://lore.kernel.org/r/20210608145133.2088631-1-sudeep.holla@arm.com +Signed-off-by: Sudeep Holla +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/arm/juno-base.dtsi | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi +index 13ee8ffa9bbf..76902ea7288f 100644 +--- a/arch/arm64/boot/dts/arm/juno-base.dtsi ++++ b/arch/arm64/boot/dts/arm/juno-base.dtsi +@@ -513,13 +513,13 @@ + clocks { + compatible = "arm,scpi-clocks"; + +- scpi_dvfs: scpi-dvfs { ++ scpi_dvfs: clocks-0 { + compatible = "arm,scpi-dvfs-clocks"; + #clock-cells = <1>; + clock-indices = <0>, <1>, <2>; + clock-output-names = "atlclk", "aplclk","gpuclk"; + }; +- scpi_clk: scpi-clk { ++ scpi_clk: clocks-1 { + compatible = "arm,scpi-variable-clocks"; + #clock-cells = <1>; + clock-indices = <3>; +@@ -527,7 +527,7 @@ + }; + }; + +- scpi_devpd: scpi-power-domains { ++ scpi_devpd: power-controller { + compatible = "arm,scpi-power-domains"; + num-domains = <2>; + #power-domain-cells = <1>; +-- +2.30.2 + diff --git a/queue-4.14/arm64-dts-ls208xa-remove-bus-num-from-dspi-node.patch b/queue-4.14/arm64-dts-ls208xa-remove-bus-num-from-dspi-node.patch new file mode 100644 index 00000000000..13fa03b0239 --- /dev/null +++ b/queue-4.14/arm64-dts-ls208xa-remove-bus-num-from-dspi-node.patch @@ -0,0 +1,48 @@ +From 0da704f5f51e499996ef6f42acf3cd53f2ab14a8 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 28 Apr 2021 14:58:07 +0200 +Subject: arm64: dts: ls208xa: remove bus-num from dspi node + +From: Mian Yousaf Kaukab + +[ Upstream commit 8240c972c1798ea013cbb407722295fc826b3584 ] + +On LS2088A-RDB board, if the spi-fsl-dspi driver is built as module +then its probe fails with the following warning: + +[ 10.471363] couldn't get idr +[ 10.471381] WARNING: CPU: 4 PID: 488 at drivers/spi/spi.c:2689 spi_register_controller+0x73c/0x8d0 +... +[ 10.471651] fsl-dspi 2100000.spi: Problem registering DSPI ctlr +[ 10.471708] fsl-dspi: probe of 2100000.spi failed with error -16 + +Reason for the failure is that bus-num property is set for dspi node. +However, bus-num property is not set for the qspi node. If probe for +spi-fsl-qspi happens first then id 0 is dynamically allocated to it. +Call to spi_register_controller() from spi-fsl-dspi driver then fails. +Since commit 29d2daf2c33c ("spi: spi-fsl-dspi: Make bus-num property +optional") bus-num property is optional. Remove bus-num property from +dspi node to fix the issue. + +Signed-off-by: Mian Yousaf Kaukab +Signed-off-by: Shawn Guo +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +index 4fb9a0966a84..4b459167a746 100644 +--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi ++++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +@@ -515,7 +515,6 @@ + clocks = <&clockgen 4 3>; + clock-names = "dspi"; + spi-num-chipselects = <5>; +- bus-num = <0>; + }; + + esdhc: esdhc@2140000 { +-- +2.30.2 + diff --git a/queue-4.14/arm64-dts-rockchip-fix-pinctrl-sleep-nodename-for-rk.patch b/queue-4.14/arm64-dts-rockchip-fix-pinctrl-sleep-nodename-for-rk.patch new file mode 100644 index 00000000000..07d4f79bede --- /dev/null +++ b/queue-4.14/arm64-dts-rockchip-fix-pinctrl-sleep-nodename-for-rk.patch @@ -0,0 +1,42 @@ +From 5a22ed6d5834cf6fe2eec768f29f68114e04b377 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 26 Jan 2021 12:02:21 +0100 +Subject: arm64: dts: rockchip: fix pinctrl sleep nodename for rk3399.dtsi + +From: Johan Jonker + +[ Upstream commit a7ecfad495f8af63a5cb332c91f60ab2018897f5 ] + +A test with the command below aimed at powerpc generates +notifications in the Rockchip arm64 tree. + +Fix pinctrl "sleep" nodename by renaming it to "suspend" +for rk3399.dtsi + +make ARCH=arm64 dtbs_check +DT_SCHEMA_FILES=Documentation/devicetree/bindings/powerpc/sleep.yaml + +Signed-off-by: Johan Jonker +Link: https://lore.kernel.org/r/20210126110221.10815-2-jbx6244@gmail.com +Signed-off-by: Heiko Stuebner +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +index 721f4b6b262f..029d4578bca3 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +@@ -2074,7 +2074,7 @@ + }; + }; + +- sleep { ++ suspend { + ap_pwroff: ap-pwroff { + rockchip,pins = <1 5 RK_FUNC_1 &pcfg_pull_none>; + }; +-- +2.30.2 + diff --git a/queue-4.14/arm64-dts-rockchip-fix-power-controller-node-names-f.patch b/queue-4.14/arm64-dts-rockchip-fix-power-controller-node-names-f.patch new file mode 100644 index 00000000000..60ce2c1921e --- /dev/null +++ b/queue-4.14/arm64-dts-rockchip-fix-power-controller-node-names-f.patch @@ -0,0 +1,46 @@ +From 6abac0a403ee0bb92760fc24245796b9b2fa3764 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 17 Apr 2021 13:29:43 +0200 +Subject: arm64: dts: rockchip: Fix power-controller node names for rk3328 + +From: Elaine Zhang + +[ Upstream commit 6e6a282b49c6db408d27231e3c709fbdf25e3c1b ] + +Use more generic names (as recommended in the device tree specification +or the binding documentation) + +Signed-off-by: Elaine Zhang +Reviewed-by: Enric Balletbo i Serra +Signed-off-by: Johan Jonker +Link: https://lore.kernel.org/r/20210417112952.8516-7-jbx6244@gmail.com +Signed-off-by: Heiko Stuebner +Signed-off-by: Sasha Levin +--- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi +index 6c3684885fac..a3fb072f20ba 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi +@@ -289,13 +289,13 @@ + #address-cells = <1>; + #size-cells = <0>; + +- pd_hevc@RK3328_PD_HEVC { ++ power-domain@RK3328_PD_HEVC { + reg = ; + }; +- pd_video@RK3328_PD_VIDEO { ++ power-domain@RK3328_PD_VIDEO { + reg = ; + }; +- pd_vpu@RK3328_PD_VPU { ++ power-domain@RK3328_PD_VPU { + reg = ; + }; + }; +-- +2.30.2 + diff --git a/queue-4.14/kbuild-mkcompile_h-consider-timestamp-if-kbuild_buil.patch b/queue-4.14/kbuild-mkcompile_h-consider-timestamp-if-kbuild_buil.patch new file mode 100644 index 00000000000..986a91cba6a --- /dev/null +++ b/queue-4.14/kbuild-mkcompile_h-consider-timestamp-if-kbuild_buil.patch @@ -0,0 +1,69 @@ +From 4e09af31364a77379bc47fa5fd56ad97531c814e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 12 Jun 2021 15:18:38 +0100 +Subject: kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is + set + +From: Matthias Maennich + +[ Upstream commit a979522a1a88556e42a22ce61bccc58e304cb361 ] + +To avoid unnecessary recompilations, mkcompile_h does not regenerate +compile.h if just the timestamp changed. +Though, if KBUILD_BUILD_TIMESTAMP is set, an explicit timestamp for the +build was requested, in which case we should not ignore it. + +If a user follows the documentation for reproducible builds [1] and +defines KBUILD_BUILD_TIMESTAMP as the git commit timestamp, a clean +build will have the correct timestamp. A subsequent cherry-pick (or +amend) changes the commit timestamp and if an incremental build is done +with a different KBUILD_BUILD_TIMESTAMP now, that new value is not taken +into consideration. But it should for reproducibility. + +Hence, whenever KBUILD_BUILD_TIMESTAMP is explicitly set, do not ignore +UTS_VERSION when making a decision about whether the regenerated version +of compile.h should be moved into place. + +[1] https://www.kernel.org/doc/html/latest/kbuild/reproducible-builds.html + +Signed-off-by: Matthias Maennich +Signed-off-by: Masahiro Yamada +Signed-off-by: Sasha Levin +--- + scripts/mkcompile_h | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h +index 959199c3147e..49f92fffa098 100755 +--- a/scripts/mkcompile_h ++++ b/scripts/mkcompile_h +@@ -83,15 +83,23 @@ UTS_TRUNCATE="cut -b -$UTS_LEN" + # Only replace the real compile.h if the new one is different, + # in order to preserve the timestamp and avoid unnecessary + # recompilations. +-# We don't consider the file changed if only the date/time changed. ++# We don't consider the file changed if only the date/time changed, ++# unless KBUILD_BUILD_TIMESTAMP was explicitly set (e.g. for ++# reproducible builds with that value referring to a commit timestamp). + # A kernel config change will increase the generation number, thus + # causing compile.h to be updated (including date/time) due to the + # changed comment in the + # first line. + ++if [ -z "$KBUILD_BUILD_TIMESTAMP" ]; then ++ IGNORE_PATTERN="UTS_VERSION" ++else ++ IGNORE_PATTERN="NOT_A_PATTERN_TO_BE_MATCHED" ++fi ++ + if [ -r $TARGET ] && \ +- grep -v 'UTS_VERSION' $TARGET > .tmpver.1 && \ +- grep -v 'UTS_VERSION' .tmpcompile > .tmpver.2 && \ ++ grep -v $IGNORE_PATTERN $TARGET > .tmpver.1 && \ ++ grep -v $IGNORE_PATTERN .tmpcompile > .tmpver.2 && \ + cmp -s .tmpver.1 .tmpver.2; then + rm -f .tmpcompile + else +-- +2.30.2 + diff --git a/queue-4.14/reset-ti-syscon-fix-to_ti_syscon_reset_data-macro.patch b/queue-4.14/reset-ti-syscon-fix-to_ti_syscon_reset_data-macro.patch new file mode 100644 index 00000000000..dcda814dc01 --- /dev/null +++ b/queue-4.14/reset-ti-syscon-fix-to_ti_syscon_reset_data-macro.patch @@ -0,0 +1,43 @@ +From 86ba7cddb4cf09545b6816dea52057b86679457d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 4 Mar 2021 17:01:39 +0100 +Subject: reset: ti-syscon: fix to_ti_syscon_reset_data macro + +From: Philipp Zabel + +[ Upstream commit 05cf8fffcdeb47aef1203c08cbec5224fd3a0e1c ] + +The to_ti_syscon_reset_data macro currently only works if the +parameter passed into it is called 'rcdev'. + +Fixes a checkpatch --strict issue: + + CHECK: Macro argument reuse 'rcdev' - possible side-effects? + #53: FILE: drivers/reset/reset-ti-syscon.c:53: + +#define to_ti_syscon_reset_data(rcdev) \ + + container_of(rcdev, struct ti_syscon_reset_data, rcdev) + +Signed-off-by: Philipp Zabel +Signed-off-by: Sasha Levin +--- + drivers/reset/reset-ti-syscon.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/reset/reset-ti-syscon.c b/drivers/reset/reset-ti-syscon.c +index 99520b0a1329..3d375747c4e6 100644 +--- a/drivers/reset/reset-ti-syscon.c ++++ b/drivers/reset/reset-ti-syscon.c +@@ -58,8 +58,8 @@ struct ti_syscon_reset_data { + unsigned int nr_controls; + }; + +-#define to_ti_syscon_reset_data(rcdev) \ +- container_of(rcdev, struct ti_syscon_reset_data, rcdev) ++#define to_ti_syscon_reset_data(_rcdev) \ ++ container_of(_rcdev, struct ti_syscon_reset_data, rcdev) + + /** + * ti_syscon_reset_assert() - assert device reset +-- +2.30.2 + diff --git a/queue-4.14/rtc-max77686-do-not-enforce-incorrect-interrupt-trig.patch b/queue-4.14/rtc-max77686-do-not-enforce-incorrect-interrupt-trig.patch new file mode 100644 index 00000000000..2f5e3678f2a --- /dev/null +++ b/queue-4.14/rtc-max77686-do-not-enforce-incorrect-interrupt-trig.patch @@ -0,0 +1,49 @@ +From 6bfa2199bcc5217241730a03328426cf0c71a73d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 26 May 2021 13:20:34 -0400 +Subject: rtc: max77686: Do not enforce (incorrect) interrupt trigger type + +From: Krzysztof Kozlowski + +[ Upstream commit 742b0d7e15c333303daad4856de0764f4bc83601 ] + +Interrupt line can be configured on different hardware in different way, +even inverted. Therefore driver should not enforce specific trigger +type - edge falling - but instead rely on Devicetree to configure it. + +The Maxim 77686 datasheet describes the interrupt line as active low +with a requirement of acknowledge from the CPU therefore the edge +falling is not correct. + +The interrupt line is shared between PMIC and RTC driver, so using level +sensitive interrupt is here especially important to avoid races. With +an edge configuration in case if first PMIC signals interrupt followed +shortly after by the RTC, the interrupt might not be yet cleared/acked +thus the second one would not be noticed. + +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Alexandre Belloni +Link: https://lore.kernel.org/r/20210526172036.183223-6-krzysztof.kozlowski@canonical.com +Signed-off-by: Sasha Levin +--- + drivers/rtc/rtc-max77686.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c +index 182fdd00e290..ecd61573dd31 100644 +--- a/drivers/rtc/rtc-max77686.c ++++ b/drivers/rtc/rtc-max77686.c +@@ -718,8 +718,8 @@ static int max77686_init_rtc_regmap(struct max77686_rtc_info *info) + + add_rtc_irq: + ret = regmap_add_irq_chip(info->rtc_regmap, info->rtc_irq, +- IRQF_TRIGGER_FALLING | IRQF_ONESHOT | +- IRQF_SHARED, 0, info->drv_data->rtc_irq_chip, ++ IRQF_ONESHOT | IRQF_SHARED, ++ 0, info->drv_data->rtc_irq_chip, + &info->rtc_irq_data); + if (ret < 0) { + dev_err(info->dev, "Failed to add RTC irq chip: %d\n", ret); +-- +2.30.2 + diff --git a/queue-4.14/sched-fair-fix-cfs-bandwidth-hrtimer-expiry-type.patch b/queue-4.14/sched-fair-fix-cfs-bandwidth-hrtimer-expiry-type.patch new file mode 100644 index 00000000000..7d133f24e75 --- /dev/null +++ b/queue-4.14/sched-fair-fix-cfs-bandwidth-hrtimer-expiry-type.patch @@ -0,0 +1,53 @@ +From 7edb36ab0ec5b34f13634a342feb90d12753151d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 29 Jun 2021 14:14:52 +0200 +Subject: sched/fair: Fix CFS bandwidth hrtimer expiry type + +From: Odin Ugedal + +[ Upstream commit 72d0ad7cb5bad265adb2014dbe46c4ccb11afaba ] + +The time remaining until expiry of the refresh_timer can be negative. +Casting the type to an unsigned 64-bit value will cause integer +underflow, making the runtime_refresh_within return false instead of +true. These situations are rare, but they do happen. + +This does not cause user-facing issues or errors; other than +possibly unthrottling cfs_rq's using runtime from the previous period(s), +making the CFS bandwidth enforcement less strict in those (special) +situations. + +Signed-off-by: Odin Ugedal +Signed-off-by: Peter Zijlstra (Intel) +Reviewed-by: Ben Segall +Link: https://lore.kernel.org/r/20210629121452.18429-1-odin@uged.al +Signed-off-by: Sasha Levin +--- + kernel/sched/fair.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c +index 37ac76dce908..3ff60230710c 100644 +--- a/kernel/sched/fair.c ++++ b/kernel/sched/fair.c +@@ -4464,7 +4464,7 @@ static const u64 cfs_bandwidth_slack_period = 5 * NSEC_PER_MSEC; + static int runtime_refresh_within(struct cfs_bandwidth *cfs_b, u64 min_expire) + { + struct hrtimer *refresh_timer = &cfs_b->period_timer; +- u64 remaining; ++ s64 remaining; + + /* if the call-back is running a quota refresh is already occurring */ + if (hrtimer_callback_running(refresh_timer)) +@@ -4472,7 +4472,7 @@ static int runtime_refresh_within(struct cfs_bandwidth *cfs_b, u64 min_expire) + + /* is a quota refresh about to occur? */ + remaining = ktime_to_ns(hrtimer_expires_remaining(refresh_timer)); +- if (remaining < min_expire) ++ if (remaining < (s64)min_expire) + return 1; + + return 0; +-- +2.30.2 + diff --git a/queue-4.14/scsi-aic7xxx-fix-unintentional-sign-extension-issue-.patch b/queue-4.14/scsi-aic7xxx-fix-unintentional-sign-extension-issue-.patch new file mode 100644 index 00000000000..bc7c3ee794a --- /dev/null +++ b/queue-4.14/scsi-aic7xxx-fix-unintentional-sign-extension-issue-.patch @@ -0,0 +1,46 @@ +From 06a0a32351c559533e97d319b534a545eb5d5562 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 21 Jun 2021 16:17:27 +0100 +Subject: scsi: aic7xxx: Fix unintentional sign extension issue on left shift + of u8 + +From: Colin Ian King + +[ Upstream commit 332a9dd1d86f1e7203fc7f0fd7e82f0b304200fe ] + +The shifting of the u8 integer returned fom ahc_inb(ahc, port+3) by 24 bits +to the left will be promoted to a 32 bit signed int and then sign-extended +to a u64. In the event that the top bit of the u8 is set then all then all +the upper 32 bits of the u64 end up as also being set because of the +sign-extension. Fix this by casting the u8 values to a u64 before the 24 +bit left shift. + +[ This dates back to 2002, I found the offending commit from the git +history git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git, +commit f58eb66c0b0a ("Update aic7xxx driver to 6.2.10...") ] + +Link: https://lore.kernel.org/r/20210621151727.20667-1-colin.king@canonical.com +Signed-off-by: Colin Ian King +Signed-off-by: Martin K. Petersen +Addresses-Coverity: ("Unintended sign extension") +Signed-off-by: Sasha Levin +--- + drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c +index fdbb0a3dc9b4..6929aa13adc3 100644 +--- a/drivers/scsi/aic7xxx/aic7xxx_core.c ++++ b/drivers/scsi/aic7xxx/aic7xxx_core.c +@@ -500,7 +500,7 @@ ahc_inq(struct ahc_softc *ahc, u_int port) + return ((ahc_inb(ahc, port)) + | (ahc_inb(ahc, port+1) << 8) + | (ahc_inb(ahc, port+2) << 16) +- | (ahc_inb(ahc, port+3) << 24) ++ | (((uint64_t)ahc_inb(ahc, port+3)) << 24) + | (((uint64_t)ahc_inb(ahc, port+4)) << 32) + | (((uint64_t)ahc_inb(ahc, port+5)) << 40) + | (((uint64_t)ahc_inb(ahc, port+6)) << 48) +-- +2.30.2 + diff --git a/queue-4.14/scsi-libfc-fix-array-index-out-of-bound-exception.patch b/queue-4.14/scsi-libfc-fix-array-index-out-of-bound-exception.patch new file mode 100644 index 00000000000..e8e766f0e44 --- /dev/null +++ b/queue-4.14/scsi-libfc-fix-array-index-out-of-bound-exception.patch @@ -0,0 +1,53 @@ +From 200173de6f9a9c8d8bcff5a3ede4799b0ee183d6 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Jun 2021 09:59:39 -0700 +Subject: scsi: libfc: Fix array index out of bound exception + +From: Javed Hasan + +[ Upstream commit b27c4577557045f1ab3cdfeabfc7f3cd24aca1fe ] + +Fix array index out of bound exception in fc_rport_prli_resp(). + +Link: https://lore.kernel.org/r/20210615165939.24327-1-jhasan@marvell.com +Signed-off-by: Javed Hasan +Signed-off-by: Martin K. Petersen +Signed-off-by: Sasha Levin +--- + drivers/scsi/libfc/fc_rport.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c +index 669cf3553a77..ef2fa6b10a9c 100644 +--- a/drivers/scsi/libfc/fc_rport.c ++++ b/drivers/scsi/libfc/fc_rport.c +@@ -1174,6 +1174,7 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp, + resp_code = (pp->spp.spp_flags & FC_SPP_RESP_MASK); + FC_RPORT_DBG(rdata, "PRLI spp_flags = 0x%x spp_type 0x%x\n", + pp->spp.spp_flags, pp->spp.spp_type); ++ + rdata->spp_type = pp->spp.spp_type; + if (resp_code != FC_SPP_RESP_ACK) { + if (resp_code == FC_SPP_RESP_CONF) +@@ -1194,11 +1195,13 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp, + /* + * Call prli provider if we should act as a target + */ +- prov = fc_passive_prov[rdata->spp_type]; +- if (prov) { +- memset(&temp_spp, 0, sizeof(temp_spp)); +- prov->prli(rdata, pp->prli.prli_spp_len, +- &pp->spp, &temp_spp); ++ if (rdata->spp_type < FC_FC4_PROV_SIZE) { ++ prov = fc_passive_prov[rdata->spp_type]; ++ if (prov) { ++ memset(&temp_spp, 0, sizeof(temp_spp)); ++ prov->prli(rdata, pp->prli.prli_spp_len, ++ &pp->spp, &temp_spp); ++ } + } + /* + * Check if the image pair could be established +-- +2.30.2 + diff --git a/queue-4.14/series b/queue-4.14/series new file mode 100644 index 00000000000..815f8ba3ec7 --- /dev/null +++ b/queue-4.14/series @@ -0,0 +1,26 @@ +arm-dts-gemini-add-device_type-on-pci.patch +arm-dts-rockchip-fix-pinctrl-sleep-nodename-for-rk30.patch +arm64-dts-rockchip-fix-pinctrl-sleep-nodename-for-rk.patch +arm-dts-rockchip-fix-the-timer-clocks-order.patch +arm-dts-rockchip-fix-power-controller-node-names-for.patch +arm64-dts-rockchip-fix-power-controller-node-names-f.patch +reset-ti-syscon-fix-to_ti_syscon_reset_data-macro.patch +arm-brcmstb-dts-fix-nand-nodes-names.patch +arm-cygnus-dts-fix-nand-nodes-names.patch +arm-nsp-dts-fix-nand-nodes-names.patch +arm-dts-bcm63xx-fix-nand-nodes-names.patch +arm-dts-imx6-phyflex-fix-uart-hardware-flow-control.patch +arm-imx-pm-imx5-fix-references-to-imx5_cpu_suspend_i.patch +arm-dts-am335x-align-gpio-hog-names-with-dt-schema.patch +arm-dts-am437x-align-gpio-hog-names-with-dt-schema.patch +arm-dts-omap5-board-common-align-gpio-hog-names-with.patch +arm-dts-dra7x-evm-align-gpio-hog-names-with-dt-schem.patch +arm-dts-stm32-fix-rcc-node-name-on-stm32f429-mcu.patch +arm64-dts-juno-update-scpi-nodes-as-per-the-yaml-sch.patch +arm64-dts-ls208xa-remove-bus-num-from-dspi-node.patch +thermal-core-correct-function-name-thermal_zone_devi.patch +kbuild-mkcompile_h-consider-timestamp-if-kbuild_buil.patch +rtc-max77686-do-not-enforce-incorrect-interrupt-trig.patch +scsi-aic7xxx-fix-unintentional-sign-extension-issue-.patch +scsi-libfc-fix-array-index-out-of-bound-exception.patch +sched-fair-fix-cfs-bandwidth-hrtimer-expiry-type.patch diff --git a/queue-4.14/thermal-core-correct-function-name-thermal_zone_devi.patch b/queue-4.14/thermal-core-correct-function-name-thermal_zone_devi.patch new file mode 100644 index 00000000000..50b2304fd7e --- /dev/null +++ b/queue-4.14/thermal-core-correct-function-name-thermal_zone_devi.patch @@ -0,0 +1,37 @@ +From 92d370c21b0155b9eea45d1137fcac5b1be6b9b3 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 17 May 2021 13:10:20 +0800 +Subject: thermal/core: Correct function name thermal_zone_device_unregister() + +From: Yang Yingliang + +[ Upstream commit a052b5118f13febac1bd901fe0b7a807b9d6b51c ] + +Fix the following make W=1 kernel build warning: + + drivers/thermal/thermal_core.c:1376: warning: expecting prototype for thermal_device_unregister(). Prototype was for thermal_zone_device_unregister() instead + +Signed-off-by: Yang Yingliang +Signed-off-by: Daniel Lezcano +Link: https://lore.kernel.org/r/20210517051020.3463536-1-yangyingliang@huawei.com +Signed-off-by: Sasha Levin +--- + drivers/thermal/thermal_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c +index fcefafe7df48..2db83b555e59 100644 +--- a/drivers/thermal/thermal_core.c ++++ b/drivers/thermal/thermal_core.c +@@ -1304,7 +1304,7 @@ free_tz: + EXPORT_SYMBOL_GPL(thermal_zone_device_register); + + /** +- * thermal_device_unregister - removes the registered thermal zone device ++ * thermal_zone_device_unregister - removes the registered thermal zone device + * @tz: the thermal zone device to remove + */ + void thermal_zone_device_unregister(struct thermal_zone_device *tz) +-- +2.30.2 +