/*
- * linux/include/asm-arm/hardware/SA-1111.h
+ * linux/include/asm-arm/hardware/sa1111.h
*
* Copyright (C) 2000 John G Dorsey <john+@cs.cmu.edu>
*
*/
#define __CCREG(x) __REGP(SA1111_VBASE + (x))
-#define sa1111_writel(val,addr) ({ *(volatile unsigned int *)(addr) = (val); })
-#define sa1111_readl(addr) (*(volatile unsigned int *)(addr))
+#define sa1111_writel(val,addr) __raw_writel(val, addr)
+#define sa1111_readl(addr) __raw_readl(addr)
/*
* System Bus Interface (SBI)
struct device dev;
unsigned int devid;
struct resource res;
- void *mapbase;
+ void __iomem *mapbase;
unsigned int skpcr_mask;
unsigned int irq[6];
u64 dma_mask;
unsigned int devid;
int (*probe)(struct sa1111_dev *);
int (*remove)(struct sa1111_dev *);
- int (*suspend)(struct sa1111_dev *, u32);
+ int (*suspend)(struct sa1111_dev *, pm_message_t);
int (*resume)(struct sa1111_dev *);
};