From: Greg Kroah-Hartman Date: Thu, 22 Jul 2021 08:53:36 +0000 (+0200) Subject: fuzz fixups X-Git-Tag: v5.4.135~26 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5bf17fef65f1388fb79482c0e56cd7078df0f2cf;p=thirdparty%2Fkernel%2Fstable-queue.git fuzz fixups --- diff --git a/queue-5.10/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch b/queue-5.10/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch index 17ced928f11..7a14d763f4d 100644 --- a/queue-5.10/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch +++ b/queue-5.10/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch @@ -16,12 +16,10 @@ Signed-off-by: Grygorii Strashko Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- - arch/arm/boot/dts/am437x-gp-evm.dts | 5 ++++- - arch/arm/boot/dts/am437x-l4.dtsi | 2 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 5 ++++- + arch/arm/boot/dts/am437x-l4.dtsi | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) -diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts -index 45cbc7fb557a..e2677682b540 100644 --- a/arch/arm/boot/dts/am437x-gp-evm.dts +++ b/arch/arm/boot/dts/am437x-gp-evm.dts @@ -813,11 +813,14 @@ @@ -38,10 +36,8 @@ index 45cbc7fb557a..e2677682b540 100644 status = "okay"; - ti,no-reset-on-init; - sel-lcd-hdmi-hog { + p8 { /* -diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi -index 243e35f7a56c..370c4e64676f 100644 --- a/arch/arm/boot/dts/am437x-l4.dtsi +++ b/arch/arm/boot/dts/am437x-l4.dtsi @@ -2033,7 +2033,7 @@ @@ -53,6 +49,3 @@ index 243e35f7a56c..370c4e64676f 100644 compatible = "ti,sysc-omap2", "ti,sysc"; reg = <0x22000 0x4>, <0x22010 0x4>, --- -2.30.2 - diff --git a/queue-5.13/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch b/queue-5.13/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch index 7f0d7879958..00138f66669 100644 --- a/queue-5.13/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch +++ b/queue-5.13/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch @@ -16,12 +16,10 @@ Signed-off-by: Grygorii Strashko Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- - arch/arm/boot/dts/am437x-gp-evm.dts | 5 ++++- - arch/arm/boot/dts/am437x-l4.dtsi | 2 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 5 ++++- + arch/arm/boot/dts/am437x-l4.dtsi | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) -diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts -index 45cbc7fb557a..e2677682b540 100644 --- a/arch/arm/boot/dts/am437x-gp-evm.dts +++ b/arch/arm/boot/dts/am437x-gp-evm.dts @@ -813,11 +813,14 @@ @@ -38,10 +36,8 @@ index 45cbc7fb557a..e2677682b540 100644 status = "okay"; - ti,no-reset-on-init; - sel-lcd-hdmi-hog { + p8 { /* -diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi -index e217ffc09770..a6f19ae7d3e6 100644 --- a/arch/arm/boot/dts/am437x-l4.dtsi +++ b/arch/arm/boot/dts/am437x-l4.dtsi @@ -2070,7 +2070,7 @@ @@ -53,6 +49,3 @@ index e217ffc09770..a6f19ae7d3e6 100644 compatible = "ti,sysc-omap2", "ti,sysc"; reg = <0x22000 0x4>, <0x22010 0x4>, --- -2.30.2 - diff --git a/queue-5.4/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch b/queue-5.4/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch index c02d75bd8e0..ebfa982a661 100644 --- a/queue-5.4/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch +++ b/queue-5.4/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch @@ -16,12 +16,10 @@ Signed-off-by: Grygorii Strashko Signed-off-by: Tony Lindgren Signed-off-by: Sasha Levin --- - arch/arm/boot/dts/am437x-gp-evm.dts | 5 ++++- - arch/arm/boot/dts/am437x-l4.dtsi | 2 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 5 ++++- + arch/arm/boot/dts/am437x-l4.dtsi | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) -diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts -index acc4c2760f46..537c9eb8b748 100644 --- a/arch/arm/boot/dts/am437x-gp-evm.dts +++ b/arch/arm/boot/dts/am437x-gp-evm.dts @@ -829,11 +829,14 @@ @@ -38,10 +36,8 @@ index acc4c2760f46..537c9eb8b748 100644 status = "okay"; - ti,no-reset-on-init; - sel-lcd-hdmi-hog { + p8 { /* -diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi -index bbe15775fccd..6c2949991e29 100644 --- a/arch/arm/boot/dts/am437x-l4.dtsi +++ b/arch/arm/boot/dts/am437x-l4.dtsi @@ -2077,7 +2077,7 @@ @@ -53,6 +49,3 @@ index bbe15775fccd..6c2949991e29 100644 compatible = "ti,sysc-omap2", "ti,sysc"; ti,hwmods = "gpio6"; reg = <0x22000 0x4>, --- -2.30.2 -