[PATCH 3/3] usb: dwc3: introduce flatten model driver of i.MX Soc

Xu Yang posted 3 patches 1 week ago
There is a newer version of this series
[PATCH 3/3] usb: dwc3: introduce flatten model driver of i.MX Soc
Posted by Xu Yang 1 week ago
To support flatten dwc3 devicetree model, introduce a new driver.

Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
---
 drivers/usb/dwc3/Kconfig    |  12 ++
 drivers/usb/dwc3/Makefile   |   1 +
 drivers/usb/dwc3/dwc3-imx.c | 428 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 441 insertions(+)

diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 240b15bc52cbd5d5c9d08d9fddd8c63202de1a3c..18169727a413ee72405a89f477e4da16946e1764 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -150,6 +150,18 @@ config USB_DWC3_IMX8MP
 	  functionality.
 	  Say 'Y' or 'M' if you have one such device.
 
+config USB_DWC3_IMX
+	tristate "NXP iMX Platform"
+	depends on OF && COMMON_CLK
+	depends on (ARCH_MXC && ARM64) || COMPILE_TEST
+	default USB_DWC3
+	help
+	  NXP iMX SoC use DesignWare Core IP for USB2/3
+	  functionality.
+	  This driver also handles the wakeup feature outside
+	  of DesignWare Core.
+	  Say 'Y' or 'M' if you have one such device.
+
 config USB_DWC3_XILINX
 	tristate "Xilinx Platforms"
 	depends on (ARCH_ZYNQMP || COMPILE_TEST) && OF
diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
index 073bef5309b5b5d381c8c4690221091b4df7904a..f37971197203e1379d554da9d60860360ea9c3fe 100644
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_USB_DWC3_ST)		+= dwc3-st.o
 obj-$(CONFIG_USB_DWC3_QCOM)		+= dwc3-qcom.o
 obj-$(CONFIG_USB_DWC3_QCOM)		+= dwc3-qcom-legacy.o
 obj-$(CONFIG_USB_DWC3_IMX8MP)		+= dwc3-imx8mp.o
+obj-$(CONFIG_USB_DWC3_IMX)		+= dwc3-imx.o
 obj-$(CONFIG_USB_DWC3_XILINX)		+= dwc3-xilinx.o
 obj-$(CONFIG_USB_DWC3_OCTEON)		+= dwc3-octeon.o
 obj-$(CONFIG_USB_DWC3_RTK)		+= dwc3-rtk.o
diff --git a/drivers/usb/dwc3/dwc3-imx.c b/drivers/usb/dwc3/dwc3-imx.c
new file mode 100644
index 0000000000000000000000000000000000000000..57b175e929d7e163df5af7e2265ab7117fa1dc9a
--- /dev/null
+++ b/drivers/usb/dwc3/dwc3-imx.c
@@ -0,0 +1,428 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * dwc3-imx.c - NXP i.MX Soc USB3 Specific Glue layer
+ *
+ * Copyright 2026 NXP
+ */
+
+#include <linux/clk.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+
+#include "core.h"
+#include "glue.h"
+
+/* USB wakeup registers */
+#define USB_WAKEUP_CTRL			0x00
+
+/* Global wakeup interrupt enable, also used to clear interrupt */
+#define USB_WAKEUP_EN			BIT(31)
+/* Wakeup from connect or disconnect, only for superspeed */
+#define USB_WAKEUP_SS_CONN		BIT(5)
+/* 0 select vbus_valid, 1 select sessvld */
+#define USB_WAKEUP_VBUS_SRC_SESS_VAL	BIT(4)
+/* Enable signal for wake up from u3 state */
+#define USB_WAKEUP_U3_EN		BIT(3)
+/* Enable signal for wake up from id change */
+#define USB_WAKEUP_ID_EN		BIT(2)
+/* Enable signal for wake up from vbus change */
+#define	USB_WAKEUP_VBUS_EN		BIT(1)
+/* Enable signal for wake up from dp/dm change */
+#define USB_WAKEUP_DPDM_EN		BIT(0)
+
+#define USB_WAKEUP_EN_MASK		GENMASK(5, 0)
+
+/* USB glue registers */
+#define USB_CTRL0		0x00
+#define USB_CTRL1		0x04
+
+#define USB_CTRL0_PORTPWR_EN	BIT(12) /* 1 - PPC enabled (default) */
+#define USB_CTRL0_USB3_FIXED	BIT(22) /* 1 - USB3 permanent attached */
+#define USB_CTRL0_USB2_FIXED	BIT(23) /* 1 - USB2 permanent attached */
+
+#define USB_CTRL1_OC_POLARITY	BIT(16) /* 0 - HIGH / 1 - LOW */
+#define USB_CTRL1_PWR_POLARITY	BIT(17) /* 0 - HIGH / 1 - LOW */
+
+struct dwc3_imx {
+	struct dwc3	dwc;
+	struct device	*dev;
+	void __iomem	*blkctl_base;
+	void __iomem	*glue_base;
+	struct clk	*hsio_clk;
+	struct clk	*suspend_clk;
+	int		irq;
+	bool		pm_suspended;
+	bool		wakeup_pending;
+};
+
+#define to_dwc3_imx(d) container_of((d), struct dwc3_imx, dwc)
+
+static void dwc3_imx_configure_glue(struct dwc3_imx *dwc_imx)
+{
+	struct device *dev = dwc_imx->dev;
+	u32 value;
+
+	if (!dwc_imx->glue_base)
+		return;
+
+	value = readl(dwc_imx->glue_base + USB_CTRL0);
+
+	if (device_property_read_bool(dev, "fsl,permanently-attached"))
+		value |= (USB_CTRL0_USB2_FIXED | USB_CTRL0_USB3_FIXED);
+	else
+		value &= ~(USB_CTRL0_USB2_FIXED | USB_CTRL0_USB3_FIXED);
+
+	if (device_property_read_bool(dev, "fsl,disable-port-power-control"))
+		value &= ~(USB_CTRL0_PORTPWR_EN);
+	else
+		value |= USB_CTRL0_PORTPWR_EN;
+
+	writel(value, dwc_imx->glue_base + USB_CTRL0);
+
+	value = readl(dwc_imx->glue_base + USB_CTRL1);
+	if (device_property_read_bool(dev, "fsl,over-current-active-low"))
+		value |= USB_CTRL1_OC_POLARITY;
+	else
+		value &= ~USB_CTRL1_OC_POLARITY;
+
+	if (device_property_read_bool(dev, "fsl,power-active-low"))
+		value |= USB_CTRL1_PWR_POLARITY;
+	else
+		value &= ~USB_CTRL1_PWR_POLARITY;
+
+	writel(value, dwc_imx->glue_base + USB_CTRL1);
+}
+
+static void dwc3_imx_wakeup_enable(struct dwc3_imx *dwc_imx, pm_message_t msg)
+{
+	struct dwc3	*dwc = &dwc_imx->dwc;
+	u32		val;
+
+	val = readl(dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
+
+	if ((dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc->xhci) {
+		val |= USB_WAKEUP_EN | USB_WAKEUP_DPDM_EN;
+		if (PMSG_IS_AUTO(msg))
+			val |= USB_WAKEUP_SS_CONN | USB_WAKEUP_U3_EN;
+	} else {
+		val |= USB_WAKEUP_EN | USB_WAKEUP_VBUS_EN |
+		       USB_WAKEUP_VBUS_SRC_SESS_VAL;
+	}
+
+	writel(val, dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
+}
+
+static void dwc3_imx_wakeup_disable(struct dwc3_imx *dwc_imx)
+{
+	u32	val;
+
+	val = readl(dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
+	val &= ~(USB_WAKEUP_EN | USB_WAKEUP_EN_MASK);
+	writel(val, dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
+}
+
+static irqreturn_t dwc3_imx_interrupt(int irq, void *data)
+{
+	struct dwc3_imx		*dwc_imx = data;
+	struct dwc3		*dwc = &dwc_imx->dwc;
+
+	if (!dwc_imx->pm_suspended)
+		return IRQ_HANDLED;
+
+	disable_irq_nosync(dwc_imx->irq);
+	dwc_imx->wakeup_pending = true;
+
+	if ((dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc->xhci)
+		pm_runtime_resume(&dwc->xhci->dev);
+	else if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_DEVICE)
+		pm_runtime_get(dwc->dev);
+
+	return IRQ_HANDLED;
+}
+
+static void dwc3_imx_pre_set_role(struct dwc3 *dwc, enum usb_role role)
+{
+	if (role == USB_ROLE_HOST)
+		/*
+		 * For xhci host, we need disable dwc core auto
+		 * suspend, because during this auto suspend delay(5s),
+		 * xhci host RUN_STOP is cleared and wakeup is not
+		 * enabled, if device is inserted, xhci host can't
+		 * response the connection.
+		 */
+		pm_runtime_dont_use_autosuspend(dwc->dev);
+	else
+		pm_runtime_use_autosuspend(dwc->dev);
+}
+
+static struct dwc3_glue_ops dwc3_imx_glue_ops = {
+	.pre_set_role   = dwc3_imx_pre_set_role,
+};
+
+static const struct property_entry dwc3_imx_properties[] = {
+	PROPERTY_ENTRY_BOOL("xhci-missing-cas-quirk"),
+	PROPERTY_ENTRY_BOOL("xhci-skip-phy-init-quirk"),
+	{},
+};
+
+static const struct software_node dwc3_imx_swnode = {
+	.properties = dwc3_imx_properties,
+};
+
+static int dwc3_imx_probe(struct platform_device *pdev)
+{
+	struct device		*dev = &pdev->dev;
+	struct dwc3_imx		*dwc_imx;
+	struct dwc3		*dwc;
+	struct resource		*res;
+	const char		*irq_name;
+	struct dwc3_probe_data	probe_data = {};
+	int			ret, irq;
+
+	dwc_imx = devm_kzalloc(dev, sizeof(*dwc_imx), GFP_KERNEL);
+	if (!dwc_imx)
+		return -ENOMEM;
+
+	platform_set_drvdata(pdev, dwc_imx);
+	dwc_imx->dev = dev;
+
+	dwc_imx->blkctl_base = devm_platform_ioremap_resource_byname(pdev, "blkctl");
+	if (IS_ERR(dwc_imx->blkctl_base))
+		return PTR_ERR(dwc_imx->blkctl_base);
+
+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "glue");
+	if (!res) {
+		dev_warn(dev, "Base address for glue layer missing\n");
+	} else {
+		dwc_imx->glue_base = devm_ioremap_resource(dev, res);
+		if (IS_ERR(dwc_imx->glue_base))
+			return PTR_ERR(dwc_imx->glue_base);
+	}
+
+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
+	if (!res)
+		return dev_err_probe(dev, -ENODEV, "missing core memory resource\n");
+
+	dwc_imx->hsio_clk = devm_clk_get_enabled(dev, "hsio");
+	if (IS_ERR(dwc_imx->hsio_clk))
+		return dev_err_probe(dev, PTR_ERR(dwc_imx->hsio_clk),
+				     "Failed to get hsio clk\n");
+
+	dwc_imx->suspend_clk = devm_clk_get_enabled(dev, "suspend");
+	if (IS_ERR(dwc_imx->suspend_clk))
+		return dev_err_probe(dev, PTR_ERR(dwc_imx->suspend_clk),
+				     "Failed to get suspend clk\n");
+
+	irq = platform_get_irq_byname(pdev, "wakeup");
+	if (irq < 0)
+		return irq;
+	dwc_imx->irq = irq;
+
+	irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s:wakeup", dev_name(dev));
+	if (!irq_name)
+		return dev_err_probe(dev, -ENOMEM, "failed to create irq_name\n");
+
+	ret = devm_request_threaded_irq(dev, irq, NULL, dwc3_imx_interrupt,
+					IRQF_ONESHOT, irq_name, dwc_imx);
+	if (ret)
+		return dev_err_probe(dev, ret, "failed to request IRQ #%d\n", irq);
+
+	ret = device_add_software_node(dev, &dwc3_imx_swnode);
+	if (ret)
+		return dev_err_probe(dev, ret, "failed to add software node\n");
+
+	dwc = &dwc_imx->dwc;
+	dwc->dev = dev;
+	dwc->glue_ops = &dwc3_imx_glue_ops;
+
+	probe_data.res = res;
+	probe_data.dwc = dwc;
+	probe_data.core_may_lose_power = true;
+
+	ret = dwc3_core_probe(&probe_data);
+	if (ret) {
+		device_remove_software_node(dev);
+		return ret;
+	}
+
+	device_set_wakeup_capable(dev, true);
+	return 0;
+}
+
+static void dwc3_imx_remove(struct platform_device *pdev)
+{
+	struct device	*dev = &pdev->dev;
+	struct dwc3	*dwc = dev_get_drvdata(dev);
+
+	if (pm_runtime_resume_and_get(dev) < 0)
+		return;
+
+	dwc3_core_remove(dwc);
+	device_remove_software_node(dev);
+	pm_runtime_put_noidle(dev);
+}
+
+static void dwc3_imx_suspend(struct dwc3_imx *dwc_imx, pm_message_t msg)
+{
+	if (PMSG_IS_AUTO(msg) || device_may_wakeup(dwc_imx->dev))
+		dwc3_imx_wakeup_enable(dwc_imx, msg);
+	dwc_imx->pm_suspended = true;
+}
+
+static void dwc3_imx_resume(struct dwc3_imx *dwc_imx, pm_message_t msg)
+{
+	struct dwc3	*dwc = &dwc_imx->dwc;
+
+	dwc_imx->pm_suspended = false;
+	dwc3_imx_wakeup_disable(dwc_imx);
+
+	/* Upon power loss any previous configuration is lost, restore it */
+	dwc3_imx_configure_glue(dwc_imx);
+
+	if (dwc_imx->wakeup_pending) {
+		dwc_imx->wakeup_pending = false;
+		if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_DEVICE)
+			pm_runtime_put_autosuspend(dwc->dev);
+		else
+			/*
+			 * Add wait for xhci switch from suspend
+			 * clock to normal clock to detect connection.
+			 */
+			usleep_range(9000, 10000);
+		enable_irq(dwc_imx->irq);
+	}
+}
+
+static int dwc3_imx_runtime_suspend(struct device *dev)
+{
+	struct dwc3	*dwc = dev_get_drvdata(dev);
+	struct dwc3_imx	*dwc_imx = to_dwc3_imx(dwc);
+	int		ret;
+
+	dev_dbg(dev, "at %s\n", __func__);
+
+	ret = dwc3_runtime_suspend(dwc);
+	if (ret)
+		return ret;
+
+	dwc3_imx_suspend(dwc_imx, PMSG_AUTO_SUSPEND);
+	return 0;
+}
+
+static int dwc3_imx_runtime_resume(struct device *dev)
+{
+	struct dwc3	*dwc = dev_get_drvdata(dev);
+	struct dwc3_imx	*dwc_imx = to_dwc3_imx(dwc);
+
+	dev_dbg(dev, "at %s\n", __func__);
+
+	dwc3_imx_resume(dwc_imx, PMSG_AUTO_RESUME);
+	return dwc3_runtime_resume(dwc);
+}
+
+static int dwc3_imx_runtime_idle(struct device *dev)
+{
+	return dwc3_runtime_idle(dev_get_drvdata(dev));
+}
+
+static int dwc3_imx_pm_suspend(struct device *dev)
+{
+	struct dwc3	*dwc = dev_get_drvdata(dev);
+	struct dwc3_imx *dwc_imx = to_dwc3_imx(dwc);
+	int		ret;
+
+	dev_dbg(dev, "at %s\n", __func__);
+
+	ret = dwc3_pm_suspend(dwc);
+	if (ret)
+		return ret;
+
+	dwc3_imx_suspend(dwc_imx, PMSG_SUSPEND);
+
+	if (device_may_wakeup(dev)) {
+		enable_irq_wake(dwc_imx->irq);
+		if (device_is_compatible(dev, "fsl,imx95-dwc3"))
+			device_set_out_band_wakeup(dev);
+	} else {
+		clk_disable_unprepare(dwc_imx->suspend_clk);
+	}
+
+	clk_disable_unprepare(dwc_imx->hsio_clk);
+
+	return 0;
+}
+
+static int dwc3_imx_pm_resume(struct device *dev)
+{
+	struct dwc3	*dwc = dev_get_drvdata(dev);
+	struct dwc3_imx *dwc_imx = to_dwc3_imx(dwc);
+	int		ret;
+
+	dev_dbg(dev, "at %s\n", __func__);
+
+	if (device_may_wakeup(dwc_imx->dev)) {
+		disable_irq_wake(dwc_imx->irq);
+	} else {
+		ret = clk_prepare_enable(dwc_imx->suspend_clk);
+		if (ret)
+			return ret;
+	}
+
+	ret = clk_prepare_enable(dwc_imx->hsio_clk);
+	if (ret) {
+		clk_disable_unprepare(dwc_imx->suspend_clk);
+		return ret;
+	}
+
+	dwc3_imx_resume(dwc_imx, PMSG_RESUME);
+
+	ret = dwc3_pm_resume(dwc);
+	if (ret)
+		return ret;
+
+	return 0;
+}
+
+static void dwc3_imx_complete(struct device *dev)
+{
+	dwc3_pm_complete(dev_get_drvdata(dev));
+}
+
+static int dwc3_imx_prepare(struct device *dev)
+{
+	return dwc3_pm_prepare(dev_get_drvdata(dev));
+}
+
+static const struct dev_pm_ops dwc3_imx_dev_pm_ops = {
+	SYSTEM_SLEEP_PM_OPS(dwc3_imx_pm_suspend, dwc3_imx_pm_resume)
+	RUNTIME_PM_OPS(dwc3_imx_runtime_suspend, dwc3_imx_runtime_resume,
+		       dwc3_imx_runtime_idle)
+	.complete = pm_sleep_ptr(dwc3_imx_complete),
+	.prepare = pm_sleep_ptr(dwc3_imx_prepare),
+};
+
+static const struct of_device_id dwc3_imx_of_match[] = {
+	{ .compatible = "fsl,imx-dwc3", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, dwc3_imx_of_match);
+
+static struct platform_driver dwc3_imx_driver = {
+	.probe		= dwc3_imx_probe,
+	.remove		= dwc3_imx_remove,
+	.driver		= {
+		.name	= "imx-dwc3",
+		.pm	= pm_ptr(&dwc3_imx_dev_pm_ops),
+		.of_match_table	= dwc3_imx_of_match,
+	},
+};
+
+module_platform_driver(dwc3_imx_driver);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("DesignWare USB3 i.MX Glue Layer");

-- 
2.34.1
Re: [PATCH 3/3] usb: dwc3: introduce flatten model driver of i.MX Soc
Posted by Peng Fan 6 days, 16 hours ago
On Mon, Feb 02, 2026 at 06:27:47PM +0800, Xu Yang wrote:
>To support flatten dwc3 devicetree model, introduce a new driver.
>
>Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
>---
> drivers/usb/dwc3/Kconfig    |  12 ++
> drivers/usb/dwc3/Makefile   |   1 +
> drivers/usb/dwc3/dwc3-imx.c | 428 ++++++++++++++++++++++++++++++++++++++++++++
...
>diff --git a/drivers/usb/dwc3/dwc3-imx.c b/drivers/usb/dwc3/dwc3-imx.c
>new file mode 100644
>index 0000000000000000000000000000000000000000..57b175e929d7e163df5af7e2265ab7117fa1dc9a
>--- /dev/null
>+++ b/drivers/usb/dwc3/dwc3-imx.c
>@@ -0,0 +1,428 @@
>+// SPDX-License-Identifier: GPL-2.0
>+/*
>+ * dwc3-imx.c - NXP i.MX Soc USB3 Specific Glue layer
>+ *
>+ * Copyright 2026 NXP
>+ */
>+
>+#include <linux/clk.h>
>+#include <linux/interrupt.h>
>+#include <linux/io.h>
>+#include <linux/kernel.h>
>+#include <linux/module.h>
>+#include <linux/of_platform.h>
>+#include <linux/platform_device.h>
>+#include <linux/pm_runtime.h>
>+
>+#include "core.h"
>+#include "glue.h"
>+
>+/* USB wakeup registers */
>+#define USB_WAKEUP_CTRL			0x00
>+
>+/* Global wakeup interrupt enable, also used to clear interrupt */
>+#define USB_WAKEUP_EN			BIT(31)
>+/* Wakeup from connect or disconnect, only for superspeed */
>+#define USB_WAKEUP_SS_CONN		BIT(5)
>+/* 0 select vbus_valid, 1 select sessvld */
>+#define USB_WAKEUP_VBUS_SRC_SESS_VAL	BIT(4)
>+/* Enable signal for wake up from u3 state */
>+#define USB_WAKEUP_U3_EN		BIT(3)
>+/* Enable signal for wake up from id change */
>+#define USB_WAKEUP_ID_EN		BIT(2)
>+/* Enable signal for wake up from vbus change */
>+#define	USB_WAKEUP_VBUS_EN		BIT(1)
>+/* Enable signal for wake up from dp/dm change */
>+#define USB_WAKEUP_DPDM_EN		BIT(0)
>+
>+#define USB_WAKEUP_EN_MASK		GENMASK(5, 0)
>+
>+/* USB glue registers */
>+#define USB_CTRL0		0x00
>+#define USB_CTRL1		0x04
>+
>+#define USB_CTRL0_PORTPWR_EN	BIT(12) /* 1 - PPC enabled (default) */
>+#define USB_CTRL0_USB3_FIXED	BIT(22) /* 1 - USB3 permanent attached */
>+#define USB_CTRL0_USB2_FIXED	BIT(23) /* 1 - USB2 permanent attached */
>+
>+#define USB_CTRL1_OC_POLARITY	BIT(16) /* 0 - HIGH / 1 - LOW */
>+#define USB_CTRL1_PWR_POLARITY	BIT(17) /* 0 - HIGH / 1 - LOW */
>+
>+struct dwc3_imx {
>+	struct dwc3	dwc;
>+	struct device	*dev;
>+	void __iomem	*blkctl_base;
>+	void __iomem	*glue_base;
>+	struct clk	*hsio_clk;
>+	struct clk	*suspend_clk;
>+	int		irq;
>+	bool		pm_suspended;
>+	bool		wakeup_pending;
>+};
>+
>+#define to_dwc3_imx(d) container_of((d), struct dwc3_imx, dwc)
>+
>+static void dwc3_imx_configure_glue(struct dwc3_imx *dwc_imx)
>+{
>+	struct device *dev = dwc_imx->dev;
>+	u32 value;
>+
>+	if (!dwc_imx->glue_base)
>+		return;
>+
>+	value = readl(dwc_imx->glue_base + USB_CTRL0);
>+
>+	if (device_property_read_bool(dev, "fsl,permanently-attached"))
>+		value |= (USB_CTRL0_USB2_FIXED | USB_CTRL0_USB3_FIXED);

No need parentheses.

>+	else
>+		value &= ~(USB_CTRL0_USB2_FIXED | USB_CTRL0_USB3_FIXED);
>+
>+	if (device_property_read_bool(dev, "fsl,disable-port-power-control"))
>+		value &= ~(USB_CTRL0_PORTPWR_EN);

Ditto.

>+	else
>+		value |= USB_CTRL0_PORTPWR_EN;
>+
>+	writel(value, dwc_imx->glue_base + USB_CTRL0);
>+
>+	value = readl(dwc_imx->glue_base + USB_CTRL1);
>+	if (device_property_read_bool(dev, "fsl,over-current-active-low"))
>+		value |= USB_CTRL1_OC_POLARITY;
>+	else
>+		value &= ~USB_CTRL1_OC_POLARITY;
>+
>+	if (device_property_read_bool(dev, "fsl,power-active-low"))
>+		value |= USB_CTRL1_PWR_POLARITY;
>+	else
>+		value &= ~USB_CTRL1_PWR_POLARITY;
>+
>+	writel(value, dwc_imx->glue_base + USB_CTRL1);
>+}
>+
>+static void dwc3_imx_wakeup_enable(struct dwc3_imx *dwc_imx, pm_message_t msg)
>+{
>+	struct dwc3	*dwc = &dwc_imx->dwc;
>+	u32		val;

In dwc3_imx_configure_glue, space is used. while here, tab is used.

>+
>+	val = readl(dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
>+
>+	if ((dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc->xhci) {
>+		val |= USB_WAKEUP_EN | USB_WAKEUP_DPDM_EN;
>+		if (PMSG_IS_AUTO(msg))
>+			val |= USB_WAKEUP_SS_CONN | USB_WAKEUP_U3_EN;
>+	} else {
>+		val |= USB_WAKEUP_EN | USB_WAKEUP_VBUS_EN |
>+		       USB_WAKEUP_VBUS_SRC_SESS_VAL;
>+	}
>+
>+	writel(val, dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
>+}
>+
>+static void dwc3_imx_wakeup_disable(struct dwc3_imx *dwc_imx)
>+{
>+	u32	val;

Ditto.

>+
>+	val = readl(dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
>+	val &= ~(USB_WAKEUP_EN | USB_WAKEUP_EN_MASK);
>+	writel(val, dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
>+}
>+
>+static irqreturn_t dwc3_imx_interrupt(int irq, void *data)
>+{
>+	struct dwc3_imx		*dwc_imx = data;
>+	struct dwc3		*dwc = &dwc_imx->dwc;

Ditto.

>+
>+	if (!dwc_imx->pm_suspended)
>+		return IRQ_HANDLED;
>+
>+	disable_irq_nosync(dwc_imx->irq);
>+	dwc_imx->wakeup_pending = true;
>+
>+	if ((dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc->xhci)
>+		pm_runtime_resume(&dwc->xhci->dev);
>+	else if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_DEVICE)
>+		pm_runtime_get(dwc->dev);
>+
>+	return IRQ_HANDLED;
>+}
>+
>+static void dwc3_imx_pre_set_role(struct dwc3 *dwc, enum usb_role role)
>+{
>+	if (role == USB_ROLE_HOST)
>+		/*
>+		 * For xhci host, we need disable dwc core auto
>+		 * suspend, because during this auto suspend delay(5s),
>+		 * xhci host RUN_STOP is cleared and wakeup is not
>+		 * enabled, if device is inserted, xhci host can't
>+		 * response the connection.
>+		 */
>+		pm_runtime_dont_use_autosuspend(dwc->dev);
>+	else
>+		pm_runtime_use_autosuspend(dwc->dev);
>+}
>+
>+static struct dwc3_glue_ops dwc3_imx_glue_ops = {
>+	.pre_set_role   = dwc3_imx_pre_set_role,
>+};
>+
>+static const struct property_entry dwc3_imx_properties[] = {
>+	PROPERTY_ENTRY_BOOL("xhci-missing-cas-quirk"),
>+	PROPERTY_ENTRY_BOOL("xhci-skip-phy-init-quirk"),
>+	{},
>+};
>+
>+static const struct software_node dwc3_imx_swnode = {
>+	.properties = dwc3_imx_properties,
>+};
>+
>+static int dwc3_imx_probe(struct platform_device *pdev)
>+{
>+	struct device		*dev = &pdev->dev;
>+	struct dwc3_imx		*dwc_imx;
>+	struct dwc3		*dwc;
>+	struct resource		*res;
>+	const char		*irq_name;
>+	struct dwc3_probe_data	probe_data = {};
>+	int			ret, irq;

As written above, unify the format.

>+
>+	dwc_imx = devm_kzalloc(dev, sizeof(*dwc_imx), GFP_KERNEL);
>+	if (!dwc_imx)
>+		return -ENOMEM;
>+
>+	platform_set_drvdata(pdev, dwc_imx);
>+	dwc_imx->dev = dev;
>+
>+	dwc_imx->blkctl_base = devm_platform_ioremap_resource_byname(pdev, "blkctl");
>+	if (IS_ERR(dwc_imx->blkctl_base))
>+		return PTR_ERR(dwc_imx->blkctl_base);
>+
>+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "glue");
>+	if (!res) {
>+		dev_warn(dev, "Base address for glue layer missing\n");
>+	} else {
>+		dwc_imx->glue_base = devm_ioremap_resource(dev, res);
>+		if (IS_ERR(dwc_imx->glue_base))
>+			return PTR_ERR(dwc_imx->glue_base);
>+	}
>+
>+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
>+	if (!res)
>+		return dev_err_probe(dev, -ENODEV, "missing core memory resource\n");

-ENOENT should be better.

>+
>+	dwc_imx->hsio_clk = devm_clk_get_enabled(dev, "hsio");
>+	if (IS_ERR(dwc_imx->hsio_clk))
>+		return dev_err_probe(dev, PTR_ERR(dwc_imx->hsio_clk),
>+				     "Failed to get hsio clk\n");
>+
>+	dwc_imx->suspend_clk = devm_clk_get_enabled(dev, "suspend");
>+	if (IS_ERR(dwc_imx->suspend_clk))
>+		return dev_err_probe(dev, PTR_ERR(dwc_imx->suspend_clk),
>+				     "Failed to get suspend clk\n");
>+
>+	irq = platform_get_irq_byname(pdev, "wakeup");
>+	if (irq < 0)
>+		return irq;
>+	dwc_imx->irq = irq;
>+
>+	irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s:wakeup", dev_name(dev));
>+	if (!irq_name)
>+		return dev_err_probe(dev, -ENOMEM, "failed to create irq_name\n");
>+
>+	ret = devm_request_threaded_irq(dev, irq, NULL, dwc3_imx_interrupt,
>+					IRQF_ONESHOT, irq_name, dwc_imx);
>+	if (ret)
>+		return dev_err_probe(dev, ret, "failed to request IRQ #%d\n", irq);

Should this be moved to end after all are initialized?

>+
>+	ret = device_add_software_node(dev, &dwc3_imx_swnode);
>+	if (ret)
>+		return dev_err_probe(dev, ret, "failed to add software node\n");
>+
>+	dwc = &dwc_imx->dwc;
>+	dwc->dev = dev;
>+	dwc->glue_ops = &dwc3_imx_glue_ops;
>+
>+	probe_data.res = res;
>+	probe_data.dwc = dwc;
>+	probe_data.core_may_lose_power = true;
>+
>+	ret = dwc3_core_probe(&probe_data);
>+	if (ret) {
>+		device_remove_software_node(dev);
>+		return ret;
>+	}
>+
>+	device_set_wakeup_capable(dev, true);
>+	return 0;
>+}
>+
>+static void dwc3_imx_remove(struct platform_device *pdev)
>+{
>+	struct device	*dev = &pdev->dev;
>+	struct dwc3	*dwc = dev_get_drvdata(dev);
>+
>+	if (pm_runtime_resume_and_get(dev) < 0)

print a error message.

when this fail return, there is no chance to probe success again I think,
because resource not freed.

>+		return;
>+
>+	dwc3_core_remove(dwc);
>+	device_remove_software_node(dev);
>+	pm_runtime_put_noidle(dev);
>+}
>+

Regards
Peng
Re: [PATCH 3/3] usb: dwc3: introduce flatten model driver of i.MX Soc
Posted by Xu Yang 5 days, 11 hours ago
On Tue, Feb 03, 2026 at 09:38:54AM +0800, Peng Fan wrote:
> On Mon, Feb 02, 2026 at 06:27:47PM +0800, Xu Yang wrote:
> >To support flatten dwc3 devicetree model, introduce a new driver.
> >
> >Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> >---
> > drivers/usb/dwc3/Kconfig    |  12 ++
> > drivers/usb/dwc3/Makefile   |   1 +
> > drivers/usb/dwc3/dwc3-imx.c | 428 ++++++++++++++++++++++++++++++++++++++++++++
> ...
> >diff --git a/drivers/usb/dwc3/dwc3-imx.c b/drivers/usb/dwc3/dwc3-imx.c
> >new file mode 100644
> >index 0000000000000000000000000000000000000000..57b175e929d7e163df5af7e2265ab7117fa1dc9a
> >--- /dev/null
> >+++ b/drivers/usb/dwc3/dwc3-imx.c
> >@@ -0,0 +1,428 @@
> >+// SPDX-License-Identifier: GPL-2.0
> >+/*
> >+ * dwc3-imx.c - NXP i.MX Soc USB3 Specific Glue layer
> >+ *
> >+ * Copyright 2026 NXP
> >+ */
> >+
> >+#include <linux/clk.h>
> >+#include <linux/interrupt.h>
> >+#include <linux/io.h>
> >+#include <linux/kernel.h>
> >+#include <linux/module.h>
> >+#include <linux/of_platform.h>
> >+#include <linux/platform_device.h>
> >+#include <linux/pm_runtime.h>
> >+
> >+#include "core.h"
> >+#include "glue.h"
> >+
> >+/* USB wakeup registers */
> >+#define USB_WAKEUP_CTRL			0x00
> >+
> >+/* Global wakeup interrupt enable, also used to clear interrupt */
> >+#define USB_WAKEUP_EN			BIT(31)
> >+/* Wakeup from connect or disconnect, only for superspeed */
> >+#define USB_WAKEUP_SS_CONN		BIT(5)
> >+/* 0 select vbus_valid, 1 select sessvld */
> >+#define USB_WAKEUP_VBUS_SRC_SESS_VAL	BIT(4)
> >+/* Enable signal for wake up from u3 state */
> >+#define USB_WAKEUP_U3_EN		BIT(3)
> >+/* Enable signal for wake up from id change */
> >+#define USB_WAKEUP_ID_EN		BIT(2)
> >+/* Enable signal for wake up from vbus change */
> >+#define	USB_WAKEUP_VBUS_EN		BIT(1)
> >+/* Enable signal for wake up from dp/dm change */
> >+#define USB_WAKEUP_DPDM_EN		BIT(0)
> >+
> >+#define USB_WAKEUP_EN_MASK		GENMASK(5, 0)
> >+
> >+/* USB glue registers */
> >+#define USB_CTRL0		0x00
> >+#define USB_CTRL1		0x04
> >+
> >+#define USB_CTRL0_PORTPWR_EN	BIT(12) /* 1 - PPC enabled (default) */
> >+#define USB_CTRL0_USB3_FIXED	BIT(22) /* 1 - USB3 permanent attached */
> >+#define USB_CTRL0_USB2_FIXED	BIT(23) /* 1 - USB2 permanent attached */
> >+
> >+#define USB_CTRL1_OC_POLARITY	BIT(16) /* 0 - HIGH / 1 - LOW */
> >+#define USB_CTRL1_PWR_POLARITY	BIT(17) /* 0 - HIGH / 1 - LOW */
> >+
> >+struct dwc3_imx {
> >+	struct dwc3	dwc;
> >+	struct device	*dev;
> >+	void __iomem	*blkctl_base;
> >+	void __iomem	*glue_base;
> >+	struct clk	*hsio_clk;
> >+	struct clk	*suspend_clk;
> >+	int		irq;
> >+	bool		pm_suspended;
> >+	bool		wakeup_pending;
> >+};
> >+
> >+#define to_dwc3_imx(d) container_of((d), struct dwc3_imx, dwc)
> >+
> >+static void dwc3_imx_configure_glue(struct dwc3_imx *dwc_imx)
> >+{
> >+	struct device *dev = dwc_imx->dev;
> >+	u32 value;
> >+
> >+	if (!dwc_imx->glue_base)
> >+		return;
> >+
> >+	value = readl(dwc_imx->glue_base + USB_CTRL0);
> >+
> >+	if (device_property_read_bool(dev, "fsl,permanently-attached"))
> >+		value |= (USB_CTRL0_USB2_FIXED | USB_CTRL0_USB3_FIXED);
> 
> No need parentheses.

OK.

> 
> >+	else
> >+		value &= ~(USB_CTRL0_USB2_FIXED | USB_CTRL0_USB3_FIXED);
> >+
> >+	if (device_property_read_bool(dev, "fsl,disable-port-power-control"))
> >+		value &= ~(USB_CTRL0_PORTPWR_EN);
> 
> Ditto.

OK.

> 
> >+	else
> >+		value |= USB_CTRL0_PORTPWR_EN;
> >+
> >+	writel(value, dwc_imx->glue_base + USB_CTRL0);
> >+
> >+	value = readl(dwc_imx->glue_base + USB_CTRL1);
> >+	if (device_property_read_bool(dev, "fsl,over-current-active-low"))
> >+		value |= USB_CTRL1_OC_POLARITY;
> >+	else
> >+		value &= ~USB_CTRL1_OC_POLARITY;
> >+
> >+	if (device_property_read_bool(dev, "fsl,power-active-low"))
> >+		value |= USB_CTRL1_PWR_POLARITY;
> >+	else
> >+		value &= ~USB_CTRL1_PWR_POLARITY;
> >+
> >+	writel(value, dwc_imx->glue_base + USB_CTRL1);
> >+}
> >+
> >+static void dwc3_imx_wakeup_enable(struct dwc3_imx *dwc_imx, pm_message_t msg)
> >+{
> >+	struct dwc3	*dwc = &dwc_imx->dwc;
> >+	u32		val;
> 
> In dwc3_imx_configure_glue, space is used. while here, tab is used.

OK.

> 
> >+
> >+	val = readl(dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
> >+
> >+	if ((dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc->xhci) {
> >+		val |= USB_WAKEUP_EN | USB_WAKEUP_DPDM_EN;
> >+		if (PMSG_IS_AUTO(msg))
> >+			val |= USB_WAKEUP_SS_CONN | USB_WAKEUP_U3_EN;
> >+	} else {
> >+		val |= USB_WAKEUP_EN | USB_WAKEUP_VBUS_EN |
> >+		       USB_WAKEUP_VBUS_SRC_SESS_VAL;
> >+	}
> >+
> >+	writel(val, dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
> >+}
> >+
> >+static void dwc3_imx_wakeup_disable(struct dwc3_imx *dwc_imx)
> >+{
> >+	u32	val;
> 
> Ditto.
> 
> >+
> >+	val = readl(dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
> >+	val &= ~(USB_WAKEUP_EN | USB_WAKEUP_EN_MASK);
> >+	writel(val, dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
> >+}
> >+
> >+static irqreturn_t dwc3_imx_interrupt(int irq, void *data)
> >+{
> >+	struct dwc3_imx		*dwc_imx = data;
> >+	struct dwc3		*dwc = &dwc_imx->dwc;
> 
> Ditto.
> 
> >+
> >+	if (!dwc_imx->pm_suspended)
> >+		return IRQ_HANDLED;
> >+
> >+	disable_irq_nosync(dwc_imx->irq);
> >+	dwc_imx->wakeup_pending = true;
> >+
> >+	if ((dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc->xhci)
> >+		pm_runtime_resume(&dwc->xhci->dev);
> >+	else if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_DEVICE)
> >+		pm_runtime_get(dwc->dev);
> >+
> >+	return IRQ_HANDLED;
> >+}
> >+
> >+static void dwc3_imx_pre_set_role(struct dwc3 *dwc, enum usb_role role)
> >+{
> >+	if (role == USB_ROLE_HOST)
> >+		/*
> >+		 * For xhci host, we need disable dwc core auto
> >+		 * suspend, because during this auto suspend delay(5s),
> >+		 * xhci host RUN_STOP is cleared and wakeup is not
> >+		 * enabled, if device is inserted, xhci host can't
> >+		 * response the connection.
> >+		 */
> >+		pm_runtime_dont_use_autosuspend(dwc->dev);
> >+	else
> >+		pm_runtime_use_autosuspend(dwc->dev);
> >+}
> >+
> >+static struct dwc3_glue_ops dwc3_imx_glue_ops = {
> >+	.pre_set_role   = dwc3_imx_pre_set_role,
> >+};
> >+
> >+static const struct property_entry dwc3_imx_properties[] = {
> >+	PROPERTY_ENTRY_BOOL("xhci-missing-cas-quirk"),
> >+	PROPERTY_ENTRY_BOOL("xhci-skip-phy-init-quirk"),
> >+	{},
> >+};
> >+
> >+static const struct software_node dwc3_imx_swnode = {
> >+	.properties = dwc3_imx_properties,
> >+};
> >+
> >+static int dwc3_imx_probe(struct platform_device *pdev)
> >+{
> >+	struct device		*dev = &pdev->dev;
> >+	struct dwc3_imx		*dwc_imx;
> >+	struct dwc3		*dwc;
> >+	struct resource		*res;
> >+	const char		*irq_name;
> >+	struct dwc3_probe_data	probe_data = {};
> >+	int			ret, irq;
> 
> As written above, unify the format.
> 
> >+
> >+	dwc_imx = devm_kzalloc(dev, sizeof(*dwc_imx), GFP_KERNEL);
> >+	if (!dwc_imx)
> >+		return -ENOMEM;
> >+
> >+	platform_set_drvdata(pdev, dwc_imx);
> >+	dwc_imx->dev = dev;
> >+
> >+	dwc_imx->blkctl_base = devm_platform_ioremap_resource_byname(pdev, "blkctl");
> >+	if (IS_ERR(dwc_imx->blkctl_base))
> >+		return PTR_ERR(dwc_imx->blkctl_base);
> >+
> >+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "glue");
> >+	if (!res) {
> >+		dev_warn(dev, "Base address for glue layer missing\n");
> >+	} else {
> >+		dwc_imx->glue_base = devm_ioremap_resource(dev, res);
> >+		if (IS_ERR(dwc_imx->glue_base))
> >+			return PTR_ERR(dwc_imx->glue_base);
> >+	}
> >+
> >+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
> >+	if (!res)
> >+		return dev_err_probe(dev, -ENODEV, "missing core memory resource\n");
> 
> -ENOENT should be better.

As Thinh's comment, will keep ENODEV.

> 
> >+
> >+	dwc_imx->hsio_clk = devm_clk_get_enabled(dev, "hsio");
> >+	if (IS_ERR(dwc_imx->hsio_clk))
> >+		return dev_err_probe(dev, PTR_ERR(dwc_imx->hsio_clk),
> >+				     "Failed to get hsio clk\n");
> >+
> >+	dwc_imx->suspend_clk = devm_clk_get_enabled(dev, "suspend");
> >+	if (IS_ERR(dwc_imx->suspend_clk))
> >+		return dev_err_probe(dev, PTR_ERR(dwc_imx->suspend_clk),
> >+				     "Failed to get suspend clk\n");
> >+
> >+	irq = platform_get_irq_byname(pdev, "wakeup");
> >+	if (irq < 0)
> >+		return irq;
> >+	dwc_imx->irq = irq;
> >+
> >+	irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s:wakeup", dev_name(dev));
> >+	if (!irq_name)
> >+		return dev_err_probe(dev, -ENOMEM, "failed to create irq_name\n");
> >+
> >+	ret = devm_request_threaded_irq(dev, irq, NULL, dwc3_imx_interrupt,
> >+					IRQF_ONESHOT, irq_name, dwc_imx);
> >+	if (ret)
> >+		return dev_err_probe(dev, ret, "failed to request IRQ #%d\n", irq);
> 
> Should this be moved to end after all are initialized?

Thanks for the suggestion.

I prefer to setup all glue layer setting before initialize core parts. So
the logic will be a bit clear. To avoid accident, I will disable wakeup
irq by default and enable it during system suspend. So IRQF_NO_AUTOEN
will be added in v2.

> 
> >+
> >+	ret = device_add_software_node(dev, &dwc3_imx_swnode);
> >+	if (ret)
> >+		return dev_err_probe(dev, ret, "failed to add software node\n");
> >+
> >+	dwc = &dwc_imx->dwc;
> >+	dwc->dev = dev;
> >+	dwc->glue_ops = &dwc3_imx_glue_ops;
> >+
> >+	probe_data.res = res;
> >+	probe_data.dwc = dwc;
> >+	probe_data.core_may_lose_power = true;
> >+
> >+	ret = dwc3_core_probe(&probe_data);
> >+	if (ret) {
> >+		device_remove_software_node(dev);
> >+		return ret;
> >+	}
> >+
> >+	device_set_wakeup_capable(dev, true);
> >+	return 0;
> >+}
> >+
> >+static void dwc3_imx_remove(struct platform_device *pdev)
> >+{
> >+	struct device	*dev = &pdev->dev;
> >+	struct dwc3	*dwc = dev_get_drvdata(dev);
> >+
> >+	if (pm_runtime_resume_and_get(dev) < 0)
> 
> print a error message.
> 
> when this fail return, there is no chance to probe success again I think,
> because resource not freed.

I just double check the driver logic here, dwc3_core_remove() will do all
above pm_runtime_* things. So these runtime PM operations are redundent
here. I will remove them in v2.

Thanks,
Xu Yang
Re: [PATCH 3/3] usb: dwc3: introduce flatten model driver of i.MX Soc
Posted by Thinh Nguyen 5 days, 15 hours ago
On Tue, Feb 03, 2026, Peng Fan wrote:
> On Mon, Feb 02, 2026 at 06:27:47PM +0800, Xu Yang wrote:
> >+
> >+	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
> >+	if (!res)
> >+		return dev_err_probe(dev, -ENODEV, "missing core memory resource\n");
> 
> -ENOENT should be better.

Hm... that's for file or directory, and doesn't seem to fit here well.

BR,
Thinh
Re: [PATCH 3/3] usb: dwc3: introduce flatten model driver of i.MX Soc
Posted by Frank Li 1 week ago
On Mon, Feb 02, 2026 at 06:27:47PM +0800, Xu Yang wrote:
> To support flatten dwc3 devicetree model, introduce a new driver.
>
> Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> ---
>  drivers/usb/dwc3/Kconfig    |  12 ++
>  drivers/usb/dwc3/Makefile   |   1 +
>  drivers/usb/dwc3/dwc3-imx.c | 428 ++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 441 insertions(+)
>
> diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
> index 240b15bc52cbd5d5c9d08d9fddd8c63202de1a3c..18169727a413ee72405a89f477e4da16946e1764 100644
> --- a/drivers/usb/dwc3/Kconfig
> +++ b/drivers/usb/dwc3/Kconfig
> @@ -150,6 +150,18 @@ config USB_DWC3_IMX8MP
>  	  functionality.
>  	  Say 'Y' or 'M' if you have one such device.
>
> +config USB_DWC3_IMX
> +	tristate "NXP iMX Platform"
> +	depends on OF && COMMON_CLK
> +	depends on (ARCH_MXC && ARM64) || COMPILE_TEST
> +	default USB_DWC3
> +	help
> +	  NXP iMX SoC use DesignWare Core IP for USB2/3
> +	  functionality.
> +	  This driver also handles the wakeup feature outside
> +	  of DesignWare Core.
> +	  Say 'Y' or 'M' if you have one such device.
> +
>  config USB_DWC3_XILINX
>  	tristate "Xilinx Platforms"
>  	depends on (ARCH_ZYNQMP || COMPILE_TEST) && OF
> diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
> index 073bef5309b5b5d381c8c4690221091b4df7904a..f37971197203e1379d554da9d60860360ea9c3fe 100644
> --- a/drivers/usb/dwc3/Makefile
> +++ b/drivers/usb/dwc3/Makefile
> @@ -55,6 +55,7 @@ obj-$(CONFIG_USB_DWC3_ST)		+= dwc3-st.o
>  obj-$(CONFIG_USB_DWC3_QCOM)		+= dwc3-qcom.o
>  obj-$(CONFIG_USB_DWC3_QCOM)		+= dwc3-qcom-legacy.o
>  obj-$(CONFIG_USB_DWC3_IMX8MP)		+= dwc3-imx8mp.o
> +obj-$(CONFIG_USB_DWC3_IMX)		+= dwc3-imx.o
>  obj-$(CONFIG_USB_DWC3_XILINX)		+= dwc3-xilinx.o
>  obj-$(CONFIG_USB_DWC3_OCTEON)		+= dwc3-octeon.o
>  obj-$(CONFIG_USB_DWC3_RTK)		+= dwc3-rtk.o
> diff --git a/drivers/usb/dwc3/dwc3-imx.c b/drivers/usb/dwc3/dwc3-imx.c
> new file mode 100644
> index 0000000000000000000000000000000000000000..57b175e929d7e163df5af7e2265ab7117fa1dc9a
> --- /dev/null
> +++ b/drivers/usb/dwc3/dwc3-imx.c
> @@ -0,0 +1,428 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * dwc3-imx.c - NXP i.MX Soc USB3 Specific Glue layer
> + *
> + * Copyright 2026 NXP
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/interrupt.h>
> +#include <linux/io.h>
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/of_platform.h>
> +#include <linux/platform_device.h>
> +#include <linux/pm_runtime.h>
> +
> +#include "core.h"
> +#include "glue.h"
> +
> +/* USB wakeup registers */
> +#define USB_WAKEUP_CTRL			0x00
> +
> +/* Global wakeup interrupt enable, also used to clear interrupt */
> +#define USB_WAKEUP_EN			BIT(31)
> +/* Wakeup from connect or disconnect, only for superspeed */
> +#define USB_WAKEUP_SS_CONN		BIT(5)
> +/* 0 select vbus_valid, 1 select sessvld */
> +#define USB_WAKEUP_VBUS_SRC_SESS_VAL	BIT(4)
> +/* Enable signal for wake up from u3 state */
> +#define USB_WAKEUP_U3_EN		BIT(3)
> +/* Enable signal for wake up from id change */
> +#define USB_WAKEUP_ID_EN		BIT(2)
> +/* Enable signal for wake up from vbus change */
> +#define	USB_WAKEUP_VBUS_EN		BIT(1)
> +/* Enable signal for wake up from dp/dm change */
> +#define USB_WAKEUP_DPDM_EN		BIT(0)
> +
> +#define USB_WAKEUP_EN_MASK		GENMASK(5, 0)
> +
> +/* USB glue registers */
> +#define USB_CTRL0		0x00
> +#define USB_CTRL1		0x04
> +
> +#define USB_CTRL0_PORTPWR_EN	BIT(12) /* 1 - PPC enabled (default) */
> +#define USB_CTRL0_USB3_FIXED	BIT(22) /* 1 - USB3 permanent attached */
> +#define USB_CTRL0_USB2_FIXED	BIT(23) /* 1 - USB2 permanent attached */
> +
> +#define USB_CTRL1_OC_POLARITY	BIT(16) /* 0 - HIGH / 1 - LOW */
> +#define USB_CTRL1_PWR_POLARITY	BIT(17) /* 0 - HIGH / 1 - LOW */
> +
> +struct dwc3_imx {
> +	struct dwc3	dwc;
> +	struct device	*dev;
> +	void __iomem	*blkctl_base;
> +	void __iomem	*glue_base;
> +	struct clk	*hsio_clk;
> +	struct clk	*suspend_clk;
> +	int		irq;
> +	bool		pm_suspended;
> +	bool		wakeup_pending;
> +};
> +
> +#define to_dwc3_imx(d) container_of((d), struct dwc3_imx, dwc)
> +
> +static void dwc3_imx_configure_glue(struct dwc3_imx *dwc_imx)
> +{
> +	struct device *dev = dwc_imx->dev;
> +	u32 value;
> +
> +	if (!dwc_imx->glue_base)
> +		return;
> +
> +	value = readl(dwc_imx->glue_base + USB_CTRL0);
> +
> +	if (device_property_read_bool(dev, "fsl,permanently-attached"))
> +		value |= (USB_CTRL0_USB2_FIXED | USB_CTRL0_USB3_FIXED);
> +	else
> +		value &= ~(USB_CTRL0_USB2_FIXED | USB_CTRL0_USB3_FIXED);
> +
> +	if (device_property_read_bool(dev, "fsl,disable-port-power-control"))
> +		value &= ~(USB_CTRL0_PORTPWR_EN);
> +	else
> +		value |= USB_CTRL0_PORTPWR_EN;
> +
> +	writel(value, dwc_imx->glue_base + USB_CTRL0);
> +
> +	value = readl(dwc_imx->glue_base + USB_CTRL1);
> +	if (device_property_read_bool(dev, "fsl,over-current-active-low"))
> +		value |= USB_CTRL1_OC_POLARITY;
> +	else
> +		value &= ~USB_CTRL1_OC_POLARITY;
> +
> +	if (device_property_read_bool(dev, "fsl,power-active-low"))
> +		value |= USB_CTRL1_PWR_POLARITY;
> +	else
> +		value &= ~USB_CTRL1_PWR_POLARITY;
> +
> +	writel(value, dwc_imx->glue_base + USB_CTRL1);
> +}
> +
> +static void dwc3_imx_wakeup_enable(struct dwc3_imx *dwc_imx, pm_message_t msg)
> +{
> +	struct dwc3	*dwc = &dwc_imx->dwc;
> +	u32		val;
> +
> +	val = readl(dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
> +
> +	if ((dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc->xhci) {
> +		val |= USB_WAKEUP_EN | USB_WAKEUP_DPDM_EN;
> +		if (PMSG_IS_AUTO(msg))
> +			val |= USB_WAKEUP_SS_CONN | USB_WAKEUP_U3_EN;
> +	} else {
> +		val |= USB_WAKEUP_EN | USB_WAKEUP_VBUS_EN |
> +		       USB_WAKEUP_VBUS_SRC_SESS_VAL;
> +	}
> +
> +	writel(val, dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
> +}
> +
> +static void dwc3_imx_wakeup_disable(struct dwc3_imx *dwc_imx)
> +{
> +	u32	val;
> +
> +	val = readl(dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
> +	val &= ~(USB_WAKEUP_EN | USB_WAKEUP_EN_MASK);
> +	writel(val, dwc_imx->blkctl_base + USB_WAKEUP_CTRL);
> +}
> +
> +static irqreturn_t dwc3_imx_interrupt(int irq, void *data)
> +{
> +	struct dwc3_imx		*dwc_imx = data;
> +	struct dwc3		*dwc = &dwc_imx->dwc;
> +
> +	if (!dwc_imx->pm_suspended)
> +		return IRQ_HANDLED;
> +
> +	disable_irq_nosync(dwc_imx->irq);
> +	dwc_imx->wakeup_pending = true;
> +
> +	if ((dwc->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc->xhci)
> +		pm_runtime_resume(&dwc->xhci->dev);
> +	else if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_DEVICE)
> +		pm_runtime_get(dwc->dev);
> +
> +	return IRQ_HANDLED;
> +}
> +
> +static void dwc3_imx_pre_set_role(struct dwc3 *dwc, enum usb_role role)
> +{
> +	if (role == USB_ROLE_HOST)
> +		/*
> +		 * For xhci host, we need disable dwc core auto
> +		 * suspend, because during this auto suspend delay(5s),
> +		 * xhci host RUN_STOP is cleared and wakeup is not
> +		 * enabled, if device is inserted, xhci host can't
> +		 * response the connection.
> +		 */
> +		pm_runtime_dont_use_autosuspend(dwc->dev);
> +	else
> +		pm_runtime_use_autosuspend(dwc->dev);
> +}
> +
> +static struct dwc3_glue_ops dwc3_imx_glue_ops = {
> +	.pre_set_role   = dwc3_imx_pre_set_role,
> +};
> +
> +static const struct property_entry dwc3_imx_properties[] = {
> +	PROPERTY_ENTRY_BOOL("xhci-missing-cas-quirk"),
> +	PROPERTY_ENTRY_BOOL("xhci-skip-phy-init-quirk"),
> +	{},
> +};
> +
> +static const struct software_node dwc3_imx_swnode = {
> +	.properties = dwc3_imx_properties,
> +};

I met similar case for layerscape dwc. because already use flatten,
directly use probe_data pass these information to core library.

Frank

> +
> +static int dwc3_imx_probe(struct platform_device *pdev)
> +{
> +	struct device		*dev = &pdev->dev;
> +	struct dwc3_imx		*dwc_imx;
> +	struct dwc3		*dwc;
> +	struct resource		*res;
> +	const char		*irq_name;
> +	struct dwc3_probe_data	probe_data = {};
> +	int			ret, irq;
> +
> +	dwc_imx = devm_kzalloc(dev, sizeof(*dwc_imx), GFP_KERNEL);
> +	if (!dwc_imx)
> +		return -ENOMEM;
> +
> +	platform_set_drvdata(pdev, dwc_imx);
> +	dwc_imx->dev = dev;
> +
> +	dwc_imx->blkctl_base = devm_platform_ioremap_resource_byname(pdev, "blkctl");
> +	if (IS_ERR(dwc_imx->blkctl_base))
> +		return PTR_ERR(dwc_imx->blkctl_base);
> +
> +	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "glue");
> +	if (!res) {
> +		dev_warn(dev, "Base address for glue layer missing\n");
> +	} else {
> +		dwc_imx->glue_base = devm_ioremap_resource(dev, res);
> +		if (IS_ERR(dwc_imx->glue_base))
> +			return PTR_ERR(dwc_imx->glue_base);
> +	}
> +
> +	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core");
> +	if (!res)
> +		return dev_err_probe(dev, -ENODEV, "missing core memory resource\n");
> +
> +	dwc_imx->hsio_clk = devm_clk_get_enabled(dev, "hsio");
> +	if (IS_ERR(dwc_imx->hsio_clk))
> +		return dev_err_probe(dev, PTR_ERR(dwc_imx->hsio_clk),
> +				     "Failed to get hsio clk\n");
> +
> +	dwc_imx->suspend_clk = devm_clk_get_enabled(dev, "suspend");
> +	if (IS_ERR(dwc_imx->suspend_clk))
> +		return dev_err_probe(dev, PTR_ERR(dwc_imx->suspend_clk),
> +				     "Failed to get suspend clk\n");
> +
> +	irq = platform_get_irq_byname(pdev, "wakeup");
> +	if (irq < 0)
> +		return irq;
> +	dwc_imx->irq = irq;
> +
> +	irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s:wakeup", dev_name(dev));
> +	if (!irq_name)
> +		return dev_err_probe(dev, -ENOMEM, "failed to create irq_name\n");
> +
> +	ret = devm_request_threaded_irq(dev, irq, NULL, dwc3_imx_interrupt,
> +					IRQF_ONESHOT, irq_name, dwc_imx);
> +	if (ret)
> +		return dev_err_probe(dev, ret, "failed to request IRQ #%d\n", irq);
> +
> +	ret = device_add_software_node(dev, &dwc3_imx_swnode);
> +	if (ret)
> +		return dev_err_probe(dev, ret, "failed to add software node\n");
> +
> +	dwc = &dwc_imx->dwc;
> +	dwc->dev = dev;
> +	dwc->glue_ops = &dwc3_imx_glue_ops;
> +
> +	probe_data.res = res;
> +	probe_data.dwc = dwc;
> +	probe_data.core_may_lose_power = true;
> +
> +	ret = dwc3_core_probe(&probe_data);
> +	if (ret) {
> +		device_remove_software_node(dev);
> +		return ret;
> +	}
> +
> +	device_set_wakeup_capable(dev, true);
> +	return 0;
> +}
> +
> +static void dwc3_imx_remove(struct platform_device *pdev)
> +{
> +	struct device	*dev = &pdev->dev;
> +	struct dwc3	*dwc = dev_get_drvdata(dev);
> +
> +	if (pm_runtime_resume_and_get(dev) < 0)
> +		return;
> +
> +	dwc3_core_remove(dwc);
> +	device_remove_software_node(dev);
> +	pm_runtime_put_noidle(dev);
> +}
> +
> +static void dwc3_imx_suspend(struct dwc3_imx *dwc_imx, pm_message_t msg)
> +{
> +	if (PMSG_IS_AUTO(msg) || device_may_wakeup(dwc_imx->dev))
> +		dwc3_imx_wakeup_enable(dwc_imx, msg);
> +	dwc_imx->pm_suspended = true;
> +}
> +
> +static void dwc3_imx_resume(struct dwc3_imx *dwc_imx, pm_message_t msg)
> +{
> +	struct dwc3	*dwc = &dwc_imx->dwc;
> +
> +	dwc_imx->pm_suspended = false;
> +	dwc3_imx_wakeup_disable(dwc_imx);
> +
> +	/* Upon power loss any previous configuration is lost, restore it */
> +	dwc3_imx_configure_glue(dwc_imx);
> +
> +	if (dwc_imx->wakeup_pending) {
> +		dwc_imx->wakeup_pending = false;
> +		if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_DEVICE)
> +			pm_runtime_put_autosuspend(dwc->dev);
> +		else
> +			/*
> +			 * Add wait for xhci switch from suspend
> +			 * clock to normal clock to detect connection.
> +			 */
> +			usleep_range(9000, 10000);
> +		enable_irq(dwc_imx->irq);
> +	}
> +}
> +
> +static int dwc3_imx_runtime_suspend(struct device *dev)
> +{
> +	struct dwc3	*dwc = dev_get_drvdata(dev);
> +	struct dwc3_imx	*dwc_imx = to_dwc3_imx(dwc);
> +	int		ret;
> +
> +	dev_dbg(dev, "at %s\n", __func__);
> +
> +	ret = dwc3_runtime_suspend(dwc);
> +	if (ret)
> +		return ret;
> +
> +	dwc3_imx_suspend(dwc_imx, PMSG_AUTO_SUSPEND);
> +	return 0;
> +}
> +
> +static int dwc3_imx_runtime_resume(struct device *dev)
> +{
> +	struct dwc3	*dwc = dev_get_drvdata(dev);
> +	struct dwc3_imx	*dwc_imx = to_dwc3_imx(dwc);
> +
> +	dev_dbg(dev, "at %s\n", __func__);
> +
> +	dwc3_imx_resume(dwc_imx, PMSG_AUTO_RESUME);
> +	return dwc3_runtime_resume(dwc);
> +}
> +
> +static int dwc3_imx_runtime_idle(struct device *dev)
> +{
> +	return dwc3_runtime_idle(dev_get_drvdata(dev));
> +}
> +
> +static int dwc3_imx_pm_suspend(struct device *dev)
> +{
> +	struct dwc3	*dwc = dev_get_drvdata(dev);
> +	struct dwc3_imx *dwc_imx = to_dwc3_imx(dwc);
> +	int		ret;
> +
> +	dev_dbg(dev, "at %s\n", __func__);
> +
> +	ret = dwc3_pm_suspend(dwc);
> +	if (ret)
> +		return ret;
> +
> +	dwc3_imx_suspend(dwc_imx, PMSG_SUSPEND);
> +
> +	if (device_may_wakeup(dev)) {
> +		enable_irq_wake(dwc_imx->irq);
> +		if (device_is_compatible(dev, "fsl,imx95-dwc3"))
> +			device_set_out_band_wakeup(dev);
> +	} else {
> +		clk_disable_unprepare(dwc_imx->suspend_clk);
> +	}
> +
> +	clk_disable_unprepare(dwc_imx->hsio_clk);
> +
> +	return 0;
> +}
> +
> +static int dwc3_imx_pm_resume(struct device *dev)
> +{
> +	struct dwc3	*dwc = dev_get_drvdata(dev);
> +	struct dwc3_imx *dwc_imx = to_dwc3_imx(dwc);
> +	int		ret;
> +
> +	dev_dbg(dev, "at %s\n", __func__);
> +
> +	if (device_may_wakeup(dwc_imx->dev)) {
> +		disable_irq_wake(dwc_imx->irq);
> +	} else {
> +		ret = clk_prepare_enable(dwc_imx->suspend_clk);
> +		if (ret)
> +			return ret;
> +	}
> +
> +	ret = clk_prepare_enable(dwc_imx->hsio_clk);
> +	if (ret) {
> +		clk_disable_unprepare(dwc_imx->suspend_clk);
> +		return ret;
> +	}
> +
> +	dwc3_imx_resume(dwc_imx, PMSG_RESUME);
> +
> +	ret = dwc3_pm_resume(dwc);
> +	if (ret)
> +		return ret;
> +
> +	return 0;
> +}
> +
> +static void dwc3_imx_complete(struct device *dev)
> +{
> +	dwc3_pm_complete(dev_get_drvdata(dev));
> +}
> +
> +static int dwc3_imx_prepare(struct device *dev)
> +{
> +	return dwc3_pm_prepare(dev_get_drvdata(dev));
> +}
> +
> +static const struct dev_pm_ops dwc3_imx_dev_pm_ops = {
> +	SYSTEM_SLEEP_PM_OPS(dwc3_imx_pm_suspend, dwc3_imx_pm_resume)
> +	RUNTIME_PM_OPS(dwc3_imx_runtime_suspend, dwc3_imx_runtime_resume,
> +		       dwc3_imx_runtime_idle)
> +	.complete = pm_sleep_ptr(dwc3_imx_complete),
> +	.prepare = pm_sleep_ptr(dwc3_imx_prepare),
> +};
> +
> +static const struct of_device_id dwc3_imx_of_match[] = {
> +	{ .compatible = "fsl,imx-dwc3", },
> +	{},
> +};
> +MODULE_DEVICE_TABLE(of, dwc3_imx_of_match);
> +
> +static struct platform_driver dwc3_imx_driver = {
> +	.probe		= dwc3_imx_probe,
> +	.remove		= dwc3_imx_remove,
> +	.driver		= {
> +		.name	= "imx-dwc3",
> +		.pm	= pm_ptr(&dwc3_imx_dev_pm_ops),
> +		.of_match_table	= dwc3_imx_of_match,
> +	},
> +};
> +
> +module_platform_driver(dwc3_imx_driver);
> +
> +MODULE_LICENSE("GPL");
> +MODULE_DESCRIPTION("DesignWare USB3 i.MX Glue Layer");
>
> --
> 2.34.1
>
Re: [PATCH 3/3] usb: dwc3: introduce flatten model driver of i.MX Soc
Posted by Xu Yang 5 days, 11 hours ago
On Mon, Feb 02, 2026 at 10:42:33AM -0500, Frank Li wrote:
> On Mon, Feb 02, 2026 at 06:27:47PM +0800, Xu Yang wrote:
> > +
> > +static const struct property_entry dwc3_imx_properties[] = {
> > +	PROPERTY_ENTRY_BOOL("xhci-missing-cas-quirk"),
> > +	PROPERTY_ENTRY_BOOL("xhci-skip-phy-init-quirk"),
> > +	{},
> > +};
> > +
> > +static const struct software_node dwc3_imx_swnode = {
> > +	.properties = dwc3_imx_properties,
> > +};
> 
> I met similar case for layerscape dwc. because already use flatten,
> directly use probe_data pass these information to core library.

"xhci-missing-cas-quirk" and "xhci-skip-phy-init-quirk" are used by xhci
driver instead of dwc3 core driver. So they are needed here.

Thanks,
Xu Yang
Re: [PATCH 3/3] usb: dwc3: introduce flatten model driver of i.MX Soc
Posted by Thinh Nguyen 6 days, 17 hours ago
On Mon, Feb 02, 2026, Frank Li wrote:
> On Mon, Feb 02, 2026 at 06:27:47PM +0800, Xu Yang wrote:
> > To support flatten dwc3 devicetree model, introduce a new driver.
> >
> > Signed-off-by: Xu Yang <xu.yang_2@nxp.com>

Can you include additional info to describe why this was needed
(written in your cover letter).

Also note any new feature supported by this glue that's not currently
available in the old driver.

Thanks,
Thinh

(ps. I'm thinking of creating a legacy_glues directory to start moving
all the legacy glue drivers there)
Re: [PATCH 3/3] usb: dwc3: introduce flatten model driver of i.MX Soc
Posted by Xu Yang 5 days, 11 hours ago
On Tue, Feb 03, 2026 at 12:44:57AM +0000, Thinh Nguyen wrote:
> On Mon, Feb 02, 2026, Frank Li wrote:
> > On Mon, Feb 02, 2026 at 06:27:47PM +0800, Xu Yang wrote:
> > > To support flatten dwc3 devicetree model, introduce a new driver.
> > >
> > > Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
> 
> Can you include additional info to describe why this was needed
> (written in your cover letter).

Sure.

> 
> Also note any new feature supported by this glue that's not currently
> available in the old driver.

OK. No new feature in this driver.

> 
> Thanks,
> Thinh
> 
> (ps. I'm thinking of creating a legacy_glues directory to start moving
> all the legacy glue drivers there)

Got it. Thanks for sharing the info.

Thanks,
Xu Yang