drop queue-5.15/arm64-dts-qcom-msm8916-longcheer-l8150-use-pm8916_usbin-extcon.patch

diff --git a/queue-5.15/arm64-dts-qcom-msm8916-longcheer-l8150-use-pm8916_usbin-extcon.patch b/queue-5.15/arm64-dts-qcom-msm8916-longcheer-l8150-use-pm8916_usbin-extcon.patch
deleted file mode 100644 (file)
index 1ff87c9..0000000
--- a/queue-5.15/arm64-dts-qcom-msm8916-longcheer-l8150-use-pm8916_usbin-extcon.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From b30cad26d8030bddeb0ee2373b6d4c1440ffb1a3 Mon Sep 17 00:00:00 2001
-From: Stephan Gerhold <stephan@gerhold.net>
-Date: Tue, 28 Sep 2021 13:29:45 +0200
-Subject: arm64: dts: qcom: msm8916-longcheer-l8150: Use &pm8916_usbin extcon
-
-From: Stephan Gerhold <stephan@gerhold.net>
-
-commit b30cad26d8030bddeb0ee2373b6d4c1440ffb1a3 upstream.
-
-At the moment, longcheer-l8150 is using a dummy extcon-usb-gpio device
-that permanently enables USB gadget mode. This workaround allows USB
-to work but is actually wrong and confusing. The "vbus-gpio" used there
-refers to an unused (floating) GPIO that is pulled up to make
-extcon-usb-gpio report USB gadget mode permanently.
-
-Replace this with the new &pm8916_usbin extcon device that actually
-reports if an USB cable is attached or not. This allows the USB PHY
-to be turned off when there is no USB cable attached and is much
-cleaner overall.
-
-Fixes: 16e8e8072108 ("arm64: dts: qcom: Add device tree for Longcheer L8150")
-Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
-Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
-Link: https://lore.kernel.org/r/20210928112945.25310-3-stephan@gerhold.net
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts |   23 ++++---------------
- 1 file changed, 6 insertions(+), 17 deletions(-)
-
---- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
-+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
-@@ -30,14 +30,6 @@
-               };
-       };
- 
--      // FIXME: Use extcon device provided by charger driver when available
--      usb_vbus: usb-vbus {
--              compatible = "linux,extcon-usb-gpio";
--              vbus-gpio = <&msmgpio 62 GPIO_ACTIVE_HIGH>;
--              pinctrl-names = "default";
--              pinctrl-0 = <&usb_vbus_default>;
--      };
--
-       gpio-keys {
-               compatible = "gpio-keys";
- 
-@@ -196,6 +188,10 @@
-       linux,code = <KEY_VOLUMEDOWN>;
- };
- 
-+&pm8916_usbin {
-+      status = "okay";
-+};
-+
- &pm8916_vib {
-       status = "okay";
- };
-@@ -225,11 +221,11 @@
- &usb {
-       status = "okay";
-       dr_mode = "peripheral";
--      extcon = <&usb_vbus>;
-+      extcon = <&pm8916_usbin>;
- };
- 
- &usb_hs_phy {
--      extcon = <&usb_vbus>;
-+      extcon = <&pm8916_usbin>;
- };
- 
- &smd_rpm_regulators {
-@@ -375,11 +371,4 @@
-               drive-strength = <2>;
-               bias-disable;
-       };
--
--      usb_vbus_default: usb-vbus-default {
--              pins = "gpio62";
--              function = "gpio";
--
--              bias-pull-up;
--      };
- };

diff --git a/queue-5.15/series b/queue-5.15/series
index c5fc3fab3b705092fc58c54d0c57610f8c472d42..06ac0bb04dd5650a6259b6c87b2e118b9e3d07d9 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -271,7 +271,6 @@ selinux-fix-null-pointer-dereference-when-hashtab-allocation-fails.patch
 asoc-dapm-cover-regression-by-kctl-change-notification-fix.patch
 asoc-rsnd-fixup-dmaengine-api.patch
 usb-max-3421-use-driver-data-instead-of-maintaining-a-list-of-bound-devices.patch
-arm64-dts-qcom-msm8916-longcheer-l8150-use-pm8916_usbin-extcon.patch
 ice-fix-vf-true-promiscuous-mode.patch
 ice-delete-always-true-check-of-pf-pointer.patch
 fs-export-an-inode_update_time-helper.patch