From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Thu, 30 Jun 2016 09:32:52 +0000 (+0200)
Subject: ARM: MXS: use 'struct mxs_digctl_regs' to access MXS_HW_DIGCTL_MICROSECONDS
X-Git-Tag: KARO-TX-2016-07-05~3^2~14
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=638de780ae4ee566808c98b7c83a8304700143da

ARM: MXS: use 'struct mxs_digctl_regs' to access MXS_HW_DIGCTL_MICROSECONDS
---

diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c
index f4514f3145..7b343ed375 100644
--- a/arch/arm/cpu/arm926ejs/mxs/timer.c
+++ b/arch/arm/cpu/arm926ejs/mxs/timer.c
@@ -155,13 +155,12 @@ ulong get_timer(ulong base)
 }
 
 /* We use the HW_DIGCTL_MICROSECONDS register for sub-millisecond timer. */
-#define	MXS_HW_DIGCTL_MICROSECONDS	0x8001c0c0
-
 void __udelay(unsigned long usec)
 {
-	uint32_t start = readl(MXS_HW_DIGCTL_MICROSECONDS);
+	struct mxs_digctl_regs *digctl_regs = (void *)MXS_DIGCTL_BASE;
+	u32 start = readl(&digctl_regs->hw_digctl_microseconds);
 
-	while (readl(MXS_HW_DIGCTL_MICROSECONDS) - start <= usec)
+	while (readl(&digctl_regs->hw_digctl_microseconds) - start <= usec)
 		/* use '<=' to guarantee a delay of _at least_
 		 * the given number of microseconds.
 		 * No need for fancy rollover checks