From e590c6a4ee0d3ad989c7afe3200808ed112617cf Mon Sep 17 00:00:00 2001 From: Matt Reimer Date: Mon, 12 Feb 2007 20:42:52 +0100 Subject: [PATCH] --- yaml --- r: 48935 b: refs/heads/master c: b05f87172f904b28bd5ac058ebfb4e216b843efe h: refs/heads/master i: 48933: 3eb72cde76e288550ad2f4154c5ea449c34ce41b 48931: 1b2a0853a71c71f293bd0cb4563c63d2567c429d 48927: 98526b8c36290f8c6bbc460ed97eb38c920a8d97 v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-s3c2410/system.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0e39b5236c62..11546f091b3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07b04595e3630594773223874827f5bbd03fc289 +refs/heads/master: b05f87172f904b28bd5ac058ebfb4e216b843efe diff --git a/trunk/include/asm-arm/arch-s3c2410/system.h b/trunk/include/asm-arm/arch-s3c2410/system.h index ecf250db45fb..41aeb731c5a0 100644 --- a/trunk/include/asm-arm/arch-s3c2410/system.h +++ b/trunk/include/asm-arm/arch-s3c2410/system.h @@ -23,7 +23,6 @@ void (*s3c24xx_idle)(void); void s3c24xx_default_idle(void) { - void __iomem *reg = S3C2410_CLKCON; unsigned long tmp; int i; @@ -33,16 +32,18 @@ void s3c24xx_default_idle(void) /* Warning: going into idle state upsets jtag scanning */ - __raw_writel(__raw_readl(reg) | (1<<2), reg); + __raw_writel(__raw_readl(S3C2410_CLKCON) | S3C2410_CLKCON_IDLE, + S3C2410_CLKCON); /* the samsung port seems to do a loop and then unset idle.. */ for (i = 0; i < 50; i++) { - tmp += __raw_readl(reg); /* ensure loop not optimised out */ + tmp += __raw_readl(S3C2410_CLKCON); /* ensure loop not optimised out */ } /* this bit is not cleared on re-start... */ - __raw_writel(__raw_readl(reg) & ~(1<<2), reg); + __raw_writel(__raw_readl(S3C2410_CLKCON) & ~S3C2410_CLKCON_IDLE, + S3C2410_CLKCON); } static void arch_idle(void)