From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Tue, 8 Oct 2024 10:32:29 +0000 (+0200)
Subject: Revert "usb: cdns3-starfive: Add extcon usb gadget state with always connected"
X-Git-Tag: accepted/tizen/unified/x/20241104.122259~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f4ff45cfd5836be8cdae7dc10801ec1f66f60d8f;p=platform%2Fkernel%2Flinux-starfive.git

Revert "usb: cdns3-starfive: Add extcon usb gadget state with always connected"

Since adding a standalone Tizen-specific kernel extcon-usb-fixed module,
which reports USB cable as always connected, the extcon hack/workaround
in the Cadence USB3 driver is no longer needed.

This reverts commit 7e96f1653ad39babf34301a9561937c93ec332fb.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I03aed75616b89ffc5dfcf190b066926155a3d964
---

diff --git a/drivers/usb/cdns3/Kconfig b/drivers/usb/cdns3/Kconfig
index b139e66dfbf3..0a514b591527 100644
--- a/drivers/usb/cdns3/Kconfig
+++ b/drivers/usb/cdns3/Kconfig
@@ -131,14 +131,3 @@ config USB_CDNSP_HOST
 	  standard XHCI driver.
 
 endif
-
-if USB_CDNS3_STARFIVE
-
-config USB_CDNS3_STARFIVE_EXTCON
-	bool "Extcon USB state support on Cadence USB3 of Starfive SoC"
-	depends on EXTCON
-	help
-	  Say Y here to enable external connector event of the StarFive SoC
-	  platforms that contain Cadence USB3 controller core.
-
-endif
diff --git a/drivers/usb/cdns3/cdns3-starfive.c b/drivers/usb/cdns3/cdns3-starfive.c
index 8c5e0284747b..7d4abc44abfe 100644
--- a/drivers/usb/cdns3/cdns3-starfive.c
+++ b/drivers/usb/cdns3/cdns3-starfive.c
@@ -18,9 +18,6 @@
 #include <linux/reset.h>
 #include <linux/regmap.h>
 #include <linux/usb/otg.h>
-#if IS_ENABLED(CONFIG_USB_CDNS3_STARFIVE_EXTCON)
-#include <linux/extcon-provider.h>
-#endif
 #include "core.h"
 
 #define USB_STRAP_HOST			BIT(17)
@@ -45,9 +42,6 @@ struct cdns_starfive {
 	u32 stg_usb_mode;
 	struct regmap *sys_syscon;
 	u32 sys_offset;
-#if IS_ENABLED(CONFIG_USB_CDNS3_STARFIVE_EXTCON)
-	struct extcon_dev		*edev;
-#endif
 };
 
 static void cdns_mode_init(struct platform_device *pdev,
@@ -125,20 +119,10 @@ static void cdns_clk_rst_deinit(struct cdns_starfive *data)
 	clk_bulk_disable_unprepare(data->num_clks, data->clks);
 }
 
-#if IS_ENABLED(CONFIG_USB_CDNS3_STARFIVE_EXTCON)
-static const unsigned int supported_cable[] = {
-	EXTCON_USB,
-	EXTCON_NONE,
-};
-#endif
-
 static int cdns_starfive_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct cdns_starfive *data;
-#if IS_ENABLED(CONFIG_USB_CDNS3_STARFIVE_EXTCON)
-	struct extcon_dev *edev;
-#endif
 	unsigned int args;
 	int ret;
 
@@ -147,20 +131,6 @@ static int cdns_starfive_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	data->dev = dev;
-#if IS_ENABLED(CONFIG_USB_CDNS3_STARFIVE_EXTCON)
-	edev = devm_extcon_dev_allocate(dev, supported_cable);
-	if (IS_ERR(edev))
-		return PTR_ERR(edev);
-
-	ret = devm_extcon_dev_register(dev, edev);
-	if (ret)
-		return ret;
-
-	/* Set starfive cdns3 usb always connected because of hw limitation */
-	extcon_set_state_sync(edev, EXTCON_USB, true);
-
-	data->edev = edev;
-#endif
 
 	data->stg_syscon =
 		syscon_regmap_lookup_by_phandle_args(pdev->dev.of_node,