]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fuzz fixups
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Jul 2021 08:53:36 +0000 (10:53 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Jul 2021 08:53:36 +0000 (10:53 +0200)
queue-5.10/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch
queue-5.13/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch
queue-5.4/arm-dts-am437x-gp-evm-fix-ti-no-reset-on-init-flag-f.patch

index 17ced928f11d75e1f971efabe31cfc060f172479..7a14d763f4d85d19d3dd5d30fabc3e18d4cb2c77 100644 (file)
@@ -16,12 +16,10 @@ Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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
-
index 7f0d787995838d4d7fe5d7fd9cc3a924bccf266c..00138f66669265d4a85da4a75b05058ae50b5c74 100644 (file)
@@ -16,12 +16,10 @@ Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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
-
index c02d75bd8e0b57f90a5da3678c917dd44faea3c9..ebfa982a6616607d48743787ce8c91fce46ab418 100644 (file)
@@ -16,12 +16,10 @@ Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
 Signed-off-by: Tony Lindgren <tony@atomide.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- 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
-