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 git://git.denx.de/u-boot into x1
[oweals/u-boot.git]
/
cpu
/
mpc512x
/
i2c.c
diff --git
a/cpu/mpc512x/i2c.c
b/cpu/mpc512x/i2c.c
index 00e28d6404dfd439fa28f2147e42cdd90855a4b3..77a6f0dc48fc8bd2af3d40de284e763c7b6ad174 100644
(file)
--- a/
cpu/mpc512x/i2c.c
+++ b/
cpu/mpc512x/i2c.c
@@
-32,7
+32,7
@@
DECLARE_GLOBAL_DATA_PTR;
#include <mpc512x.h>
#include <i2c.h>
#include <mpc512x.h>
#include <i2c.h>
-#define immr ((immap_t *)C
FG
_IMMR)
+#define immr ((immap_t *)C
ONFIG_SYS
_IMMR)
/* by default set I2C bus 0 active */
static unsigned int bus_num = 0;
/* by default set I2C bus 0 active */
static unsigned int bus_num = 0;
@@
-236,7
+236,7
@@
static int mpc_get_fdr (int speed)
if (fdr == -1) {
ulong best_speed = 0;
ulong divider;
if (fdr == -1) {
ulong best_speed = 0;
ulong divider;
- ulong ip
b
, scl;
+ ulong ip
s
, scl;
ulong bestmatch = 0xffffffffUL;
int best_i = 0, best_j = 0, i, j;
int SCL_Tap[] = { 9, 10, 12, 15, 5, 6, 7, 8};
ulong bestmatch = 0xffffffffUL;
int best_i = 0, best_j = 0, i, j;
int SCL_Tap[] = { 9, 10, 12, 15, 5, 6, 7, 8};
@@
-251,18
+251,18
@@
static int mpc_get_fdr (int speed)
{126, 128}
};
{126, 128}
};
- ip
b = gd->ipb
_clk;
+ ip
s = gd->ips
_clk;
for (i = 7; i >= 0; i--) {
for (j = 7; j >= 0; j--) {
scl = 2 * (scltap[j].scl2tap +
(SCL_Tap[i] - 1) * scltap[j].tap2tap
+ 2);
for (i = 7; i >= 0; i--) {
for (j = 7; j >= 0; j--) {
scl = 2 * (scltap[j].scl2tap +
(SCL_Tap[i] - 1) * scltap[j].tap2tap
+ 2);
- if (ip
b
<= speed*scl) {
- if ((speed*scl - ip
b
) < bestmatch) {
- bestmatch = speed*scl - ip
b
;
+ if (ip
s
<= speed*scl) {
+ if ((speed*scl - ip
s
) < bestmatch) {
+ bestmatch = speed*scl - ip
s
;
best_i = i;
best_j = j;
best_i = i;
best_j = j;
- best_speed = ip
b
/scl;
+ best_speed = ip
s
/scl;
}
}
}
}
}
}
@@
-422,7
+422,7
@@
unsigned int i2c_get_bus_speed (void)
int i2c_set_bus_speed (unsigned int speed)
{
int i2c_set_bus_speed (unsigned int speed)
{
- if (speed != C
FG
_I2C_SPEED)
+ if (speed != C
ONFIG_SYS
_I2C_SPEED)
return -1;
return 0;
return -1;
return 0;