diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-07 08:55:13 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-07 08:55:13 (GMT) |
| commit | e244978163836ffef635ecc57417f25332698f00 (patch) | |
| tree | 044817e0080a5866c7248f493482caace0f282bb /drivers/phy/phy-rockchip-pcie.c | |
| parent | d6124b409ca33c100170ffde51cd8dff761454a1 (diff) | |
| parent | 4320f9d4c1831fd4d244a9de8f81bc27ea67699c (diff) | |
| download | linux-e244978163836ffef635ecc57417f25332698f00.tar.xz | |
Merge tag 'phy-for-4.9-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-linus
Kishon writes:
phy: for 4.9 -rc
phy fixes:
*) Add a empty function for phy_reset when CONFIG_GENERIC_PHY is not set
*) change the phy lookup table for da8xx-usb to match it with the name
present in the board configuraion file (used for non-dt boot)
*) Fix incorrect programming sequence in w.r.t deassert of phy_rst
in phy-rockchip-pcie
*) Fix to avoid NULL pointer dereferencing error in sun4i phy
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Diffstat (limited to 'drivers/phy/phy-rockchip-pcie.c')
| -rw-r--r-- | drivers/phy/phy-rockchip-pcie.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/phy/phy-rockchip-pcie.c b/drivers/phy/phy-rockchip-pcie.c index a2b4c6b..6904633 100644 --- a/drivers/phy/phy-rockchip-pcie.c +++ b/drivers/phy/phy-rockchip-pcie.c @@ -249,21 +249,10 @@ err_refclk: static int rockchip_pcie_phy_exit(struct phy *phy) { struct rockchip_pcie_phy *rk_phy = phy_get_drvdata(phy); - int err = 0; clk_disable_unprepare(rk_phy->clk_pciephy_ref); - err = reset_control_deassert(rk_phy->phy_rst); - if (err) { - dev_err(&phy->dev, "deassert phy_rst err %d\n", err); - goto err_reset; - } - - return err; - -err_reset: - clk_prepare_enable(rk_phy->clk_pciephy_ref); - return err; + return 0; } static const struct phy_ops ops = { |