From: Randy Li <ayaka@soulik.info>
To: linux-usb@vger.kernel.org
Cc: John.Youn@synopsys.com, kishon@ti.com,
felipe.balbi@linux.intel.com, mark.rutland@arm.com,
devicetree@vger.kernel.org, heiko@sntech.de,
gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org,
linux-rockchip@lists.infradead.org, robh+dt@kernel.org,
randy.li@rock-chips.com, Randy Li <ayaka@soulik.info>
Subject: [RESEND PATCH v7 2/4] phy: rockchip-usb: use rockchip_usb_phy_reset to reset phy during wakeup
Date: Sat, 10 Sep 2016 02:59:38 +0800 [thread overview]
Message-ID: <1473447580-10369-3-git-send-email-ayaka@soulik.info> (raw)
In-Reply-To: <1473447580-10369-1-git-send-email-ayaka@soulik.info>
It is a hardware bug in RK3288, the only way to solve it is to
reset the phy.
Signed-off-by: Randy Li <ayaka@soulik.info>
---
.../devicetree/bindings/phy/rockchip-usb-phy.txt | 3 +++
drivers/phy/phy-rockchip-usb.c | 20 ++++++++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
index cc6be96..57dc388 100644
--- a/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
+++ b/Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt
@@ -27,6 +27,9 @@ Optional Properties:
- clocks : phandle + clock specifier for the phy clocks
- clock-names: string, clock name, must be "phyclk"
- #clock-cells: for users of the phy-pll, should be 0
+- reset-names: Only allow the following entries:
+ - phy-reset
+- resets: Must contain an entry for each entry in reset-names.
Example:
diff --git a/drivers/phy/phy-rockchip-usb.c b/drivers/phy/phy-rockchip-usb.c
index 2a7381f..734987f 100644
--- a/drivers/phy/phy-rockchip-usb.c
+++ b/drivers/phy/phy-rockchip-usb.c
@@ -29,6 +29,7 @@
#include <linux/reset.h>
#include <linux/regmap.h>
#include <linux/mfd/syscon.h>
+#include <linux/delay.h>
static int enable_usb_uart;
@@ -64,6 +65,7 @@ struct rockchip_usb_phy {
struct clk_hw clk480m_hw;
struct phy *phy;
bool uart_enabled;
+ struct reset_control *reset;
};
static int rockchip_usb_phy_power(struct rockchip_usb_phy *phy,
@@ -144,9 +146,23 @@ static int rockchip_usb_phy_power_on(struct phy *_phy)
return clk_prepare_enable(phy->clk480m);
}
+static int rockchip_usb_phy_reset(struct phy *_phy)
+{
+ struct rockchip_usb_phy *phy = phy_get_drvdata(_phy);
+
+ if (phy->reset) {
+ reset_control_assert(phy->reset);
+ udelay(10);
+ reset_control_deassert(phy->reset);
+ }
+
+ return 0;
+}
+
static const struct phy_ops ops = {
.power_on = rockchip_usb_phy_power_on,
.power_off = rockchip_usb_phy_power_off,
+ .reset = rockchip_usb_phy_reset,
.owner = THIS_MODULE,
};
@@ -185,6 +201,10 @@ static int rockchip_usb_phy_init(struct rockchip_usb_phy_base *base,
return -EINVAL;
}
+ rk_phy->reset = of_reset_control_get(child, "phy-reset");
+ if (IS_ERR(rk_phy->reset))
+ rk_phy->reset = NULL;
+
rk_phy->reg_offset = reg_offset;
rk_phy->clk = of_clk_get_by_name(child, "phyclk");
--
2.7.4
next prev parent reply other threads:[~2016-09-09 19:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-09 18:59 [RESEND PATCH v7 0/4] the fix for the USB HOST1 at rk3288 platform Randy Li
2016-09-09 18:59 ` Randy Li
2016-09-09 18:59 ` [RESEND PATCH v7 1/4] phy: Add reset callback Randy Li
2016-09-09 18:59 ` Randy Li
2016-09-10 8:51 ` Heiko Stuebner
2016-09-10 8:51 ` Heiko Stuebner
2016-09-10 11:57 ` Kishon Vijay Abraham I
2016-09-09 18:59 ` Randy Li [this message]
2016-09-19 21:28 ` [RESEND PATCH v7 2/4] phy: rockchip-usb: use rockchip_usb_phy_reset to reset phy during wakeup Rob Herring
2016-09-09 18:59 ` [RESEND PATCH v7 3/4] usb: dwc2: assert phy reset when waking up in rk3288 platform Randy Li
2016-09-09 18:59 ` Randy Li
2016-09-09 19:40 ` Sergei Shtylyov
2016-09-09 19:40 ` Sergei Shtylyov
2016-09-11 10:03 ` kbuild test robot
2016-09-11 10:03 ` kbuild test robot
2016-09-09 18:59 ` [RESEND PATCH v7 4/4] ARM: dts: rockchip: Point rk3288 dwc2 usb at the full PHY reset Randy Li
2016-09-09 18:59 ` Randy Li
2016-09-13 11:06 ` [RESEND PATCH v7 0/4] the fix for the USB HOST1 at rk3288 platform Heiko Stuebner
2016-09-13 11:06 ` Heiko Stuebner
2016-09-13 11:26 ` ayaka
2016-09-13 11:26 ` ayaka
2016-09-13 14:30 ` Heiko Stuebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473447580-10369-3-git-send-email-ayaka@soulik.info \
--to=ayaka@soulik.info \
--cc=John.Youn@synopsys.com \
--cc=devicetree@vger.kernel.org \
--cc=felipe.balbi@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=heiko@sntech.de \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=linux-usb@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=randy.li@rock-chips.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.