Skip to content

L
linux
Commit e7aba607 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

[PATCH] I2C: coding style updates for i2c-iop3xx driver

parent 7323fe38
Show whitespace changes
Inline Side-by-side
Showing with 186 additions and 217 deletions
drivers/i2c/i2c-iop3xx.c
View file @ e7aba607
...@@ -61,13 +61,13 @@ static inline unsigned char iic_cook_addr(struct i2c_msg *msg) ...@@ -61,13 +61,13 @@ static inline unsigned char iic_cook_addr(struct i2c_msg *msg)
{ {
unsigned char addr; unsigned char addr;
addr = ( msg->addr << 1 ); addr = (msg->addr << 1);
if (msg->flags & I2C_M_RD ) if (msg->flags & I2C_M_RD)
addr |= 1; addr |= 1;
/* PGM: what is M_REV_DIR_ADDR - do we need it ?? */ /* PGM: what is M_REV_DIR_ADDR - do we need it ?? */
if (msg->flags & I2C_M_REV_DIR_ADDR ) if (msg->flags & I2C_M_REV_DIR_ADDR)
addr ^= 1; addr ^= 1;
return addr; return addr;
...@@ -76,100 +76,93 @@ static inline unsigned char iic_cook_addr(struct i2c_msg *msg) ...@@ -76,100 +76,93 @@ static inline unsigned char iic_cook_addr(struct i2c_msg *msg)
static inline void iop3xx_adap_reset(struct i2c_algo_iop3xx_data *iop3xx_adap) static inline void iop3xx_adap_reset(struct i2c_algo_iop3xx_data *iop3xx_adap)
{ {
// Follows devman 9.3 /* Follows devman 9.3 */
*iop3xx_adap->biu->CR = IOP321_ICR_UNIT_RESET; *iop3xx_adap->biu->CR = IOP321_ICR_UNIT_RESET;
*iop3xx_adap->biu->SR = IOP321_ISR_CLEARBITS; *iop3xx_adap->biu->SR = IOP321_ISR_CLEARBITS;
*iop3xx_adap->biu->CR = 0; *iop3xx_adap->biu->CR = 0;
} }
static inline void iop3xx_adap_set_slave_addr( static inline void iop3xx_adap_set_slave_addr(struct i2c_algo_iop3xx_data *iop3xx_adap)
struct i2c_algo_iop3xx_data *iop3xx_adap )
{ {
*iop3xx_adap->biu->SAR = MYSAR; *iop3xx_adap->biu->SAR = MYSAR;
} }
static inline void iop3xx_adap_enable( static inline void iop3xx_adap_enable(struct i2c_algo_iop3xx_data *iop3xx_adap)
struct i2c_algo_iop3xx_data *iop3xx_adap )
{ {
u32 cr = IOP321_ICR_GCD|IOP321_ICR_SCLEN|IOP321_ICR_UE; u32 cr = IOP321_ICR_GCD|IOP321_ICR_SCLEN|IOP321_ICR_UE;
/* NB SR bits not same position as CR IE bits :-( */ /* NB SR bits not same position as CR IE bits :-( */
iop3xx_adap->biu->SR_enabled = iop3xx_adap->biu->SR_enabled =
IOP321_ISR_ALD|IOP321_ISR_BERRD| IOP321_ISR_ALD | IOP321_ISR_BERRD |
IOP321_ISR_RXFULL|IOP321_ISR_TXEMPTY; IOP321_ISR_RXFULL | IOP321_ISR_TXEMPTY;
cr |= IOP321_ICR_ALDIE|IOP321_ICR_BERRIE| cr |= IOP321_ICR_ALDIE | IOP321_ICR_BERRIE |
IOP321_ICR_RXFULLIE|IOP321_ICR_TXEMPTYIE; IOP321_ICR_RXFULLIE | IOP321_ICR_TXEMPTYIE;
*iop3xx_adap->biu->CR = cr; *iop3xx_adap->biu->CR = cr;
} }
static void iop3xx_adap_transaction_cleanup( static void iop3xx_adap_transaction_cleanup(struct i2c_algo_iop3xx_data *iop3xx_adap)
struct i2c_algo_iop3xx_data *iop3xx_adap )
{ {
unsigned cr = *iop3xx_adap->biu->CR; unsigned cr = *iop3xx_adap->biu->CR;
cr &= ~(IOP321_ICR_MSTART | IOP321_ICR_TBYTE | cr &= ~(IOP321_ICR_MSTART | IOP321_ICR_TBYTE |
IOP321_ICR_MSTOP | IOP321_ICR_SCLEN ); IOP321_ICR_MSTOP | IOP321_ICR_SCLEN);
*iop3xx_adap->biu->CR = cr; *iop3xx_adap->biu->CR = cr;
} }
static void iop3xx_adap_final_cleanup( static void iop3xx_adap_final_cleanup(struct i2c_algo_iop3xx_data *iop3xx_adap)
struct i2c_algo_iop3xx_data *iop3xx_adap )
{ {
unsigned cr = *iop3xx_adap->biu->CR; unsigned cr = *iop3xx_adap->biu->CR;
cr &= ~(IOP321_ICR_ALDIE|IOP321_ICR_BERRIE| cr &= ~(IOP321_ICR_ALDIE | IOP321_ICR_BERRIE |
IOP321_ICR_RXFULLIE|IOP321_ICR_TXEMPTYIE); IOP321_ICR_RXFULLIE | IOP321_ICR_TXEMPTYIE);
iop3xx_adap->biu->SR_enabled = 0; iop3xx_adap->biu->SR_enabled = 0;
*iop3xx_adap->biu->CR = cr; *iop3xx_adap->biu->CR = cr;
} }
static void iop3xx_i2c_handler( int this_irq,
void *dev_id,
struct pt_regs *regs)
/* /*
* NB: the handler has to clear the source of the interrupt! * NB: the handler has to clear the source of the interrupt!
* Then it passes the SR flags of interest to BH via adap data * Then it passes the SR flags of interest to BH via adap data
*/ */
static void iop3xx_i2c_handler(int this_irq,
void *dev_id,
struct pt_regs *regs)
{ {
struct i2c_algo_iop3xx_data *iop3xx_adap = dev_id; struct i2c_algo_iop3xx_data *iop3xx_adap = dev_id;
u32 sr = *iop3xx_adap->biu->SR; u32 sr = *iop3xx_adap->biu->SR;
if ( (sr &= iop3xx_adap->biu->SR_enabled) ){ if ((sr &= iop3xx_adap->biu->SR_enabled)) {
*iop3xx_adap->biu->SR = sr; *iop3xx_adap->biu->SR = sr;
iop3xx_adap->biu->SR_received |= sr; iop3xx_adap->biu->SR_received |= sr;
wake_up_interruptible(&iop3xx_adap->waitq); wake_up_interruptible(&iop3xx_adap->waitq);
} }
} }
/* check all error conditions, clear them , report most important */
static int iop3xx_adap_error( u32 sr ) static int iop3xx_adap_error(u32 sr)
// check all error conditions, clear them , report most important
{ {
int rc = 0; int rc = 0;
if ( (sr&IOP321_ISR_BERRD) ) { if ((sr&IOP321_ISR_BERRD)) {
if ( !rc ) rc = -I2C_ERR_BERR; if ( !rc ) rc = -I2C_ERR_BERR;
} }
if ( (sr&IOP321_ISR_ALD) ){ if ((sr&IOP321_ISR_ALD)) {
if ( !rc ) rc = -I2C_ERR_ALD; if ( !rc ) rc = -I2C_ERR_ALD;
} }
return rc; return rc;
} }
static inline u32 get_srstat( struct i2c_algo_iop3xx_data *iop3xx_adap ) static inline u32 get_srstat(struct i2c_algo_iop3xx_data *iop3xx_adap)
{ {
unsigned long flags; unsigned long flags;
u32 sr; u32 sr;
spin_lock_irqsave( &iop3xx_adap->lock, flags ); spin_lock_irqsave(&iop3xx_adap->lock, flags);
sr = iop3xx_adap->biu->SR_received; sr = iop3xx_adap->biu->SR_received;
iop3xx_adap->biu->SR_received = 0; iop3xx_adap->biu->SR_received = 0;
spin_unlock_irqrestore( &iop3xx_adap->lock, flags ); spin_unlock_irqrestore(&iop3xx_adap->lock, flags);
return sr; return sr;
} }
...@@ -178,12 +171,12 @@ static inline u32 get_srstat( struct i2c_algo_iop3xx_data *iop3xx_adap ) ...@@ -178,12 +171,12 @@ static inline u32 get_srstat( struct i2c_algo_iop3xx_data *iop3xx_adap )
* sleep until interrupted, then recover and analyse the SR * sleep until interrupted, then recover and analyse the SR
* saved by handler * saved by handler
*/ */
typedef int (* CompareFunc)( unsigned test, unsigned mask ); typedef int (* compare_func)(unsigned test, unsigned mask);
/* returns 1 on correct comparison */ /* returns 1 on correct comparison */
static int iop3xx_adap_wait_event( struct i2c_algo_iop3xx_data *iop3xx_adap, static int iop3xx_adap_wait_event(struct i2c_algo_iop3xx_data *iop3xx_adap,
unsigned flags, unsigned* status, unsigned flags, unsigned* status,
CompareFunc compare ) compare_func compare)
{ {
unsigned sr = 0; unsigned sr = 0;
int interrupted; int interrupted;
...@@ -196,100 +189,94 @@ static int iop3xx_adap_wait_event( struct i2c_algo_iop3xx_data *iop3xx_adap, ...@@ -196,100 +189,94 @@ static int iop3xx_adap_wait_event( struct i2c_algo_iop3xx_data *iop3xx_adap,
(done = compare( sr = get_srstat(iop3xx_adap),flags )), (done = compare( sr = get_srstat(iop3xx_adap),flags )),
iop3xx_adap->timeout iop3xx_adap->timeout
); );
if ( (rc = iop3xx_adap_error( sr )) < 0 ){ if ((rc = iop3xx_adap_error(sr)) < 0) {
*status = sr; *status = sr;
return rc; return rc;
}else if ( !interrupted ){ }else if (!interrupted) {
*status = sr; *status = sr;
return rc = -ETIMEDOUT; return rc = -ETIMEDOUT;
} }
} while( !done ); } while(!done);
*status = sr; *status = sr;
return rc = 0; return rc = 0;
} }
/* /*
* Concrete CompareFuncs * Concrete compare_funcs
*/ */
static int all_bits_clear( unsigned test, unsigned mask ) { static int all_bits_clear(unsigned test, unsigned mask)
return (test&mask) == 0; {
return (test & mask) == 0;
} }
static int any_bits_set( unsigned test, unsigned mask ) { static int any_bits_set(unsigned test, unsigned mask)
return (test&mask) != 0; {
return (test & mask) != 0;
} }
static int iop3xx_adap_wait_tx_done(struct i2c_algo_iop3xx_data *iop3xx_adap, int *status)
static int iop3xx_adap_wait_tx_done(
struct i2c_algo_iop3xx_data *iop3xx_adap, int *status)
{ {
return iop3xx_adap_wait_event( return iop3xx_adap_wait_event(
iop3xx_adap, iop3xx_adap,
IOP321_ISR_TXEMPTY|IOP321_ISR_ALD|IOP321_ISR_BERRD, IOP321_ISR_TXEMPTY|IOP321_ISR_ALD|IOP321_ISR_BERRD,
status, any_bits_set ); status, any_bits_set);
} }
static int iop3xx_adap_wait_rx_done( static int iop3xx_adap_wait_rx_done(struct i2c_algo_iop3xx_data *iop3xx_adap, int *status)
struct i2c_algo_iop3xx_data *iop3xx_adap, int *status)
{ {
return iop3xx_adap_wait_event( return iop3xx_adap_wait_event(
iop3xx_adap, iop3xx_adap,
IOP321_ISR_RXFULL|IOP321_ISR_ALD|IOP321_ISR_BERRD, IOP321_ISR_RXFULL|IOP321_ISR_ALD|IOP321_ISR_BERRD,
status, any_bits_set ); status, any_bits_set);
} }
static int iop3xx_adap_wait_idle( static int iop3xx_adap_wait_idle(struct i2c_algo_iop3xx_data *iop3xx_adap, int *status)
struct i2c_algo_iop3xx_data *iop3xx_adap, int *status)
{ {
return iop3xx_adap_wait_event( return iop3xx_adap_wait_event(
iop3xx_adap, IOP321_ISR_UNITBUSY, status, all_bits_clear ); iop3xx_adap, IOP321_ISR_UNITBUSY, status, all_bits_clear);
} }
// /*
// Description: This performs the IOP3xx initialization sequence * Description: This performs the IOP3xx initialization sequence
// Valid for IOP321. Maybe valid for IOP310?. * Valid for IOP321. Maybe valid for IOP310?.
// */
static int iop3xx_adap_init (struct i2c_algo_iop3xx_data *iop3xx_adap) static int iop3xx_adap_init (struct i2c_algo_iop3xx_data *iop3xx_adap)
{ {
*IOP321_GPOD &= ~(iop3xx_adap->channel==0? *IOP321_GPOD &= ~(iop3xx_adap->channel==0 ?
IOP321_GPOD_I2C0: IOP321_GPOD_I2C0:
IOP321_GPOD_I2C1); IOP321_GPOD_I2C1);
iop3xx_adap_reset( iop3xx_adap ); iop3xx_adap_reset(iop3xx_adap);
iop3xx_adap_set_slave_addr( iop3xx_adap ); iop3xx_adap_set_slave_addr(iop3xx_adap);
iop3xx_adap_enable( iop3xx_adap ); iop3xx_adap_enable(iop3xx_adap);
return 0; return 0;
} }
static int iop3xx_adap_send_target_slave_addr( static int iop3xx_adap_send_target_slave_addr(struct i2c_algo_iop3xx_data *iop3xx_adap,
struct i2c_algo_iop3xx_data *iop3xx_adap, struct i2c_msg* msg ) struct i2c_msg* msg)
{ {
unsigned cr = *iop3xx_adap->biu->CR; unsigned cr = *iop3xx_adap->biu->CR;
int status; int status;
int rc; int rc;
*iop3xx_adap->biu->DBR = iic_cook_addr( msg ); *iop3xx_adap->biu->DBR = iic_cook_addr(msg);
cr &= ~(IOP321_ICR_MSTOP|IOP321_ICR_NACK); cr &= ~(IOP321_ICR_MSTOP | IOP321_ICR_NACK);
cr |= IOP321_ICR_MSTART | IOP321_ICR_TBYTE; cr |= IOP321_ICR_MSTART | IOP321_ICR_TBYTE;
*iop3xx_adap->biu->CR = cr; *iop3xx_adap->biu->CR = cr;
rc = iop3xx_adap_wait_tx_done( iop3xx_adap, &status ); rc = iop3xx_adap_wait_tx_done(iop3xx_adap, &status);
/* this assert fires every time, contrary to IOP manual /* this assert fires every time, contrary to IOP manual
PASSERT( (status&IOP321_ISR_UNITBUSY)!=0 ); PASSERT((status&IOP321_ISR_UNITBUSY)!=0);
*/ */
PASSERT( (status&IOP321_ISR_RXREAD)==0 ); PASSERT((status&IOP321_ISR_RXREAD)==0);
return rc; return rc;
} }
static int iop3xx_adap_write_byte( static int iop3xx_adap_write_byte(struct i2c_algo_iop3xx_data *iop3xx_adap, char byte, int stop)
struct i2c_algo_iop3xx_data *iop3xx_adap, char byte, int stop )
{ {
unsigned cr = *iop3xx_adap->biu->CR; unsigned cr = *iop3xx_adap->biu->CR;
int status; int status;
...@@ -297,19 +284,19 @@ static int iop3xx_adap_write_byte( ...@@ -297,19 +284,19 @@ static int iop3xx_adap_write_byte(
*iop3xx_adap->biu->DBR = byte; *iop3xx_adap->biu->DBR = byte;
cr &= ~IOP321_ICR_MSTART; cr &= ~IOP321_ICR_MSTART;
if ( stop ){ if (stop) {
cr |= IOP321_ICR_MSTOP; cr |= IOP321_ICR_MSTOP;
}else{ } else {
cr &= ~IOP321_ICR_MSTOP; cr &= ~IOP321_ICR_MSTOP;
} }
*iop3xx_adap->biu->CR = cr |= IOP321_ICR_TBYTE; *iop3xx_adap->biu->CR = cr |= IOP321_ICR_TBYTE;
rc = iop3xx_adap_wait_tx_done( iop3xx_adap, &status ); rc = iop3xx_adap_wait_tx_done(iop3xx_adap, &status);
return rc; return rc;
} }
static int iop3xx_adap_read_byte( static int iop3xx_adap_read_byte(struct i2c_algo_iop3xx_data *iop3xx_adap,
struct i2c_algo_iop3xx_data *iop3xx_adap, char* byte, int stop ) char* byte, int stop)
{ {
unsigned cr = *iop3xx_adap->biu->CR; unsigned cr = *iop3xx_adap->biu->CR;
int status; int status;
...@@ -317,49 +304,46 @@ static int iop3xx_adap_read_byte( ...@@ -317,49 +304,46 @@ static int iop3xx_adap_read_byte(
cr &= ~IOP321_ICR_MSTART; cr &= ~IOP321_ICR_MSTART;
if ( stop ){ if (stop) {
cr |= IOP321_ICR_MSTOP|IOP321_ICR_NACK; cr |= IOP321_ICR_MSTOP|IOP321_ICR_NACK;
}else{ } else {
cr &= ~(IOP321_ICR_MSTOP|IOP321_ICR_NACK); cr &= ~(IOP321_ICR_MSTOP|IOP321_ICR_NACK);
} }
*iop3xx_adap->biu->CR = cr |= IOP321_ICR_TBYTE; *iop3xx_adap->biu->CR = cr |= IOP321_ICR_TBYTE;
rc = iop3xx_adap_wait_rx_done( iop3xx_adap, &status ); rc = iop3xx_adap_wait_rx_done(iop3xx_adap, &status);
*byte = *iop3xx_adap->biu->DBR; *byte = *iop3xx_adap->biu->DBR;
return rc; return rc;
} }
static int iop3xx_i2c_writebytes(struct i2c_adapter *i2c_adap,
static int iop3xx_i2c_writebytes( struct i2c_adapter *i2c_adap, const char *buf, int count)
const char *buf, int count )
{ {
struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data; struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data;
int ii; int ii;
int rc = 0; int rc = 0;
for ( ii = 0; rc == 0 && ii != count; ++ii ){ for (ii = 0; rc == 0 && ii != count; ++ii) {
rc = iop3xx_adap_write_byte(iop3xx_adap, buf[ii], ii==count-1); rc = iop3xx_adap_write_byte(iop3xx_adap, buf[ii], ii==count-1);
} }
return rc; return rc;
} }
static int iop3xx_i2c_readbytes(struct i2c_adapter *i2c_adap,
static int iop3xx_i2c_readbytes( struct i2c_adapter *i2c_adap, char *buf, int count)
char *buf, int count )
{ {
struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data; struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data;
int ii; int ii;
int rc = 0; int rc = 0;
for ( ii = 0; rc == 0 && ii != count; ++ii ){ for (ii = 0; rc == 0 && ii != count; ++ii) {
rc = iop3xx_adap_read_byte(iop3xx_adap, &buf[ii], ii==count-1); rc = iop3xx_adap_read_byte(iop3xx_adap, &buf[ii], ii==count-1);
} }
return rc; return rc;
} }
/* /*
* Description: This function implements combined transactions. Combined * Description: This function implements combined transactions. Combined
* transactions consist of combinations of reading and writing blocks of data. * transactions consist of combinations of reading and writing blocks of data.
...@@ -367,63 +351,55 @@ static int iop3xx_i2c_readbytes( struct i2c_adapter *i2c_adap, ...@@ -367,63 +351,55 @@ static int iop3xx_i2c_readbytes( struct i2c_adapter *i2c_adap,
* Each transfer (i.e. a read or a write) is separated by a repeated start * Each transfer (i.e. a read or a write) is separated by a repeated start
* condition. * condition.
*/ */
static int iop3xx_handle_msg(struct i2c_adapter *i2c_adap, struct i2c_msg* pmsg)
static int iop3xx_handle_msg(
struct i2c_adapter *i2c_adap, struct i2c_msg* pmsg )
{ {
struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data; struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data;
int rc; int rc;
rc = iop3xx_adap_send_target_slave_addr( iop3xx_adap, pmsg ); rc = iop3xx_adap_send_target_slave_addr(iop3xx_adap, pmsg);
if ( rc < 0 ){ if (rc < 0) {
return rc; return rc;
} }
if ( (pmsg->flags&I2C_M_RD) ){ if ((pmsg->flags&I2C_M_RD)) {
return iop3xx_i2c_readbytes( i2c_adap, pmsg->buf, pmsg->len ); return iop3xx_i2c_readbytes(i2c_adap, pmsg->buf, pmsg->len);
}else{ } else {
return iop3xx_i2c_writebytes( i2c_adap, pmsg->buf, pmsg->len ); return iop3xx_i2c_writebytes(i2c_adap, pmsg->buf, pmsg->len);
} }
} }
/* /*
* master_xfer() - main read/write entry * master_xfer() - main read/write entry
*/ */
static int iop3xx_master_xfer( static int iop3xx_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num )
{ {
struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data; struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data;
int im = 0; int im = 0;
int ret = 0; int ret = 0;
int status; int status;
iop3xx_adap_wait_idle( iop3xx_adap, &status ); iop3xx_adap_wait_idle(iop3xx_adap, &status);
iop3xx_adap_reset( iop3xx_adap ); iop3xx_adap_reset(iop3xx_adap);
iop3xx_adap_enable( iop3xx_adap ); iop3xx_adap_enable(iop3xx_adap);
for ( im = 0; ret == 0 && im != num; ++im ){ for (im = 0; ret == 0 && im != num; ++im) {
ret = iop3xx_handle_msg( i2c_adap, &msgs[im] ); ret = iop3xx_handle_msg(i2c_adap, &msgs[im]);
} }
iop3xx_adap_transaction_cleanup( iop3xx_adap ); iop3xx_adap_transaction_cleanup(iop3xx_adap);
return ret; return ret;
} }
static int algo_control(struct i2c_adapter *adapter, unsigned int cmd,
unsigned long arg)
static int algo_control(struct i2c_adapter *adapter,
unsigned int cmd, unsigned long arg)
{ {
return 0; return 0;
} }
static u32 iic_func(struct i2c_adapter *adap) static u32 iic_func(struct i2c_adapter *adap)
{ {
return I2C_FUNC_I2C|I2C_FUNC_SMBUS_EMUL; return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
} }
...@@ -440,54 +416,50 @@ static struct i2c_algorithm iic_algo = { ...@@ -440,54 +416,50 @@ static struct i2c_algorithm iic_algo = {
/* /*
* registering functions to load algorithms at runtime * registering functions to load algorithms at runtime
*/ */
static int i2c_iop3xx_add_bus(struct i2c_adapter *iic_adap) static int i2c_iop3xx_add_bus(struct i2c_adapter *iic_adap)
{ {
struct i2c_algo_iop3xx_data *iop3xx_adap = iic_adap->algo_data; struct i2c_algo_iop3xx_data *iop3xx_adap = iic_adap->algo_data;
if ( !request_region( REGION_START(iop3xx_adap), if (!request_region( REGION_START(iop3xx_adap),
REGION_LENGTH(iop3xx_adap), REGION_LENGTH(iop3xx_adap),
iic_adap->name ) ){ iic_adap->name)) {
return -ENODEV; return -ENODEV;
} }
init_waitqueue_head( &iop3xx_adap->waitq ); init_waitqueue_head(&iop3xx_adap->waitq);
spin_lock_init( &iop3xx_adap->lock ); spin_lock_init(&iop3xx_adap->lock);
if ( request_irq( if (request_irq(
iop3xx_adap->biu->irq, iop3xx_adap->biu->irq,
iop3xx_i2c_handler, iop3xx_i2c_handler,
/* SA_SAMPLE_RANDOM */ 0, /* SA_SAMPLE_RANDOM */ 0,
iic_adap->name, iic_adap->name,
iop3xx_adap ) ){ iop3xx_adap)) {
return -ENODEV; return -ENODEV;
} }
/* register new iic_adapter to i2c module... */ /* register new iic_adapter to i2c module... */
iic_adap->id |= iic_algo.id; iic_adap->id |= iic_algo.id;
iic_adap->algo = &iic_algo; iic_adap->algo = &iic_algo;
iic_adap->timeout = 100; /* default values, should */ iic_adap->timeout = 100; /* default values, should */
iic_adap->retries = 3; /* be replaced by defines */ iic_adap->retries = 3; /* be replaced by defines */
iop3xx_adap_init( iic_adap->algo_data ); iop3xx_adap_init(iic_adap->algo_data);
i2c_add_adapter(iic_adap); i2c_add_adapter(iic_adap);
return 0; return 0;
} }
static int i2c_iop3xx_del_bus(struct i2c_adapter *iic_adap) static int i2c_iop3xx_del_bus(struct i2c_adapter *iic_adap)
{ {
struct i2c_algo_iop3xx_data *iop3xx_adap = iic_adap->algo_data; struct i2c_algo_iop3xx_data *iop3xx_adap = iic_adap->algo_data;
iop3xx_adap_final_cleanup( iop3xx_adap ); iop3xx_adap_final_cleanup(iop3xx_adap);
free_irq( iop3xx_adap->biu->irq, iop3xx_adap ); free_irq(iop3xx_adap->biu->irq, iop3xx_adap);
release_region( REGION_START(iop3xx_adap), REGION_LENGTH(iop3xx_adap)); release_region(REGION_START(iop3xx_adap), REGION_LENGTH(iop3xx_adap));
return i2c_del_adapter( iic_adap ); return i2c_del_adapter(iic_adap);
} }
#ifdef CONFIG_ARCH_IOP321 #ifdef CONFIG_ARCH_IOP321
...@@ -498,7 +470,7 @@ static struct iop3xx_biu biu0 = { ...@@ -498,7 +470,7 @@ static struct iop3xx_biu biu0 = {
.SAR = IOP321_ISAR0, .SAR = IOP321_ISAR0,
.DBR = IOP321_IDBR0, .DBR = IOP321_IDBR0,
.BMR = IOP321_IBMR0, .BMR = IOP321_IBMR0,
.irq = IRQ_IOP321_I2C_0 .irq = IRQ_IOP321_I2C_0,
}; };
static struct iop3xx_biu biu1 = { static struct iop3xx_biu biu1 = {
...@@ -507,7 +479,7 @@ static struct iop3xx_biu biu1 = { ...@@ -507,7 +479,7 @@ static struct iop3xx_biu biu1 = {
.SAR = IOP321_ISAR1, .SAR = IOP321_ISAR1,
.DBR = IOP321_IDBR1, .DBR = IOP321_IDBR1,
.BMR = IOP321_IBMR1, .BMR = IOP321_IBMR1,
.irq = IRQ_IOP321_I2C_1 .irq = IRQ_IOP321_I2C_1,
}; };
#define ADAPTER_NAME_ROOT "IOP321 i2c biu adapter " #define ADAPTER_NAME_ROOT "IOP321 i2c biu adapter "
...@@ -518,25 +490,25 @@ static struct iop3xx_biu biu1 = { ...@@ -518,25 +490,25 @@ static struct iop3xx_biu biu1 = {
static struct i2c_algo_iop3xx_data algo_iop3xx_data0 = { static struct i2c_algo_iop3xx_data algo_iop3xx_data0 = {
.channel = 0, .channel = 0,
.biu = &biu0, .biu = &biu0,
.timeout = 1*HZ .timeout = 1*HZ,
}; };
static struct i2c_algo_iop3xx_data algo_iop3xx_data1 = { static struct i2c_algo_iop3xx_data algo_iop3xx_data1 = {
.channel = 1, .channel = 1,
.biu = &biu1, .biu = &biu1,
.timeout = 1*HZ .timeout = 1*HZ,
}; };
static struct i2c_adapter iop3xx_ops0 = { static struct i2c_adapter iop3xx_ops0 = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = ADAPTER_NAME_ROOT "0", .name = ADAPTER_NAME_ROOT "0",
.id = I2C_HW_IOP321, .id = I2C_HW_IOP321,
.algo_data = &algo_iop3xx_data0 .algo_data = &algo_iop3xx_data0,
}; };
static struct i2c_adapter iop3xx_ops1 = { static struct i2c_adapter iop3xx_ops1 = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = ADAPTER_NAME_ROOT "1", .name = ADAPTER_NAME_ROOT "1",
.id = I2C_HW_IOP321, .id = I2C_HW_IOP321,
.algo_data = &algo_iop3xx_data1 .algo_data = &algo_iop3xx_data1,
}; };
static int __init i2c_iop3xx_init (void) static int __init i2c_iop3xx_init (void)
...@@ -560,6 +532,5 @@ MODULE_LICENSE("GPL"); ...@@ -560,6 +532,5 @@ MODULE_LICENSE("GPL");
MODULE_PARM(i2c_debug,"i"); MODULE_PARM(i2c_debug,"i");
MODULE_PARM_DESC(i2c_debug, MODULE_PARM_DESC(i2c_debug, "debug level - 0 off; 1 normal; 2,3 more verbose; 9 iic-protocol");
"debug level - 0 off; 1 normal; 2,3 more verbose; 9 iic-protocol");
drivers/i2c/i2c-iop3xx.h
View file @ e7aba607
...@@ -87,15 +87,13 @@ ...@@ -87,15 +87,13 @@
#define I2C_ERR_ALD (I2C_ERR+1) #define I2C_ERR_ALD (I2C_ERR+1)
typedef volatile u32* r32;
struct iop3xx_biu { /* Bus Interface Unit - the hardware */ struct iop3xx_biu { /* Bus Interface Unit - the hardware */
/* physical hardware defs - regs*/ /* physical hardware defs - regs*/
r32 CR; u32 *CR;
r32 SR; u32 *SR;
r32 SAR; u32 *SAR;
r32 DBR; u32 *DBR;
r32 BMR; u32 *BMR;
/* irq bit vector */ /* irq bit vector */
u32 irq; u32 irq;
/* stored flags */ /* stored flags */
...@@ -111,10 +109,10 @@ struct i2c_algo_iop3xx_data { ...@@ -111,10 +109,10 @@ struct i2c_algo_iop3xx_data {
struct iop3xx_biu* biu; struct iop3xx_biu* biu;
}; };
#define REGION_START( adap ) ((u32)((adap)->biu->CR)) #define REGION_START(adap) ((u32)((adap)->biu->CR))
#define REGION_END( adap ) ((u32)((adap)->biu->BMR+1)) #define REGION_END(adap) ((u32)((adap)->biu->BMR+1))
#define REGION_LENGTH( adap ) (REGION_END(adap)-REGION_START(adap)) #define REGION_LENGTH(adap) (REGION_END(adap)-REGION_START(adap))
#define IRQ_STATUS_MASK( adap ) (1<<adap->biu->irq) #define IRQ_STATUS_MASK(adap) (1<<adap->biu->irq)
#endif /* I2C_IOP3XX_H */ #endif /* I2C_IOP3XX_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7