UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

phy: phy-pxa-28nm-hsic: convert to readl_poll_timeout() 

Use readl_poll_timeout() to simplify code

Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Link: https://lore.kernel.org/r/1598320987-25518-5-git-send-email-chunfeng.yun@mediatek.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Chunfeng Yun 2020-08-25 10:03:06 +08:00 committed by Vinod Koul
parent 38af68cb04
commit f63602b1c6
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/phy/marvell/phy-pxa-28nm-hsic.c
View File

@ -12,6 +12,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/iopoll.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/module.h> #include <linux/module.h>
@ -44,15 +45,12 @@ struct mv_hsic_phy {
struct clk *clk; struct clk *clk;
}; };
static bool wait_for_reg(void __iomem *reg, u32 mask, unsigned long timeout) static int wait_for_reg(void __iomem *reg, u32 mask, u32 ms)
{ {
timeout += jiffies; u32 val;
while (time_is_after_eq_jiffies(timeout)) {
if ((readl(reg) & mask) == mask) return readl_poll_timeout(reg, val, ((val & mask) == mask),
return true; 1000, 1000 * ms);
msleep(1);
}
return false;
} }
static int mv_hsic_phy_init(struct phy *phy) static int mv_hsic_phy_init(struct phy *phy)
@ -60,6 +58,7 @@ static int mv_hsic_phy_init(struct phy *phy)
struct mv_hsic_phy *mv_phy = phy_get_drvdata(phy); struct mv_hsic_phy *mv_phy = phy_get_drvdata(phy);
struct platform_device *pdev = mv_phy->pdev; struct platform_device *pdev = mv_phy->pdev;
void __iomem *base = mv_phy->base; void __iomem *base = mv_phy->base;
int ret;
clk_prepare_enable(mv_phy->clk); clk_prepare_enable(mv_phy->clk);
@ -75,14 +74,14 @@ static int mv_hsic_phy_init(struct phy *phy)
base + PHY_28NM_HSIC_PLL_CTRL2); base + PHY_28NM_HSIC_PLL_CTRL2);
/* Make sure PHY PLL is locked */ /* Make sure PHY PLL is locked */
if (!wait_for_reg(base + PHY_28NM_HSIC_PLL_CTRL2, ret = wait_for_reg(base + PHY_28NM_HSIC_PLL_CTRL2,
PHY_28NM_HSIC_H2S_PLL_LOCK, HZ / 10)) { PHY_28NM_HSIC_H2S_PLL_LOCK, 100);
if (ret) {
dev_err(&pdev->dev, "HSIC PHY PLL not locked after 100mS."); dev_err(&pdev->dev, "HSIC PHY PLL not locked after 100mS.");
clk_disable_unprepare(mv_phy->clk); clk_disable_unprepare(mv_phy->clk);
return -ETIMEDOUT;
} }
return 0; return ret;
} }
static int mv_hsic_phy_power_on(struct phy *phy) static int mv_hsic_phy_power_on(struct phy *phy)
@ -91,6 +90,7 @@ static int mv_hsic_phy_power_on(struct phy *phy)
struct platform_device *pdev = mv_phy->pdev; struct platform_device *pdev = mv_phy->pdev;
void __iomem *base = mv_phy->base; void __iomem *base = mv_phy->base;
u32 reg; u32 reg;
int ret;
reg = readl(base + PHY_28NM_HSIC_CTRL); reg = readl(base + PHY_28NM_HSIC_CTRL);
/* Avoid SE0 state when resume for some device will take it as reset */ /* Avoid SE0 state when resume for some device will take it as reset */
@ -108,20 +108,20 @@ static int mv_hsic_phy_power_on(struct phy *phy)
*/ */
/* Make sure PHY Calibration is ready */ /* Make sure PHY Calibration is ready */
if (!wait_for_reg(base + PHY_28NM_HSIC_IMPCAL_CAL, ret = wait_for_reg(base + PHY_28NM_HSIC_IMPCAL_CAL,
PHY_28NM_HSIC_H2S_IMPCAL_DONE, HZ / 10)) { PHY_28NM_HSIC_H2S_IMPCAL_DONE, 100);
if (ret) {
dev_warn(&pdev->dev, "HSIC PHY READY not set after 100mS."); dev_warn(&pdev->dev, "HSIC PHY READY not set after 100mS.");
return -ETIMEDOUT; return ret;
} }
/* Waiting for HSIC connect int*/ /* Waiting for HSIC connect int*/
if (!wait_for_reg(base + PHY_28NM_HSIC_INT, ret = wait_for_reg(base + PHY_28NM_HSIC_INT,
PHY_28NM_HSIC_CONNECT_INT, HZ / 5)) { PHY_28NM_HSIC_CONNECT_INT, 200);
if (ret)
dev_warn(&pdev->dev, "HSIC wait for connect interrupt timeout."); dev_warn(&pdev->dev, "HSIC wait for connect interrupt timeout.");
return -ETIMEDOUT;
}
return 0; return ret;
} }
static int mv_hsic_phy_power_off(struct phy *phy) static int mv_hsic_phy_power_off(struct phy *phy)