From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 25 Nov 2019 13:28:02 +0000 (+0100)
Subject: 4.4: drom some omap dts patches that were causing problems.
X-Git-Tag: v4.4.203~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=679b00d7068e030d5dfd41bece030c5a2241c295;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4: drom some omap dts patches that were causing problems.
---

diff --git a/queue-4.4/arm-dts-omap5-enable-otg-role-for-dwc3-controller.patch b/queue-4.4/arm-dts-omap5-enable-otg-role-for-dwc3-controller.patch
deleted file mode 100644
index 085c3e997c5..00000000000
--- a/queue-4.4/arm-dts-omap5-enable-otg-role-for-dwc3-controller.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8760aec3e11ad97c384a06ff41d31e12c846f0fc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 28 Sep 2018 17:54:00 +0200
-Subject: ARM: dts: omap5: enable OTG role for DWC3 controller
-
-From: H. Nikolaus Schaller <hns@goldelico.com>
-
-[ Upstream commit 656c1a65ab555ee5c7cd0d6aee8ab82ca3c1795f ]
-
-Since SMPS10 and OTG cable detection extcon are described here, and
-work to enable OTG power when an OTG cable is plugged in, we can
-define OTG mode in the controller (which is disabled by default in
-omap5.dtsi).
-
-Tested on OMAP5EVM and Pyra.
-
-Suggested-by: Roger Quadros <rogerq@ti.com>
-Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/omap5-board-common.dtsi | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
-index 41e80e7f20bea..d2398d2a0c08c 100644
---- a/arch/arm/boot/dts/omap5-board-common.dtsi
-+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
-@@ -633,6 +633,10 @@
- 	vbus-supply = <&smps10_out1_reg>;
- };
- 
-+&dwc3 {
-+	dr_mode = "otg";
-+};
-+
- &mcspi1 {
- 
- };
--- 
-2.20.1
-
diff --git a/queue-4.4/arm-dts-omap5-fix-dual-role-mode-on-super-speed-port.patch b/queue-4.4/arm-dts-omap5-fix-dual-role-mode-on-super-speed-port.patch
deleted file mode 100644
index 629221e7994..00000000000
--- a/queue-4.4/arm-dts-omap5-fix-dual-role-mode-on-super-speed-port.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From cf6a7f6eb38eabe0adafdc9195d78d5e29ce5be6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 5 Dec 2018 19:27:44 +0200
-Subject: ARM: dts: omap5: Fix dual-role mode on Super-Speed port
-
-From: Roger Quadros <rogerq@ti.com>
-
-[ Upstream commit a763ecc15d0e37c3a15ff6825183061209832685 ]
-
-OMAP5's Super-Speed USB port has a software mailbox register
-that needs to be fed with VBUS and ID events from an external
-VBUS/ID comparator.
-
-Without this, Host role will not work correctly.
-
-Fixes: 656c1a65ab55 ("ARM: dts: omap5: enable OTG role for DWC3 controller")
-Reported-by: H. Nikolaus Schaller <hns@goldelico.com>
-Signed-off-by: Roger Quadros <rogerq@ti.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/omap5-board-common.dtsi | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/boot/dts/omap5-board-common.dtsi b/arch/arm/boot/dts/omap5-board-common.dtsi
-index d2398d2a0c08c..4ea4cf6c5b471 100644
---- a/arch/arm/boot/dts/omap5-board-common.dtsi
-+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
-@@ -634,6 +634,7 @@
- };
- 
- &dwc3 {
-+	extcon = <&extcon_usb3>;
- 	dr_mode = "otg";
- };
- 
--- 
-2.20.1
-
diff --git a/queue-4.4/series b/queue-4.4/series
index a54c003aeb0..4f1fd4294ec 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -108,7 +108,6 @@ fbdev-ditch-fb_edid_add_monspecs.patch
 block-introduce-blk_rq_is_passthrough.patch
 libata-have-ata_scsi_rw_xlat-fail-invalid-passthrough-requests.patch
 net-ovs-fix-return-type-of-ndo_start_xmit-function.patch
-arm-dts-omap5-enable-otg-role-for-dwc3-controller.patch
 f2fs-return-correct-errno-in-f2fs_gc.patch
 sunrpc-fix-priority-queue-fairness.patch
 ath10k-fix-vdev-start-timeout-on-error.patch
@@ -154,5 +153,4 @@ arm-8802-1-call-syscall_trace_exit-even-when-system-.patch
 hwmon-pwm-fan-silence-error-on-probe-deferral.patch
 mac80211-minstrel-fix-cck-rate-group-streams-value.patch
 spi-rockchip-initialize-dma_slave_config-properly.patch
-arm-dts-omap5-fix-dual-role-mode-on-super-speed-port.patch
 arm64-uaccess-ensure-pan-is-re-enabled-after-unhandled-uaccess-fault.patch