From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 12 Jul 2019 15:30:09 +0000 (+0200)
Subject: drop 2 dts patches from 5.1.y
X-Git-Tag: v5.2.1~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b272d125b0c270913de3ca60501be1067ae25970;p=thirdparty%2Fkernel%2Fstable-queue.git

drop 2 dts patches from 5.1.y
---

diff --git a/queue-5.1/arm-dts-dra76x-disable-rtc-target-module.patch b/queue-5.1/arm-dts-dra76x-disable-rtc-target-module.patch
deleted file mode 100644
index ba066289813..00000000000
--- a/queue-5.1/arm-dts-dra76x-disable-rtc-target-module.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2fa66ed77bb63b37157481f27f6263c1ad00c499 Mon Sep 17 00:00:00 2001
-From: Keerthy <j-keerthy@ti.com>
-Date: Fri, 17 May 2019 06:44:06 +0530
-Subject: ARM: dts: dra76x: Disable rtc target module
-
-[ Upstream commit f7b9cb944a5d41fdede4e928a47e9d5fce5169d7 ]
-
-rtc is fused out on dra76 and accessing target module
-register is causing a boot crash hence disable it.
-
-Fixes: 549fce068a3112 ("ARM: dts: dra7: Add l4 interconnect hierarchy and ti-sysc data")
-Signed-off-by: Keerthy <j-keerthy@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/dra7-l4.dtsi | 2 +-
- arch/arm/boot/dts/dra76x.dtsi  | 4 ++++
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi
-index 414f1cd68733..73f5c050f586 100644
---- a/arch/arm/boot/dts/dra7-l4.dtsi
-+++ b/arch/arm/boot/dts/dra7-l4.dtsi
-@@ -3543,7 +3543,7 @@
- 			};
- 		};
- 
--		target-module@38000 {			/* 0x48838000, ap 29 12.0 */
-+		rtctarget: target-module@38000 {			/* 0x48838000, ap 29 12.0 */
- 			compatible = "ti,sysc-omap4-simple", "ti,sysc";
- 			ti,hwmods = "rtcss";
- 			reg = <0x38074 0x4>,
-diff --git a/arch/arm/boot/dts/dra76x.dtsi b/arch/arm/boot/dts/dra76x.dtsi
-index 9ee45aa365d8..5c437271d307 100644
---- a/arch/arm/boot/dts/dra76x.dtsi
-+++ b/arch/arm/boot/dts/dra76x.dtsi
-@@ -81,3 +81,7 @@
- 		reg = <0x3fc>;
- 	};
- };
-+
-+&rtctarget {
-+	status = "disabled";
-+};
--- 
-2.20.1
-
diff --git a/queue-5.1/arm-dts-dra76x-disable-usb4_tm-target-module.patch b/queue-5.1/arm-dts-dra76x-disable-usb4_tm-target-module.patch
deleted file mode 100644
index 38755675ae1..00000000000
--- a/queue-5.1/arm-dts-dra76x-disable-usb4_tm-target-module.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fa506e84c13b2e03449a8fbb350acff838b0d24f Mon Sep 17 00:00:00 2001
-From: Keerthy <j-keerthy@ti.com>
-Date: Fri, 17 May 2019 06:44:07 +0530
-Subject: ARM: dts: dra76x: Disable usb4_tm target module
-
-[ Upstream commit b07bd27e02b9108ce8412cc2dc6faf621f57d224 ]
-
-usb4_tm is unsed on dra76 and accessing the module
-with ti,sysc is causing a boot crash hence disable its target
-module.
-
-Fixes: 549fce068a3112 ("ARM: dts: dra7: Add l4 interconnect hierarchy and ti-sysc data")
-Signed-off-by: Keerthy <j-keerthy@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/dra76x.dtsi | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm/boot/dts/dra76x.dtsi b/arch/arm/boot/dts/dra76x.dtsi
-index 5c437271d307..82b3dc90b7d6 100644
---- a/arch/arm/boot/dts/dra76x.dtsi
-+++ b/arch/arm/boot/dts/dra76x.dtsi
-@@ -85,3 +85,7 @@
- &rtctarget {
- 	status = "disabled";
- };
-+
-+&usb4_tm {
-+	status = "disabled";
-+};
--- 
-2.20.1
-
diff --git a/queue-5.1/series b/queue-5.1/series
index 3c83fb2985d..38725606f6c 100644
--- a/queue-5.1/series
+++ b/queue-5.1/series
@@ -1,8 +1,6 @@
 crypto-talitos-fix-hash-on-sec1.patch
 crypto-lrw-use-correct-alignmask.patch
 crypto-talitos-rename-alternative-aead-algos.patch
-arm-dts-dra76x-disable-rtc-target-module.patch
-arm-dts-dra76x-disable-usb4_tm-target-module.patch
 arm-dts-dra71x-disable-rtc-target-module.patch
 arm-dts-dra71x-disable-usb4_tm-target-module.patch
 soc-brcmstb-fix-error-path-for-unsupported-cpus.patch