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

Ux500 clocksource updates: 

- Use relaxed readl() variant
 - Fix a single comment
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJRrc14AAoJEEEQszewGV1zs8sP/iGBEfX/QoImx1S/WYVImNLA
 YtJmSdxt9B35uPd4n7AuB2u19+gZ6ZdDQPT4VO1e9PpmuHyt0Lb/JEHIpMsK/50s
 eIAqstcjKSXTAOukd2f90MNTB82XzIh6ptWLtrIdKuLVn2ZdS4XGnzF9gvPSBlSX
 kImhTl8wqgJqRcz3AkYSYm6bmUix25suw/8ZlT9ePw/eX2EoOC6MUefFvjkAsAPJ
 XoHQHBaRA2t/ApAefEk1vkgkYvHl3TO8KjNzExDybIpTj8/v4M71RI0at8rH5sk2
 j1qVsV/0XEX8JsOMQGX4j/FvQ1dhcylGLDtTJRS5ykOOZRSnrrn/8S7FBh9xhspG
 DeXDwTLs5AYOdefixTnhloXpFoGkg1eLdU8HspTuLafUlv89JX3r3vQTq/hxU4Rk
 jQ/uCXq0InhBGdZo4Cbb0UGXXt3lrAmWxXcNR1IhvePi7lntXnAs702kTsnBdQU7
 sBMi/S7afdupSGFJuLszwKFzEK18GCL3l9dgcMfTLv5n5eQDEfc45u608tQyQXZ1
 Yl6bEm4dBFuze6OL+e9+08x7kvMTOiqXa0qkOWpUIfPBSJvY67vJ1AGjKKw279vz
 q1AEKkBc0+hMpNT2F/DDmgjsRIUALuBAqAi8RU/EeHC0lDLCyqaTGEszSupza0Wb
 4E1VIykKHNdYC6vIyKFB
 =RHtI
 -----END PGP SIGNATURE-----

Merge tag 'ux500-clksrc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers

From Linus Walleij:
Ux500 clocksource updates:
- Use relaxed readl() variant
- Fix a single comment

* tag 'ux500-clksrc-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  clocksource: dbx500-prcmu: comment cleanup
  clocksource: dbx500-prcmu: use relaxed readl variant

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-06-14 16:50:48 -07:00
parent f54ffe0fef 807eba55f7
commit 0d86331b4c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/clocksource/clksrc-dbx500-prcmu.c
View File

@ -10,7 +10,7 @@
* DBx500-PRCMU Timer * DBx500-PRCMU Timer
* The PRCMU has 5 timers which are available in a always-on * The PRCMU has 5 timers which are available in a always-on
* power domain. We use the Timer 4 for our always-on clock * power domain. We use the Timer 4 for our always-on clock
* source on DB8500 and Timer 3 on DB5500. * source on DB8500.
*/ */
#include <linux/clockchips.h> #include <linux/clockchips.h>
#include <linux/clksrc-dbx500-prcmu.h> #include <linux/clksrc-dbx500-prcmu.h>
@ -30,15 +30,14 @@
static void __iomem *clksrc_dbx500_timer_base; static void __iomem *clksrc_dbx500_timer_base;
static cycle_t clksrc_dbx500_prcmu_read(struct clocksource *cs) static cycle_t notrace clksrc_dbx500_prcmu_read(struct clocksource *cs)
{ {
void __iomem *base = clksrc_dbx500_timer_base;
u32 count, count2; u32 count, count2;
do { do {
count = readl(clksrc_dbx500_timer_base + count = readl_relaxed(base + PRCMU_TIMER_DOWNCOUNT);
PRCMU_TIMER_DOWNCOUNT); count2 = readl_relaxed(base + PRCMU_TIMER_DOWNCOUNT);
count2 = readl(clksrc_dbx500_timer_base +
PRCMU_TIMER_DOWNCOUNT);
} while (count2 != count); } while (count2 != count);
/* Negate because the timer is a decrementing counter */ /* Negate because the timer is a decrementing counter */