projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of ../master
[oweals/u-boot.git]
/
cpu
/
mpc512x
/
iopin.c
diff --git
a/cpu/mpc512x/iopin.c
b/cpu/mpc512x/iopin.c
index 78f4fa1e8cc6190d9dd3c5bcec10036c943c7e92..be209476232603c33968a77621774a82fb0e8a1d 100644
(file)
--- a/
cpu/mpc512x/iopin.c
+++ b/
cpu/mpc512x/iopin.c
@@
-23,15
+23,15
@@
#include <common.h>
#include <linux/types.h>
#include <common.h>
#include <linux/types.h>
-#include <
mpc512x
.h>
+#include <
asm/io
.h>
void iopin_initialize(iopin_t *ioregs_init, int len)
{
short i, j, p;
void iopin_initialize(iopin_t *ioregs_init, int len)
{
short i, j, p;
- u
_long
*reg;
+ u
32
*reg;
immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
- reg = (u
_long *)&(im->io_ctrl.regs[0]
);
+ reg = (u
32 *)&(im->io_ctrl
);
if (sizeof(ioregs_init) == 0)
return;
if (sizeof(ioregs_init) == 0)
return;
@@
-40,9
+40,9
@@
void iopin_initialize(iopin_t *ioregs_init, int len)
for (p = 0, j = ioregs_init[i].p_offset / sizeof(u_long);
p < ioregs_init[i].nr_pins; p++, j++) {
if (ioregs_init[i].bit_or)
for (p = 0, j = ioregs_init[i].p_offset / sizeof(u_long);
p < ioregs_init[i].nr_pins; p++, j++) {
if (ioregs_init[i].bit_or)
-
reg[j] |= ioregs_init[i].val
;
+
setbits_be32(reg + j, ioregs_init[i].val)
;
else
else
-
reg[j] = ioregs_init[i].val
;
+
out_be32 (reg + j, ioregs_init[i].val)
;
}
}
return;
}
}
return;