Do not use __raw_readl on straight pointers. Change the
code to using 'u32 *' as we are only accessing kernel
RAM using phys_to_virt() to find where it is.
Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
Index: linux-2.6.27-rc6-quilt3/arch/arm/mach-s3c2410/pm.c
===================================================================
--- linux-2.6.27-rc6-quilt3.orig/arch/arm/mach-s3c2410/pm.c 2008-09-16
10:29:59.000000000 +0100
+++ linux-2.6.27-rc6-quilt3/arch/arm/mach-s3c2410/pm.c 2008-09-16
10:40:20.000000000 +0100
@@ -44,6 +44,11 @@ extern void pm_dbg(const char *fmt, ...)
#define DBG(fmt...) printk(KERN_DEBUG fmt)
#endif
+static inline void write_u32(u32 value, void *to)
+{
+ *(u32 *)to = value;
+}
+
static void s3c2410_pm_prepare(void)
{
/* ensure at least GSTATUS3 has the resume address */
@@ -54,35 +59,35 @@ static void s3c2410_pm_prepare(void)
DBG("GSTATUS4 0x%08x\n", __raw_readl(S3C2410_GSTATUS4));
if (machine_is_h1940()) {
- void *base = phys_to_virt(H1940_SUSPEND_CHECK);
- unsigned long ptr;
- unsigned long calc = 0;
+ u32 *base = phys_to_virt(H1940_SUSPEND_CHECK);
+ unsigned ptr;
+ u32 calc = 0;
/* generate check for the bootloader to check on resume */
- for (ptr = 0; ptr < 0x40000; ptr += 0x400)
- calc += __raw_readl(base+ptr);
+ for (ptr = 0; ptr < 0x40000/4; ptr += 0x400/4)
+ calc += base[ptr];
- __raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM));
+ write_u32(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM));
}
/* the RX3715 uses similar code and the same H1940 and the
* same offsets for resume and checksum pointers */
if (machine_is_rx3715()) {
- void *base = phys_to_virt(H1940_SUSPEND_CHECK);
- unsigned long ptr;
- unsigned long calc = 0;
+ u32 *base = phys_to_virt(H1940_SUSPEND_CHECK);
+ unsigned ptr;
+ u32 calc = 0;
/* generate check for the bootloader to check on resume */
- for (ptr = 0; ptr < 0x40000; ptr += 0x4)
- calc += __raw_readl(base+ptr);
+ for (ptr = 0; ptr < 0x40000/4; ptr += 0x4/4)
+ calc += base[ptr];
- __raw_writel(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM));
+ write_u32(calc, phys_to_virt(H1940_SUSPEND_CHECKSUM));
}
- if ( machine_is_aml_m5900() )
+ if (machine_is_aml_m5900())
s3c2410_gpio_setpin(S3C2410_GPF2, 1);
}
@@ -97,7 +102,7 @@ static int s3c2410_pm_resume(struct sys_
tmp &= S3C2410_GSTATUS2_OFFRESET;
__raw_writel(tmp, S3C2410_GSTATUS2);
- if ( machine_is_aml_m5900() )
+ if (machine_is_aml_m5900())
s3c2410_gpio_setpin(S3C2410_GPF2, 0);
return 0;
--
Ben ([EMAIL PROTECTED], http://www.fluff.org/)
'a smiley only costs 4 bytes'
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
