git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-sparc
/
mostek.h
diff --git
a/include/asm-sparc/mostek.h
b/include/asm-sparc/mostek.h
index
be60a9a
..
958d051
100644
(file)
--- a/
include/asm-sparc/mostek.h
+++ b/
include/asm-sparc/mostek.h
@@
-9,8
+9,8
@@
#ifndef _SPARC_MOSTEK_H
#define _SPARC_MOSTEK_H
#ifndef _SPARC_MOSTEK_H
#define _SPARC_MOSTEK_H
-#include <linux/config.h>
#include <asm/idprom.h>
#include <asm/idprom.h>
+#include <asm/io.h>
/* M48T02 Register Map (adapted from Sun NVRAM/Hostid FAQ)
*
/* M48T02 Register Map (adapted from Sun NVRAM/Hostid FAQ)
*
@@
-38,8
+38,8
@@
* other than the control register are in binary coded decimal. Some
* control bits also live outside the control register.
*/
* other than the control register are in binary coded decimal. Some
* control bits also live outside the control register.
*/
-#define mostek_read(_addr)
(*((volatile u8 *)(_addr))
)
-#define mostek_write(_addr,_val)
((*((volatile u8 *)(_addr))) = (_val)
)
+#define mostek_read(_addr)
readb(_addr
)
+#define mostek_write(_addr,_val)
writeb(_val, _addr
)
#define MOSTEK_EEPROM 0x0000UL
#define MOSTEK_IDPROM 0x07d8UL
#define MOSTEK_CREG 0x07f8UL
#define MOSTEK_EEPROM 0x0000UL
#define MOSTEK_IDPROM 0x07d8UL
#define MOSTEK_CREG 0x07f8UL
@@
-65,7
+65,7
@@
struct mostek48t02 {
};
extern spinlock_t mostek_lock;
};
extern spinlock_t mostek_lock;
-extern
unsigned long
mstk48t02_regs;
+extern
void __iomem *
mstk48t02_regs;
/* Control register values. */
#define MSTK_CREG_WRITE 0x80 /* Must set this before placing values. */
/* Control register values. */
#define MSTK_CREG_WRITE 0x80 /* Must set this before placing values. */
@@
-87,7
+87,7
@@
extern unsigned long mstk48t02_regs;
#define MSTK_DOW_MASK 0x07
#define MSTK_DOM_MASK 0x3f
#define MSTK_MONTH_MASK 0x1f
#define MSTK_DOW_MASK 0x07
#define MSTK_DOM_MASK 0x3f
#define MSTK_MONTH_MASK 0x1f
-#define MSTK_YEAR_MASK 0xff
+#define MSTK_YEAR_MASK 0xff
U
/* Binary coded decimal conversion macros. */
#define MSTK_REGVAL_TO_DECIMAL(x) (((x) & 0x0F) + 0x0A * ((x) >> 0x04))
/* Binary coded decimal conversion macros. */
#define MSTK_REGVAL_TO_DECIMAL(x) (((x) & 0x0F) + 0x0A * ((x) >> 0x04))
@@
-127,7
+127,6
@@
struct mostek48t08 {
char offset[6*1024]; /* Magic things may be here, who knows? */
struct mostek48t02 regs; /* Here is what we are interested in. */
};
char offset[6*1024]; /* Magic things may be here, who knows? */
struct mostek48t02 regs; /* Here is what we are interested in. */
};
-extern struct mostek48t08 *mstk48t08_regs;
extern enum sparc_clock_type sp_clock_typ;
extern enum sparc_clock_type sp_clock_typ;