From 53db0da5fa3cf7f9d8da76696157ecda6eddbdfe Mon Sep 17 00:00:00 2001 From: Soren Brinkmann Date: Wed, 19 Dec 2012 10:18:41 -0800 Subject: [PATCH] --- yaml --- r: 355243 b: refs/heads/master c: 03377e5852309edc90acbb03f6e2dfef70c020f2 h: refs/heads/master i: 355241: b8d61d8e245698dbdb91619033b919e20c7d2f3e 355239: f3476fc2195ece525c18261deb583f7f29e3f9c2 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-zynq/timer.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9c423797a5b1..3ccd5b69cd4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a645976aecab6ee21ce29703a1133dd26a8f216 +refs/heads/master: 03377e5852309edc90acbb03f6e2dfef70c020f2 diff --git a/trunk/arch/arm/mach-zynq/timer.c b/trunk/arch/arm/mach-zynq/timer.c index 2b23d0fae934..7b2e04776a54 100644 --- a/trunk/arch/arm/mach-zynq/timer.c +++ b/trunk/arch/arm/mach-zynq/timer.c @@ -36,7 +36,8 @@ #define XTTCPS_CNT_CNTRL_DISABLE_MASK 0x1 -/* Setup the timers to use pre-scaling, using a fixed value for now that will +/* + * Setup the timers to use pre-scaling, using a fixed value for now that will * work across most input frequency, but it may need to be more dynamic */ #define PRESCALE_EXPONENT 11 /* 2 ^ PRESCALE_EXPONENT = PRESCALE */ @@ -89,8 +90,10 @@ static void xttcps_set_interval(struct xttcps_timer *timer, __raw_writel(cycles, timer->base_addr + XTTCPS_INTR_VAL_OFFSET); - /* Reset the counter (0x10) so that it starts from 0, one-shot - mode makes this needed for timing to be right. */ + /* + * Reset the counter (0x10) so that it starts from 0, one-shot + * mode makes this needed for timing to be right. + */ ctrl_reg |= CNT_CNTRL_RESET; ctrl_reg &= ~XTTCPS_CNT_CNTRL_DISABLE_MASK; __raw_writel(ctrl_reg, timer->base_addr + XTTCPS_CNT_CNTRL_OFFSET);