summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2011-10-12 02:31:39 +0000
committerWolfgang Denk <wd@denx.de>2011-10-22 01:16:08 +0200
commitc4c9fbebae6a62d538817d0ccee698adaafc5d66 (patch)
tree91e9e2b82568b32bf3135bdc25d0a852f6c31095 /arch/powerpc
parent712fbcf384b7fbe6118325f21dad98150b24f13b (diff)
downloadu-boot-imx-c4c9fbebae6a62d538817d0ccee698adaafc5d66.zip
u-boot-imx-c4c9fbebae6a62d538817d0ccee698adaafc5d66.tar.gz
u-boot-imx-c4c9fbebae6a62d538817d0ccee698adaafc5d66.tar.bz2
consolidate mdelay by providing a common function for all users
There are several mdelay() definitions in the driver and board code. Remove them all and provide a common mdelay() in lib/time.c. Signed-off-by: Anatolij Gustschin <agust@denx.de> Acked-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/cpu/mpc5xxx/usb_ohci.c1
-rw-r--r--arch/powerpc/cpu/ppc4xx/usb_ohci.c1
-rw-r--r--arch/powerpc/include/asm/4xx_pcie.h8
3 files changed, 0 insertions, 10 deletions
diff --git a/arch/powerpc/cpu/mpc5xxx/usb_ohci.c b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c
index 7976e4d..2fc1180 100644
--- a/arch/powerpc/cpu/mpc5xxx/usb_ohci.c
+++ b/arch/powerpc/cpu/mpc5xxx/usb_ohci.c
@@ -1455,7 +1455,6 @@ static int hc_start (ohci_t * ohci)
writel (RH_HS_LPSC, &ohci->regs->roothub.status);
#endif /* OHCI_USE_NPS */
-#define mdelay(n) ({unsigned long msec=(n); while (msec--) udelay(1000);})
/* POTPGT delay is bits 24-31, in 2 ms units. */
mdelay ((roothub_a (ohci) >> 23) & 0x1fe);
diff --git a/arch/powerpc/cpu/ppc4xx/usb_ohci.c b/arch/powerpc/cpu/ppc4xx/usb_ohci.c
index a9edacd..fe091e3 100644
--- a/arch/powerpc/cpu/ppc4xx/usb_ohci.c
+++ b/arch/powerpc/cpu/ppc4xx/usb_ohci.c
@@ -1462,7 +1462,6 @@ static int hc_start (ohci_t * ohci)
writel (RH_HS_LPSC, &ohci->regs->roothub.status);
#endif /* OHCI_USE_NPS */
-#define mdelay(n) ({unsigned long msec=(n); while (msec--) udelay(1000);})
/* POTPGT delay is bits 24-31, in 2 ms units. */
mdelay ((roothub_a (ohci) >> 23) & 0x1fe);
diff --git a/arch/powerpc/include/asm/4xx_pcie.h b/arch/powerpc/include/asm/4xx_pcie.h
index 90e0bd9..fbdc28e 100644
--- a/arch/powerpc/include/asm/4xx_pcie.h
+++ b/arch/powerpc/include/asm/4xx_pcie.h
@@ -389,14 +389,6 @@ static inline int is_end_point(int port)
return 0;
}
-static inline void mdelay(int n)
-{
- u32 ms = n;
-
- while (ms--)
- udelay(1000);
-}
-
#if defined(PCIE0_SDR)
static inline u32 sdr_base(int port)
{