From c2fdfbf1f86c6dec2d121a6138920aee36220771 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 13 Jul 2019 16:19:19 +0200 Subject: [PATCH] drop more dts patches from 5.1 --- ...dts-dra71x-disable-rtc-target-module.patch | 56 ------------------- ...dra71x-disable-usb4_tm-target-module.patch | 34 ----------- queue-5.1/series | 2 - 3 files changed, 92 deletions(-) delete mode 100644 queue-5.1/arm-dts-dra71x-disable-rtc-target-module.patch delete mode 100644 queue-5.1/arm-dts-dra71x-disable-usb4_tm-target-module.patch diff --git a/queue-5.1/arm-dts-dra71x-disable-rtc-target-module.patch b/queue-5.1/arm-dts-dra71x-disable-rtc-target-module.patch deleted file mode 100644 index aaea80f160a..00000000000 --- a/queue-5.1/arm-dts-dra71x-disable-rtc-target-module.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 957ee468e645093e4a7f8122354ff009e8fa7c2d Mon Sep 17 00:00:00 2001 -From: Keerthy -Date: Fri, 17 May 2019 06:44:08 +0530 -Subject: ARM: dts: dra71x: Disable rtc target module - -[ Upstream commit fe9edfe648ac444150ec95da1fb10e2728cc9789 ] - -Introduce dra71x.dtsi to include dra71x specific changes. -rtc is fused out on dra71 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 -Signed-off-by: Tony Lindgren -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/dra71-evm.dts | 2 +- - arch/arm/boot/dts/dra71x.dtsi | 13 +++++++++++++ - 2 files changed, 14 insertions(+), 1 deletion(-) - create mode 100644 arch/arm/boot/dts/dra71x.dtsi - -diff --git a/arch/arm/boot/dts/dra71-evm.dts b/arch/arm/boot/dts/dra71-evm.dts -index 82cc7ec37af0..c496ae83e27e 100644 ---- a/arch/arm/boot/dts/dra71-evm.dts -+++ b/arch/arm/boot/dts/dra71-evm.dts -@@ -6,7 +6,7 @@ - * published by the Free Software Foundation. - */ - --#include "dra72-evm-common.dtsi" -+#include "dra71x.dtsi" - #include "dra7-mmc-iodelay.dtsi" - #include "dra72x-mmc-iodelay.dtsi" - #include -diff --git a/arch/arm/boot/dts/dra71x.dtsi b/arch/arm/boot/dts/dra71x.dtsi -new file mode 100644 -index 000000000000..aad7394902a6 ---- /dev/null -+++ b/arch/arm/boot/dts/dra71x.dtsi -@@ -0,0 +1,13 @@ -+/* -+ * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/ -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ */ -+ -+#include "dra72-evm-common.dtsi" -+ -+&rtctarget { -+ status = "disabled"; -+}; --- -2.20.1 - diff --git a/queue-5.1/arm-dts-dra71x-disable-usb4_tm-target-module.patch b/queue-5.1/arm-dts-dra71x-disable-usb4_tm-target-module.patch deleted file mode 100644 index 9d0be4c8bd2..00000000000 --- a/queue-5.1/arm-dts-dra71x-disable-usb4_tm-target-module.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b4aee42bdcd83c4f2440687c075744161037cbc8 Mon Sep 17 00:00:00 2001 -From: Keerthy -Date: Fri, 17 May 2019 06:44:09 +0530 -Subject: ARM: dts: dra71x: Disable usb4_tm target module - -[ Upstream commit 34b1b8061de3215208db9accfe60cc3f5b40178f ] - -usb4_tm is unsed on dra71 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 -Signed-off-by: Tony Lindgren -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/dra71x.dtsi | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/arch/arm/boot/dts/dra71x.dtsi b/arch/arm/boot/dts/dra71x.dtsi -index aad7394902a6..695a08ed0360 100644 ---- a/arch/arm/boot/dts/dra71x.dtsi -+++ b/arch/arm/boot/dts/dra71x.dtsi -@@ -11,3 +11,7 @@ - &rtctarget { - status = "disabled"; - }; -+ -+&usb4_tm { -+ status = "disabled"; -+}; --- -2.20.1 - diff --git a/queue-5.1/series b/queue-5.1/series index 38725606f6c..0fcf20c3743 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-dra71x-disable-rtc-target-module.patch -arm-dts-dra71x-disable-usb4_tm-target-module.patch soc-brcmstb-fix-error-path-for-unsupported-cpus.patch soc-bcm-brcmstb-biuctrl-register-writes-require-a-ba.patch input-elantech-enable-middle-button-support-on-2-thi.patch -- 2.47.3