mirror of
https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git
synced 2025-09-11 05:02:26 -04:00
mpc8260/i2c.c: CodingStyle cleanup
Make (mostly) checkpatch clean (don't convert to use I/O accessors yet, so there will be "Use of volatile is usually wrong" warnings left. Also accept some other harmless checkpatch warnings. Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Heiko Schocher <hs@denx.de>
This commit is contained in:
Wolfgang Denk
parent
50f87ca556
commit
86ba925534
@ -51,15 +51,13 @@ static unsigned int i2c_bus_num __attribute__ ((section (".data"))) = 0;
|
||||
*/
|
||||
#define TOUT_LOOP 5
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
/*
|
||||
* Set default values
|
||||
*/
|
||||
#ifndef CONFIG_SYS_I2C_SPEED
|
||||
#define CONFIG_SYS_I2C_SPEED 50000
|
||||
#endif
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
typedef void (*i2c_ecb_t) (int, int, void *); /* error callback function */
|
||||
|
||||
@ -84,7 +82,7 @@ typedef struct i2c_state {
|
||||
#define I2CERR_NO_BUFFERS 1 /* no more BDs or buffer space */
|
||||
#define I2CERR_MSG_TOO_LONG 2 /* tried to send/receive to much data */
|
||||
#define I2CERR_TIMEOUT 3 /* timeout in i2c_doio() */
|
||||
#define I2CERR_QUEUE_EMPTY 4 /* i2c_doio called without send/receive */
|
||||
#define I2CERR_QUEUE_EMPTY 4 /* i2c_doio called without send/rcv */
|
||||
#define I2CERR_IO_ERROR 5 /* had an error during comms */
|
||||
|
||||
/* error callback flags */
|
||||
@ -111,12 +109,12 @@ typedef struct i2c_state {
|
||||
#define NUM_TX_BDS 4
|
||||
#define MAX_TX_SPACE 256
|
||||
|
||||
typedef struct I2C_BD
|
||||
{
|
||||
typedef struct I2C_BD {
|
||||
unsigned short status;
|
||||
unsigned short length;
|
||||
unsigned char *addr;
|
||||
} I2C_BD;
|
||||
|
||||
#define BD_I2C_TX_START 0x0400 /* special status for i2c: Start condition */
|
||||
|
||||
#define BD_I2C_TX_CL 0x0001 /* collision error */
|
||||
@ -184,14 +182,12 @@ static int i2c_setrate(int hz, int speed)
|
||||
totspeed,
|
||||
filter = 0; /* Use this fixed value */
|
||||
|
||||
for (modval = 0; modval < 4; modval++)
|
||||
{
|
||||
if (i2c_roundrate (hz, speed, filter, modval, &brgval, &totspeed) == 0)
|
||||
{
|
||||
for (modval = 0; modval < 4; modval++) {
|
||||
if (i2c_roundrate(hz, speed, filter, modval, &brgval, &totspeed)
|
||||
== 0) {
|
||||
int diff = speed - totspeed;
|
||||
|
||||
if ((diff >= 0) && (diff < bestspeed_diff))
|
||||
{
|
||||
if ((diff >= 0) && (diff < bestspeed_diff)) {
|
||||
bestspeed_diff = diff;
|
||||
bestspeed_modval = modval;
|
||||
bestspeed_brgval = brgval;
|
||||
@ -202,14 +198,15 @@ static int i2c_setrate(int hz, int speed)
|
||||
|
||||
PRINTD(("[I2C] Best is:\n"));
|
||||
PRINTD(("[I2C] CPU=%dhz RATE=%d F=%d I2MOD=%08x I2BRG=%08x DIFF=%dhz\n",
|
||||
hz, speed,
|
||||
bestspeed_filter, bestspeed_modval, bestspeed_brgval,
|
||||
hz, speed, bestspeed_filter, bestspeed_modval, bestspeed_brgval,
|
||||
bestspeed_diff));
|
||||
|
||||
i2c->i2c_i2mod |= ((bestspeed_modval & 3) << 1) | (bestspeed_filter << 3);
|
||||
i2c->i2c_i2mod |= ((bestspeed_modval & 3) << 1) |
|
||||
(bestspeed_filter << 3);
|
||||
i2c->i2c_i2brg = bestspeed_brgval & 0xff;
|
||||
|
||||
PRINTD(("[I2C] i2mod=%08x i2brg=%08x\n", i2c->i2c_i2mod, i2c->i2c_i2brg));
|
||||
PRINTD(("[I2C] i2mod=%08x i2brg=%08x\n", i2c->i2c_i2mod,
|
||||
i2c->i2c_i2brg));
|
||||
|
||||
return 1;
|
||||
}
|
||||
@ -225,9 +222,11 @@ void i2c_init(int speed, int slaveadd)
|
||||
uint dpaddr;
|
||||
|
||||
#ifdef CONFIG_SYS_I2C_INIT_BOARD
|
||||
/* call board specific i2c bus reset routine before accessing the */
|
||||
/* environment, which might be in a chip on that bus. For details */
|
||||
/* about this problem see doc/I2C_Edge_Conditions. */
|
||||
/*
|
||||
* call board specific i2c bus reset routine before accessing the
|
||||
* environment, which might be in a chip on that bus. For details
|
||||
* about this problem see doc/I2C_Edge_Conditions.
|
||||
*/
|
||||
i2c_init_board();
|
||||
#endif
|
||||
|
||||
@ -235,9 +234,11 @@ void i2c_init(int speed, int slaveadd)
|
||||
if (dpaddr == 0) {
|
||||
/* need to allocate dual port ram */
|
||||
dpaddr = m8260_cpm_dpalloc(64 +
|
||||
(NUM_RX_BDS * sizeof(I2C_BD)) + (NUM_TX_BDS * sizeof(I2C_BD)) +
|
||||
(NUM_RX_BDS * sizeof(I2C_BD)) +
|
||||
(NUM_TX_BDS * sizeof(I2C_BD)) +
|
||||
MAX_TX_SPACE, 64);
|
||||
*((unsigned short*)(&immap->im_dprambase[PROFF_I2C_BASE])) = dpaddr;
|
||||
*((unsigned short *)(&immap->im_dprambase[PROFF_I2C_BASE])) =
|
||||
dpaddr;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -275,8 +276,10 @@ void i2c_init(int speed, int slaveadd)
|
||||
/* Initialize Tx/Rx parameters */
|
||||
iip->iic_rbase = rbase;
|
||||
iip->iic_tbase = tbase;
|
||||
rxbd = (I2C_BD *)((unsigned char *)&immap->im_dprambase[iip->iic_rbase]);
|
||||
txbd = (I2C_BD *)((unsigned char *)&immap->im_dprambase[iip->iic_tbase]);
|
||||
rxbd = (I2C_BD *)((unsigned char *) &immap->
|
||||
im_dprambase[iip->iic_rbase]);
|
||||
txbd = (I2C_BD *)((unsigned char *) &immap->
|
||||
im_dprambase[iip->iic_tbase]);
|
||||
|
||||
PRINTD(("[I2C] rbase = %04x\n", iip->iic_rbase));
|
||||
PRINTD(("[I2C] tbase = %04x\n", iip->iic_tbase));
|
||||
@ -292,8 +295,7 @@ void i2c_init(int speed, int slaveadd)
|
||||
|
||||
cp->cp_cpcr = mk_cr_cmd(CPM_CR_I2C_PAGE,
|
||||
CPM_CR_I2C_SBLOCK,
|
||||
0x00,
|
||||
CPM_CR_INIT_TRX) | CPM_CR_FLG;
|
||||
0x00, CPM_CR_INIT_TRX) | CPM_CR_FLG;
|
||||
do {
|
||||
__asm__ __volatile__("eieio");
|
||||
} while (cp->cp_cpcr & CPM_CR_FLG);
|
||||
@ -335,9 +337,7 @@ static
|
||||
int i2c_send(i2c_state_t *state,
|
||||
unsigned char address,
|
||||
unsigned char secondary_address,
|
||||
unsigned int flags,
|
||||
unsigned short size,
|
||||
unsigned char *dataout)
|
||||
unsigned int flags, unsigned short size, unsigned char *dataout)
|
||||
{
|
||||
volatile I2C_BD *txbd;
|
||||
int i, j;
|
||||
@ -358,25 +358,22 @@ int i2c_send(i2c_state_t *state,
|
||||
|
||||
PRINTD(("[I2C] txbd = %08x\n", (int) txbd));
|
||||
|
||||
if (flags & I2CF_START_COND)
|
||||
{
|
||||
if (flags & I2CF_START_COND) {
|
||||
PRINTD(("[I2C] Formatting addresses...\n"));
|
||||
if (flags & I2CF_ENABLE_SECONDARY)
|
||||
{
|
||||
txbd->length = size + 2; /* Length of message plus dest addresses */
|
||||
if (flags & I2CF_ENABLE_SECONDARY) {
|
||||
/* Length of message plus dest addresses */
|
||||
txbd->length = size + 2;
|
||||
txbd->addr[0] = address << 1;
|
||||
txbd->addr[1] = secondary_address;
|
||||
i = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
txbd->length = size + 1; /* Length of message plus dest address */
|
||||
txbd->addr[0] = address << 1; /* Write destination address to BD */
|
||||
} else {
|
||||
/* Length of message plus dest address */
|
||||
txbd->length = size + 1;
|
||||
/* Write destination address to BD */
|
||||
txbd->addr[0] = address << 1;
|
||||
i = 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
txbd->length = size; /* Length of message */
|
||||
i = 0;
|
||||
}
|
||||
@ -394,10 +391,7 @@ int i2c_send(i2c_state_t *state,
|
||||
txbd->addr[i] = dataout[j];
|
||||
|
||||
PRINTD(("[I2C] txbd: length=0x%04x status=0x%04x addr[0]=0x%02x addr[1]=0x%02x\n",
|
||||
txbd->length,
|
||||
txbd->status,
|
||||
txbd->addr[0],
|
||||
txbd->addr[1]));
|
||||
txbd->length, txbd->status, txbd->addr[0], txbd->addr[1]));
|
||||
|
||||
/* advance state */
|
||||
state->tx_buf += txbd->length;
|
||||
@ -413,12 +407,12 @@ int i2c_receive(i2c_state_t *state,
|
||||
unsigned char address,
|
||||
unsigned char secondary_address,
|
||||
unsigned int flags,
|
||||
unsigned short size_to_expect,
|
||||
unsigned char *datain)
|
||||
unsigned short size_to_expect, unsigned char *datain)
|
||||
{
|
||||
volatile I2C_BD *rxbd, *txbd;
|
||||
|
||||
PRINTD(("[I2C] i2c_receive %02d %02d %02d\n", address, secondary_address, flags));
|
||||
PRINTD(("[I2C] i2c_receive %02d %02d %02d\n", address,
|
||||
secondary_address, flags));
|
||||
|
||||
/* Expected to receive too much */
|
||||
if (size_to_expect > I2C_RXTX_LEN)
|
||||
@ -438,15 +432,12 @@ int i2c_receive(i2c_state_t *state,
|
||||
txbd->addr = state->tx_buf;
|
||||
|
||||
/* set up TXBD for destination address */
|
||||
if (flags & I2CF_ENABLE_SECONDARY)
|
||||
{
|
||||
if (flags & I2CF_ENABLE_SECONDARY) {
|
||||
txbd->length = 2;
|
||||
txbd->addr[0] = address << 1; /* Write data */
|
||||
txbd->addr[1] = secondary_address; /* Internal address */
|
||||
txbd->status = BD_SC_READY;
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
txbd->length = 1 + size_to_expect;
|
||||
txbd->addr[0] = (address << 1) | 0x01;
|
||||
txbd->status = BD_SC_READY;
|
||||
@ -459,22 +450,15 @@ int i2c_receive(i2c_state_t *state,
|
||||
rxbd->addr = datain;
|
||||
|
||||
txbd->status |= BD_I2C_TX_START;
|
||||
if (flags & I2CF_STOP_COND)
|
||||
{
|
||||
if (flags & I2CF_STOP_COND) {
|
||||
txbd->status |= BD_SC_LAST | BD_SC_WRAP;
|
||||
rxbd->status |= BD_SC_WRAP;
|
||||
}
|
||||
|
||||
PRINTD(("[I2C] txbd: length=0x%04x status=0x%04x addr[0]=0x%02x addr[1]=0x%02x\n",
|
||||
txbd->length,
|
||||
txbd->status,
|
||||
txbd->addr[0],
|
||||
txbd->addr[1]));
|
||||
txbd->length, txbd->status, txbd->addr[0], txbd->addr[1]));
|
||||
PRINTD(("[I2C] rxbd: length=0x%04x status=0x%04x addr[0]=0x%02x addr[1]=0x%02x\n",
|
||||
rxbd->length,
|
||||
rxbd->status,
|
||||
rxbd->addr[0],
|
||||
rxbd->addr[1]));
|
||||
rxbd->length, rxbd->status, rxbd->addr[0], rxbd->addr[1]));
|
||||
|
||||
/* advance state */
|
||||
state->tx_buf += txbd->length;
|
||||
@ -519,7 +503,9 @@ int i2c_doio(i2c_state_t *state)
|
||||
|
||||
/* Loop until transmit & receive completed */
|
||||
|
||||
if ((n = state->tx_idx) > 0) {
|
||||
n = state->tx_idx;
|
||||
|
||||
if (n > 0) {
|
||||
|
||||
txbd = ((I2C_BD *) state->txbd) - n;
|
||||
for (i = 0; i < n; i++) {
|
||||
@ -529,18 +515,21 @@ int i2c_doio(i2c_state_t *state)
|
||||
|
||||
txbd--; /* wait until last in list is done */
|
||||
|
||||
PRINTD(("[I2C] Transmitting...(txbd=0x%08lx)\n", (ulong)txbd));
|
||||
PRINTD(("[I2C] Transmitting...(txbd=0x%08lx)\n",
|
||||
(ulong) txbd));
|
||||
|
||||
udelay(START_DELAY_US); /* give it time to start */
|
||||
while ((txbd->status & BD_SC_READY) && (++txcnt < txtimeo)) {
|
||||
udelay(DELAY_US);
|
||||
if (ctrlc())
|
||||
return (-1);
|
||||
return -1;
|
||||
__asm__ __volatile__("eieio");
|
||||
}
|
||||
}
|
||||
|
||||
if (txcnt < txtimeo && (n = state->rx_idx) > 0) {
|
||||
n = state->rx_idx;
|
||||
|
||||
if (txcnt < txtimeo && n > 0) {
|
||||
|
||||
rxbd = ((I2C_BD *) state->rxbd) - n;
|
||||
for (i = 0; i < n; i++) {
|
||||
@ -556,7 +545,7 @@ int i2c_doio(i2c_state_t *state)
|
||||
while ((rxbd->status & BD_SC_EMPTY) && (++rxcnt < rxtimeo)) {
|
||||
udelay(DELAY_US);
|
||||
if (ctrlc())
|
||||
return (-1);
|
||||
return -1;
|
||||
__asm__ __volatile__("eieio");
|
||||
}
|
||||
}
|
||||
@ -564,33 +553,39 @@ int i2c_doio(i2c_state_t *state)
|
||||
/* Turn off I2C */
|
||||
i2c->i2c_i2mod &= ~0x01;
|
||||
|
||||
if ((n = state->tx_idx) > 0) {
|
||||
n = state->tx_idx;
|
||||
|
||||
if (n > 0) {
|
||||
for (i = 0; i < n; i++) {
|
||||
txbd = ((I2C_BD *) state->txbd) - (n - i);
|
||||
if ((b = txbd->status & BD_I2C_TX_ERR) != 0) {
|
||||
b = txbd->status & BD_I2C_TX_ERR;
|
||||
if (b != 0) {
|
||||
if (state->err_cb != NULL)
|
||||
(*state->err_cb)(I2CECB_TX_ERR|b, i,
|
||||
state->cb_data);
|
||||
(*state->err_cb) (I2CECB_TX_ERR | b,
|
||||
i, state->cb_data);
|
||||
if (rc == 0)
|
||||
rc = I2CERR_IO_ERROR;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((n = state->rx_idx) > 0) {
|
||||
n = state->rx_idx;
|
||||
|
||||
if (n > 0) {
|
||||
for (i = 0; i < n; i++) {
|
||||
rxbd = ((I2C_BD *) state->rxbd) - (n - i);
|
||||
if ((b = rxbd->status & BD_I2C_RX_ERR) != 0) {
|
||||
b = rxbd->status & BD_I2C_RX_ERR;
|
||||
if (b != 0) {
|
||||
if (state->err_cb != NULL)
|
||||
(*state->err_cb)(I2CECB_RX_ERR|b, i,
|
||||
state->cb_data);
|
||||
(*state->err_cb) (I2CECB_RX_ERR | b,
|
||||
i, state->cb_data);
|
||||
if (rc == 0)
|
||||
rc = I2CERR_IO_ERROR;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ((txtimeo > 0 && txcnt >= txtimeo) || \
|
||||
if ((txtimeo > 0 && txcnt >= txtimeo) ||
|
||||
(rxtimeo > 0 && rxcnt >= rxtimeo)) {
|
||||
if (state->err_cb != NULL)
|
||||
(*state->err_cb) (I2CECB_TIMEOUT, -1, state->cb_data);
|
||||
@ -598,11 +593,10 @@ int i2c_doio(i2c_state_t *state)
|
||||
rc = I2CERR_TIMEOUT;
|
||||
}
|
||||
|
||||
return (rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void
|
||||
i2c_probe_callback(int flags, int xnum, void *data)
|
||||
static void i2c_probe_callback(int flags, int xnum, void *data)
|
||||
{
|
||||
/*
|
||||
* the only acceptable errors are a transmit NAK or a receive
|
||||
@ -616,8 +610,7 @@ i2c_probe_callback(int flags, int xnum, void *data)
|
||||
*(int *) data |= 2;
|
||||
}
|
||||
|
||||
int
|
||||
i2c_probe(uchar chip)
|
||||
int i2c_probe(uchar chip)
|
||||
{
|
||||
i2c_state_t state;
|
||||
int rc, err_flag;
|
||||
@ -629,31 +622,31 @@ i2c_probe(uchar chip)
|
||||
state.cb_data = (void *) &err_flag;
|
||||
err_flag = 0;
|
||||
|
||||
rc = i2c_receive(&state, chip, 0, I2CF_START_COND|I2CF_STOP_COND, 1, buf);
|
||||
rc = i2c_receive(&state, chip, 0, I2CF_START_COND | I2CF_STOP_COND, 1,
|
||||
buf);
|
||||
|
||||
if (rc != 0)
|
||||
return (rc); /* probe failed */
|
||||
return rc; /* probe failed */
|
||||
|
||||
rc = i2c_doio(&state);
|
||||
|
||||
if (rc == 0)
|
||||
return (0); /* device exists - read succeeded */
|
||||
return 0; /* device exists - read succeeded */
|
||||
|
||||
if (rc == I2CERR_TIMEOUT)
|
||||
return (-1); /* device does not exist - timeout */
|
||||
return -1; /* device does not exist - timeout */
|
||||
|
||||
if (rc != I2CERR_IO_ERROR || err_flag == 0)
|
||||
return (rc); /* probe failed */
|
||||
return rc; /* probe failed */
|
||||
|
||||
if (err_flag & 1)
|
||||
return (-1); /* device does not exist - had transmit NAK */
|
||||
return -1; /* device does not exist - had transmit NAK */
|
||||
|
||||
return (0); /* device exists - had receive overrun */
|
||||
return 0; /* device exists - had receive overrun */
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
|
||||
int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
|
||||
{
|
||||
i2c_state_t state;
|
||||
uchar xaddr[4];
|
||||
@ -681,7 +674,8 @@ i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
|
||||
|
||||
i2c_newio(&state);
|
||||
|
||||
rc = i2c_send(&state, chip, 0, I2CF_START_COND, alen, &xaddr[4-alen]);
|
||||
rc = i2c_send(&state, chip, 0, I2CF_START_COND, alen,
|
||||
&xaddr[4 - alen]);
|
||||
if (rc != 0) {
|
||||
printf("i2c_read: i2c_send failed (%d)\n", rc);
|
||||
return 1;
|
||||
@ -701,8 +695,7 @@ i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
|
||||
int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
|
||||
{
|
||||
i2c_state_t state;
|
||||
uchar xaddr[4];
|
||||
@ -730,7 +723,8 @@ i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
|
||||
|
||||
i2c_newio(&state);
|
||||
|
||||
rc = i2c_send(&state, chip, 0, I2CF_START_COND, alen, &xaddr[4-alen]);
|
||||
rc = i2c_send(&state, chip, 0, I2CF_START_COND, alen,
|
||||
&xaddr[4 - alen]);
|
||||
if (rc != 0) {
|
||||
printf("i2c_write: first i2c_send failed (%d)\n", rc);
|
||||
return 1;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user