From e4db974edb5c46360465462518a88b83f1bdedf6 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov dmitry.antipov@linaro.org Date: Wed, 21 Dec 2011 10:57:08 +0400 Subject: [PATCH] omap: use usleep_range() instead of mdelay()/udelay()
--- arch/arm/mach-omap2/omap_phy_internal.c | 2 +- arch/arm/mach-omap2/vc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c index 58775e3..e5dff64 100644 --- a/arch/arm/mach-omap2/omap_phy_internal.c +++ b/arch/arm/mach-omap2/omap_phy_internal.c @@ -145,7 +145,7 @@ int omap4430_phy_suspend(struct device *dev, int suspend) /* power on the phy */ if (__raw_readl(ctrl_base + CONTROL_DEV_CONF) & PHY_PD) { __raw_writel(~PHY_PD, ctrl_base + CONTROL_DEV_CONF); - mdelay(200); + usleep_range(200000, 201000); }
/* restore the context */ diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c index 031d116..57f44d5 100644 --- a/arch/arm/mach-omap2/vc.c +++ b/arch/arm/mach-omap2/vc.c @@ -151,7 +151,7 @@ void omap_vc_post_scale(struct voltagedomain *voltdm, /* SMPS slew rate / step size. 2us added as buffer. */ smps_delay = ((smps_steps * voltdm->pmic->step_size) / voltdm->pmic->slew_rate) + 2; - udelay(smps_delay); + usleep_range(smps_delay, smps_delay + 10); }
/* vc_bypass_scale - VC bypass method of voltage scaling */
Dmitry Antipov dmitry.antipov@linaro.org writes:
From e4db974edb5c46360465462518a88b83f1bdedf6 Mon Sep 17 00:00:00 2001 From: Dmitry Antipov dmitry.antipov@linaro.org Date: Wed, 21 Dec 2011 10:57:08 +0400 Subject: [PATCH] omap: use usleep_range() instead of mdelay()/udelay()
Please include a signoff and a descriptive changelog (describing why.)
Thanks,
Kevin
arch/arm/mach-omap2/omap_phy_internal.c | 2 +- arch/arm/mach-omap2/vc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c index 58775e3..e5dff64 100644 --- a/arch/arm/mach-omap2/omap_phy_internal.c +++ b/arch/arm/mach-omap2/omap_phy_internal.c @@ -145,7 +145,7 @@ int omap4430_phy_suspend(struct device *dev, int suspend) /* power on the phy */ if (__raw_readl(ctrl_base + CONTROL_DEV_CONF) & PHY_PD) { __raw_writel(~PHY_PD, ctrl_base + CONTROL_DEV_CONF);
mdelay(200);
usleep_range(200000, 201000);
}
/* restore the context */
diff --git a/arch/arm/mach-omap2/vc.c b/arch/arm/mach-omap2/vc.c index 031d116..57f44d5 100644 --- a/arch/arm/mach-omap2/vc.c +++ b/arch/arm/mach-omap2/vc.c @@ -151,7 +151,7 @@ void omap_vc_post_scale(struct voltagedomain *voltdm, /* SMPS slew rate / step size. 2us added as buffer. */ smps_delay = ((smps_steps * voltdm->pmic->step_size) / voltdm->pmic->slew_rate) + 2;
- udelay(smps_delay);
- usleep_range(smps_delay, smps_delay + 10);
}
/* vc_bypass_scale - VC bypass method of voltage scaling */