Skip to content
Snippets Groups Projects
Commit 7d5ff54f authored by Heiko Schocher's avatar Heiko Schocher Committed by Wolfgang Denk
Browse files

i2c: Codingstyle cleanup for i2c evb64260 board driver


There are some magic constants in this drivers, which I cannot
fixup ... Eran, can you help here?

Signed-off-by: default avatarHeiko Schocher <hs@denx.de>
Cc: Eran Man <eran@nbase.co.il>
parent 3dab3e0e
No related branches found
No related tags found
No related merge requests found
...@@ -20,25 +20,25 @@ static void ...@@ -20,25 +20,25 @@ static void
i2c_init(int speed, int slaveaddr) i2c_init(int speed, int slaveaddr)
{ {
unsigned int n, m, freq, margin, power; unsigned int n, m, freq, margin, power;
unsigned int actualN = 0, actualM = 0; unsigned int actualn = 0, actualm = 0;
unsigned int control, status; unsigned int control, status;
unsigned int minMargin = 0xffffffff; unsigned int minmargin = 0xffffffff;
unsigned int tclk = 125000000; unsigned int tclk = 125000000;
DP(puts("i2c_init\n")); DP(puts("i2c_init\n"));
for (n = 0 ; n < 8 ; n++) { for (n = 0 ; n < 8 ; n++) {
for (m = 0 ; m < 16 ; m++) { for (m = 0 ; m < 16 ; m++) {
power = 2<<n; /* power = 2^(n+1) */ power = 2 << n; /* power = 2^(n+1) */
freq = tclk/(10*(m+1)*power); freq = tclk / (10 * (m + 1) * power);
if (speed > freq) if (speed > freq)
margin = speed - freq; margin = speed - freq;
else else
margin = freq - speed; margin = freq - speed;
if (margin < minMargin) { if (margin < minmargin) {
minMargin = margin; minmargin = margin;
actualN = n; actualn = n;
actualM = m; actualm = m;
} }
} }
} }
...@@ -55,7 +55,7 @@ i2c_init(int speed, int slaveaddr) ...@@ -55,7 +55,7 @@ i2c_init(int speed, int slaveaddr)
DP(puts("set baudrate\n")); DP(puts("set baudrate\n"));
GT_REG_WRITE(I2C_STATUS_BAUDE_RATE, (actualM << 3) | actualN); GT_REG_WRITE(I2C_STATUS_BAUDE_RATE, (actualm << 3) | actualn);
GT_REG_WRITE(I2C_CONTROL, (0x1 << 2) | (0x1 << 6)); GT_REG_WRITE(I2C_CONTROL, (0x1 << 2) | (0x1 << 6));
udelay(I2C_DELAY * 10); udelay(I2C_DELAY * 10);
...@@ -257,11 +257,11 @@ i2c_read(uchar dev_addr, unsigned int offset, int len, uchar *data, ...@@ -257,11 +257,11 @@ i2c_read(uchar dev_addr, unsigned int offset, int len, uchar *data,
int ten_bit) int ten_bit)
{ {
uchar status = 0; uchar status = 0;
unsigned int i2cFreq = 400000; unsigned int i2cfreq = 400000;
DP(puts("i2c_read\n")); DP(puts("i2c_read\n"));
i2c_init(i2cFreq, 0); i2c_init(i2cfreq, 0);
status = i2c_start(); status = i2c_start();
...@@ -280,7 +280,7 @@ i2c_read(uchar dev_addr, unsigned int offset, int len, uchar *data, ...@@ -280,7 +280,7 @@ i2c_read(uchar dev_addr, unsigned int offset, int len, uchar *data,
return status; return status;
} }
i2c_init(i2cFreq, 0); i2c_init(i2cfreq, 0);
status = i2c_start(); status = i2c_start();
if (status) { if (status) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment