88 lines
2.4 KiB
Diff
88 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Sabatino <[email protected]>
|
|
Date: Sat, 4 May 2024 15:07:27 +0200
|
|
Subject: add reset properties for usb otg/ehci
|
|
|
|
---
|
|
arch/arm/dts/rk322x.dtsi | 8 ++++++++
|
|
drivers/usb/host/dwc2.c | 5 ++++-
|
|
drivers/usb/host/ehci-generic.c | 6 +++---
|
|
3 files changed, 15 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/arch/arm/dts/rk322x.dtsi b/arch/arm/dts/rk322x.dtsi
|
|
index 111111111111..222222222222 100644
|
|
--- a/arch/arm/dts/rk322x.dtsi
|
|
+++ b/arch/arm/dts/rk322x.dtsi
|
|
@@ -799,6 +799,8 @@
|
|
g-tx-fifo-size = <256 128 128 64 32 16>;
|
|
phys = <&u2phy0_otg>;
|
|
phy-names = "usb2-phy";
|
|
+ resets = <&cru SRST_USBOTG>;
|
|
+ reset-names = "dwc2";
|
|
status = "disabled";
|
|
};
|
|
|
|
@@ -809,6 +811,8 @@
|
|
clocks = <&cru HCLK_HOST0>, <&u2phy0>;
|
|
phys = <&u2phy0_host>;
|
|
phy-names = "usb";
|
|
+ resets = <&cru SRST_USBHOST0>;
|
|
+ reset-names = "ehci";
|
|
status = "disabled";
|
|
};
|
|
|
|
@@ -829,6 +833,8 @@
|
|
clocks = <&cru HCLK_HOST1>, <&u2phy1>;
|
|
phys = <&u2phy1_otg>;
|
|
phy-names = "usb";
|
|
+ resets = <&cru SRST_USBHOST1>;
|
|
+ reset-names = "ehci";
|
|
status = "disabled";
|
|
};
|
|
|
|
@@ -849,6 +855,8 @@
|
|
clocks = <&cru HCLK_HOST2>, <&u2phy1>;
|
|
phys = <&u2phy1_host>;
|
|
phy-names = "usb";
|
|
+ resets = <&cru SRST_USBHOST2>;
|
|
+ reset-names = "ehci";
|
|
status = "disabled";
|
|
};
|
|
|
|
diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/usb/host/dwc2.c
|
|
+++ b/drivers/usb/host/dwc2.c
|
|
@@ -1438,7 +1438,10 @@ static int dwc2_usb_remove(struct udevice *dev)
|
|
|
|
dwc2_uninit_common(priv->regs);
|
|
|
|
- reset_release_bulk(&priv->resets);
|
|
+ // Assert first and then leave the resets deasserted
|
|
+ reset_assert_bulk(&priv->resets);
|
|
+ reset_deassert_bulk(&priv->resets);
|
|
+
|
|
clk_disable_bulk(&priv->clks);
|
|
clk_release_bulk(&priv->clks);
|
|
|
|
diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c
|
|
index 111111111111..222222222222 100644
|
|
--- a/drivers/usb/host/ehci-generic.c
|
|
+++ b/drivers/usb/host/ehci-generic.c
|
|
@@ -148,9 +148,9 @@ static int ehci_usb_remove(struct udevice *dev)
|
|
if (ret)
|
|
return ret;
|
|
|
|
- ret = reset_release_bulk(&priv->resets);
|
|
- if (ret)
|
|
- return ret;
|
|
+ // Assert first and then leave the resets deasserted
|
|
+ reset_assert_bulk(&priv->resets);
|
|
+ reset_deassert_bulk(&priv->resets);
|
|
|
|
return clk_release_bulk(&priv->clocks);
|
|
}
|
|
--
|
|
Armbian
|
|
|