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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-keywest.h
diff --git
a/drivers/i2c/busses/i2c-keywest.h
b/drivers/i2c/busses/i2c-keywest.h
index
c5022e1
..
ecc279d
100644
(file)
--- a/
drivers/i2c/busses/i2c-keywest.h
+++ b/
drivers/i2c/busses/i2c-keywest.h
@@
-52,7
+52,7
@@
typedef enum {
struct keywest_iface
{
struct device_node *node;
struct keywest_iface
{
struct device_node *node;
-
void __iomem *
base;
+
unsigned long
base;
unsigned bsteps;
int irq;
spinlock_t lock;
unsigned bsteps;
int irq;
spinlock_t lock;
@@
-89,13
+89,13
@@
struct keywest_chan
static inline u8 __read_reg(struct keywest_iface *iface, reg_t reg)
{
static inline u8 __read_reg(struct keywest_iface *iface, reg_t reg)
{
- return in_8(
iface->base
+ return in_8(
((volatile u8 *)iface->base)
+ (((unsigned)reg) << iface->bsteps));
}
static inline void __write_reg(struct keywest_iface *iface, reg_t reg, u8 val)
{
+ (((unsigned)reg) << iface->bsteps));
}
static inline void __write_reg(struct keywest_iface *iface, reg_t reg, u8 val)
{
- out_8(
iface->base
+ out_8(
((volatile u8 *)iface->base)
+ (((unsigned)reg) << iface->bsteps), val);
(void)__read_reg(iface, reg_subaddr);
}
+ (((unsigned)reg) << iface->bsteps), val);
(void)__read_reg(iface, reg_subaddr);
}