AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[PATCH] ppc iomem annotations: pmac_low_i2c

Browse Source 
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2005-04-25 07:55:58 -07:00 committed by Linus Torvalds
parent ba724a373a
commit d01daf72f0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/ppc/platforms/pmac_low_i2c.c
View File

@ -54,7 +54,7 @@ struct low_i2c_host
int mode; /* Current mode */ int mode; /* Current mode */
int channel; /* Current channel */ int channel; /* Current channel */
int num_channels; /* Number of channels */ int num_channels; /* Number of channels */
unsigned long base; /* For keywest-i2c, base address */ void __iomem * base; /* For keywest-i2c, base address */
int bsteps; /* And register stepping */ int bsteps; /* And register stepping */
int speed; /* And speed */ int speed; /* And speed */
}; };
@ -154,14 +154,12 @@ static const char *__kw_state_names[] = {
static inline u8 __kw_read_reg(struct low_i2c_host *host, reg_t reg) static inline u8 __kw_read_reg(struct low_i2c_host *host, reg_t reg)
{ {
return in_8(((volatile u8 *)host->base) return in_8(host->base + (((unsigned)reg) << host->bsteps));
+ (((unsigned)reg) << host->bsteps));
} }
static inline void __kw_write_reg(struct low_i2c_host *host, reg_t reg, u8 val) static inline void __kw_write_reg(struct low_i2c_host *host, reg_t reg, u8 val)
{ {
out_8(((volatile u8 *)host->base) out_8(host->base + (((unsigned)reg) << host->bsteps), val);
+ (((unsigned)reg) << host->bsteps), val);
(void)__kw_read_reg(host, reg_subaddr); (void)__kw_read_reg(host, reg_subaddr);
} }
@ -370,7 +368,7 @@ static void keywest_low_i2c_add(struct device_node *np)
break; break;
} }
host->mode = pmac_low_i2c_mode_std; host->mode = pmac_low_i2c_mode_std;
host->base = (unsigned long)ioremap(np->addrs[0].address + aoffset, host->base = ioremap(np->addrs[0].address + aoffset,
np->addrs[0].size); np->addrs[0].size);
host->func = keywest_low_i2c_func; host->func = keywest_low_i2c_func;
} }