From: Greg Kroah-Hartman Date: Tue, 31 Mar 2020 08:20:39 +0000 (+0200) Subject: drop queue-4.19/arm-dts-sun8i-a83t-tbs-a711-fix-usb-otg-mode-detection.patch X-Git-Tag: v5.6.1~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e24e4eb960d92991d1ce6aa6e364c4a5b164ad9b;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.19/arm-dts-sun8i-a83t-tbs-a711-fix-usb-otg-mode-detection.patch --- diff --git a/queue-4.19/arm-dts-sun8i-a83t-tbs-a711-fix-usb-otg-mode-detection.patch b/queue-4.19/arm-dts-sun8i-a83t-tbs-a711-fix-usb-otg-mode-detection.patch deleted file mode 100644 index e3cf572e3b8..00000000000 --- a/queue-4.19/arm-dts-sun8i-a83t-tbs-a711-fix-usb-otg-mode-detection.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b642d4825441bf30c72b72deb739bd2d5f53af08 Mon Sep 17 00:00:00 2001 -From: Ondrej Jirman -Date: Sat, 22 Feb 2020 23:31:53 +0100 -Subject: ARM: dts: sun8i-a83t-tbs-a711: Fix USB OTG mode detection - -From: Ondrej Jirman - -commit b642d4825441bf30c72b72deb739bd2d5f53af08 upstream. - -USB-ID signal has a pullup on the schematic, but in reality it's not -pulled up, so add a GPIO pullup. And we also need a usb0_vbus_power-supply -for VBUS detection. - -This fixes OTG mode detection and charging issues on TBS A711 tablet. -The issues came from ID pin reading 0, causing host mode to be enabled, -when it should not be, leading to DRVVBUS being enabled, which disabled -the charger. - -Fixes: f2f221c7810b824e ("ARM: dts: sun8i: a711: Enable USB OTG") -Signed-off-by: Ondrej Jirman -Signed-off-by: Maxime Ripard -Signed-off-by: Greg Kroah-Hartman - ---- - arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts -+++ b/arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts -@@ -416,7 +416,8 @@ - }; - - &usbphy { -- usb0_id_det-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */ -+ usb0_id_det-gpios = <&pio 7 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH11 */ -+ usb0_vbus_power-supply = <&usb_power_supply>; - usb0_vbus-supply = <®_drivevbus>; - usb1_vbus_supply = <®_vmain>; - usb2_vbus_supply = <®_vmain>; diff --git a/queue-4.19/series b/queue-4.19/series index 9ababa7111a..1ba38d29a04 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -73,7 +73,6 @@ netfilter-flowtable-reload-ip-v6-h-in-nf_flow_tuple_ip-v6.patch netfilter-nft_fwd_netdev-validate-family-and-chain-type.patch netfilter-nft_fwd_netdev-allow-to-redirect-to-ifb-via-ingress.patch bpf-btf-fix-btf-verification-of-enum-members-in-struct-union.patch -arm-dts-sun8i-a83t-tbs-a711-fix-usb-otg-mode-detection.patch vti6-fix-memory-leak-of-skb-if-input-policy-check-fails.patch revert-r8169-check-that-realtek-phy-driver-module-is-loaded.patch mac80211-add-option-for-setting-control-flags.patch