Blackfin I2C/TWI driver updates
cover Blackfin I2C/TWI driver updates
- add support for BF54x TWI0 and TWI1
- add PIN MUX operation
PATCH 1/2 Blackfin I2C/TWI driver: Add platform_resource interface to support multi-port TWI controllers
- Add repeat start feature to avoid break of a bundle of i2c master xfer operation Create a new mode TWI_I2C_MODE_REPEAT
No change to smbus operation
- Add platform_resource interface to support multi-port TWI controllers
--- drivers/i2c/busses/i2c-bfin-twi.c | 414 +++++++++++++++++++++++-------------- 1 files changed, 263 insertions(+), 151 deletions(-)
drivers/i2c/busses/i2c-bfin-twi.c +263 -151
@@ -7,6 +7,10 @@* * Copyright (c) 2005-2007 Analog Devices, Inc. * +* Modified: +* Aug 01, 2007 add platform_resource interface to support multi-port +* TWI controllers. (Bryan Wu <[email protected]>) +* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -42,6 +46,7 @@#define TWI_I2C_MODE_STANDARD 0x01#define TWI_I2C_MODE_STANDARDSUB 0x02#define TWI_I2C_MODE_COMBINED 0x04 +#define TWI_I2C_MODE_REPEAT 0x08struct bfin_twi_iface {int irq;
@@ -58,39 +63,69 @@ struct bfin_twi_iface {struct timer_list timeout_timer;struct i2c_adapter adap;struct completion complete; +struct i2c_msg *pmsg; +int msg_num; +int cur_msg; +u32 regs_base; }; -static struct bfin_twi_iface twi_iface; + +#define DEFINE_TWI_REG (reg, off) \ +static inline u16 read_##reg(struct bfin_twi_iface *iface) \ + { return bfin_read16(iface->regs_base + off); } \ +static inline void write_##reg(struct bfin_twi_iface *iface, u16 v) \ + {bfin_write16(iface->regs_base + off, v); } + +DEFINE_TWI_REG(CLKDIV, 0x00) +DEFINE_TWI_REG(CONTROL, 0x04) +DEFINE_TWI_REG(SLAVE_CTL, 0x08) +DEFINE_TWI_REG(SLAVE_STAT, 0x0C) +DEFINE_TWI_REG(SLAVE_ADDR, 0x10) +DEFINE_TWI_REG(MASTER_CTL, 0x14) +DEFINE_TWI_REG(MASTER_STAT, 0x18) +DEFINE_TWI_REG(MASTER_ADDR, 0x1C) +DEFINE_TWI_REG(INT_STAT, 0x20) +DEFINE_TWI_REG(INT_MASK, 0x24) +DEFINE_TWI_REG(FIFO_CTL, 0x28) +DEFINE_TWI_REG(FIFO_STAT, 0x2C) +DEFINE_TWI_REG(XMT_DATA8, 0x80) +DEFINE_TWI_REG(XMT_DATA16, 0x84) +DEFINE_TWI_REG(RCV_DATA8, 0x88) +DEFINE_TWI_REG(RCV_DATA16, 0x8C)static void bfin_twi_handle_interrupt (struct bfin_twi_iface *iface) { -unsigned short twi_int_status =bfin_read_TWI_INT_STAT (); -unsigned short mast_stat =bfin_read_TWI_MASTER_STAT (); +unsigned short twi_int_status =read_INT_STAT (iface); +unsigned short mast_stat =read_MASTER_STAT (iface);if (twi_int_status &XMTSERV ) {/* Transmit next data */ if (iface->writeNum >0 ) { -bfin_write_TWI_XMT_DATA8 (*(iface->transPtr++)); +write_XMT_DATA8 (iface, *(iface->transPtr++)); iface->writeNum--; }/* start receive immediately after complete sending in * combine mode. */ -else if (iface->cur_mode ==TWI_I2C_MODE_COMBINED ) { -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () - |MDIR |RSTART ); - }else if (iface->manual_stop) -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () - |STOP ); +else if (iface->cur_mode ==TWI_I2C_MODE_COMBINED ) +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) |MDIR |RSTART ); +else if (iface->manual_stop) +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) |STOP ); +else if (iface->cur_mode ==TWI_I2C_MODE_REPEAT && + iface->cur_msg+1 < iface->msg_num) +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) |RSTART );SSYNC ();/* Clear status */ -bfin_write_TWI_INT_STAT (XMTSERV ); +write_INT_STAT (iface,XMTSERV );SSYNC (); }if (twi_int_status &RCVSERV ) {if (iface->readNum >0 ) {/* Receive next data */ - *(iface->transPtr) =bfin_read_TWI_RCV_DATA8 (); + *(iface->transPtr) =read_RCV_DATA8 (iface);if (iface->cur_mode ==TWI_I2C_MODE_COMBINED ) {/* Change combine mode into sub mode after * read first data.
@@ -105,28 +140,33 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface) iface->transPtr++; iface->readNum--; }else if (iface->manual_stop) { -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () - |STOP ); +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) |STOP ); +SSYNC (); + }else if (iface->cur_mode ==TWI_I2C_MODE_REPEAT && + iface->cur_msg+1 < iface->msg_num) { +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) |RSTART );SSYNC (); }/* Clear interrupt source */ -bfin_write_TWI_INT_STAT (RCVSERV ); +write_INT_STAT (iface,RCVSERV );SSYNC (); }if (twi_int_status &MERR ) { -bfin_write_TWI_INT_STAT (MERR ); -bfin_write_TWI_INT_MASK (0 ); -bfin_write_TWI_MASTER_STAT (0x3e ); -bfin_write_TWI_MASTER_CTL (0 ); +write_INT_STAT (iface,MERR ); +write_INT_MASK (iface,0 ); +write_MASTER_STAT (iface,0x3e ); +write_MASTER_CTL (iface,0 );SSYNC (); - iface->result =-1 ; + iface->result = -EIO ;/* if both err and complete int stats are set, return proper * results. */ if (twi_int_status &MCOMP ) { -bfin_write_TWI_INT_STAT (MCOMP ); -bfin_write_TWI_INT_MASK (0 ); -bfin_write_TWI_MASTER_CTL (0 ); +write_INT_STAT (iface,MCOMP ); +write_INT_MASK (iface,0 ); +write_MASTER_CTL (iface,0 );SSYNC ();/* If it is a quick transfer, only address bug no data, * not an err, return 1.
@@ -143,7 +183,7 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface)return ; }if (twi_int_status &MCOMP ) { -bfin_write_TWI_INT_STAT (MCOMP ); +write_INT_STAT (iface,MCOMP );SSYNC ();if (iface->cur_mode ==TWI_I2C_MODE_COMBINED ) {if (iface->readNum ==0 ) {
@@ -152,28 +192,63 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface)*/ iface->readNum =1 ; iface->manual_stop =1 ; -bfin_write_TWI_MASTER_CTL ( -bfin_read_TWI_MASTER_CTL () - | (0xff <<6 )); +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) | (0xff <<6 )); }else {/* set the readd number in other * combine mode. */ -bfin_write_TWI_MASTER_CTL ( - (bfin_read_TWI_MASTER_CTL () & +write_MASTER_CTL (iface, + (read_MASTER_CTL (iface) & (~(0xff <<6 ))) | - ( iface->readNum <<6 )); + (iface->readNum <<6 )); + } +/* remove restart bit and enable master receive */ +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) & ~RSTART ); +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) |MEN |MDIR ); +SSYNC (); + }else if (iface->cur_mode ==TWI_I2C_MODE_REPEAT && + iface->cur_msg+1 < iface->msg_num) { + iface->cur_msg++; + iface->transPtr = iface->pmsg[iface->cur_msg].buf; + iface->writeNum = iface->readNum = + iface->pmsg[iface->cur_msg].len; +/* Set Transmit device address */ +write_MASTER_ADDR (iface, + iface->pmsg[iface->cur_msg].addr); +if (iface->pmsg[iface->cur_msg].flags &I2C_M_RD ) + iface->read_write =I2C_SMBUS_READ ; +else { + iface->read_write =I2C_SMBUS_WRITE ; +/* Transmit first data */ +if (iface->writeNum >0 ) { +write_XMT_DATA8 (iface, + *(iface->transPtr++)); + iface->writeNum--; +SSYNC (); + } + } + +if (iface->pmsg[iface->cur_msg].len <=255 ) +write_MASTER_CTL (iface, + iface->pmsg[iface->cur_msg].len <<6 ); +else if (iface->pmsg[iface->cur_msg].len >255 ) { +write_MASTER_CTL (iface,0xff <<6 ); + iface->manual_stop =1 ; }/* remove restart bit and enable master receive */ -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () & - ~RSTART ); -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () | -MEN |MDIR ); +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) & ~RSTART ); +write_MASTER_CTL (iface,read_MASTER_CTL (iface) | +MEN | ((iface->read_write ==I2C_SMBUS_READ ) ? +MDIR :0 ));SSYNC (); }else { iface->result =1 ; -bfin_write_TWI_INT_MASK (0 ); -bfin_write_TWI_MASTER_CTL (0 ); +write_INT_MASK (iface,0 ); +write_MASTER_CTL (iface,0 );SSYNC ();complete (&iface->complete); }
@@ -221,91 +296,85 @@ static int bfin_twi_master_xfer(struct i2c_adapter *adap, {struct bfin_twi_iface *iface = adap->algo_data;struct i2c_msg *pmsg; -int i, ret;int rc =0 ; -if (!(bfin_read_TWI_CONTROL () &TWI_ENA )) +if (!(read_CONTROL (iface) &TWI_ENA ))return -ENXIO ; -while (bfin_read_TWI_MASTER_STAT () &BUSBUSY ) { +while (read_MASTER_STAT (iface) &BUSBUSY )yield (); + + iface->pmsg = msgs; + iface->msg_num = num; + iface->cur_msg =0 ; + + pmsg = &msgs[0 ]; +if (pmsg->flags &I2C_M_TEN ) { +dev_err (&(adap->dev),"i2c-bfin-twi: 10 bits addr " +"not supported !\n" ); +return -EINVAL ; } - ret =0 ; -for (i =0 ; rc >=0 && i < num; i++) { - pmsg = &msgs[i]; -if (pmsg->flags &I2C_M_TEN ) { -dev_err (&(adap->dev),"i2c-bfin-twi: 10 bits addr " -"not supported !\n" ); - rc = -EINVAL ; -break ; - } + iface->cur_mode =TWI_I2C_MODE_REPEAT ; + iface->manual_stop =0 ; + iface->transPtr = pmsg->buf; + iface->writeNum = iface->readNum = pmsg->len; + iface->result =0 ; + iface->timeout_count =10 ; +/* Set Transmit device address */ +write_MASTER_ADDR (iface, pmsg->addr); - iface->cur_mode =TWI_I2C_MODE_STANDARD ; - iface->manual_stop =0 ; - iface->transPtr = pmsg->buf; - iface->writeNum = iface->readNum = pmsg->len; - iface->result =0 ; - iface->timeout_count =10 ; -/* Set Transmit device address */ -bfin_write_TWI_MASTER_ADDR (pmsg->addr); - -/* FIFO Initiation. Data in FIFO should be -* discarded before start a new operation. -*/ -bfin_write_TWI_FIFO_CTL (0x3 ); -SSYNC (); -bfin_write_TWI_FIFO_CTL (0 ); -SSYNC (); +/* FIFO Initiation. Data in FIFO should be +* discarded before start a new operation. +*/ +write_FIFO_CTL (iface,0x3 ); +SSYNC (); +write_FIFO_CTL (iface,0 ); +SSYNC (); -if (pmsg->flags &I2C_M_RD ) - iface->read_write =I2C_SMBUS_READ ; -else { - iface->read_write =I2C_SMBUS_WRITE ; -/* Transmit first data */ -if (iface->writeNum >0 ) { -bfin_write_TWI_XMT_DATA8 (*(iface->transPtr++)); - iface->writeNum--; -SSYNC (); - } +if (pmsg->flags &I2C_M_RD ) + iface->read_write =I2C_SMBUS_READ ; +else { + iface->read_write =I2C_SMBUS_WRITE ; +/* Transmit first data */ +if (iface->writeNum >0 ) { +write_XMT_DATA8 (iface, *(iface->transPtr++)); + iface->writeNum--; +SSYNC (); } + } -/* clear int stat */ -bfin_write_TWI_INT_STAT (MERR |MCOMP |XMTSERV |RCVSERV ); +/* clear int stat */ +write_INT_STAT (iface,MERR |MCOMP |XMTSERV |RCVSERV ); -/* Interrupt mask . Enable XMT, RCV interrupt */ -bfin_write_TWI_INT_MASK (MCOMP |MERR | - ((iface->read_write ==I2C_SMBUS_READ )? -RCVSERV :XMTSERV )); -SSYNC (); +/* Interrupt mask . Enable XMT, RCV interrupt */ +write_INT_MASK (iface,MCOMP |MERR |RCVSERV |XMTSERV ); +SSYNC (); -if (pmsg->len >0 && pmsg->len <=255 ) -bfin_write_TWI_MASTER_CTL (pmsg->len <<6 ); -else if (pmsg->len >255 ) { -bfin_write_TWI_MASTER_CTL (0xff <<6 ); - iface->manual_stop =1 ; - }else -break ; +if (pmsg->len <=255 ) +write_MASTER_CTL (iface, pmsg->len <<6 ); +else if (pmsg->len >255 ) { +write_MASTER_CTL (iface,0xff <<6 ); + iface->manual_stop =1 ; + } - iface->timeout_timer.expires = jiffies +POLL_TIMEOUT ; -add_timer (&iface->timeout_timer); + iface->timeout_timer.expires = jiffies +POLL_TIMEOUT ; +add_timer (&iface->timeout_timer); -/* Master enable */ -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () |MEN | - ((iface->read_write ==I2C_SMBUS_READ ) ?MDIR :0 ) | - ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ >100 ) ?FAST :0 )); -SSYNC (); +/* Master enable */ +write_MASTER_CTL (iface,read_MASTER_CTL (iface) |MEN | + ((iface->read_write ==I2C_SMBUS_READ ) ?MDIR :0 ) | + ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ >100 ) ?FAST :0 )); +SSYNC (); -wait_for_completion (&iface->complete); +wait_for_completion (&iface->complete); - rc = iface->result; -if (rc ==1 ) - ret++; -else if (rc ==-1 ) -break ; - } + rc = iface->result; -return ret; +if (rc ==1 ) +return num; +else +return rc; }/*
@@ -319,12 +388,11 @@ int bfin_twi_smbus_xfer(struct i2c_adapter *adap, u16 addr,struct bfin_twi_iface *iface = adap->algo_data;int rc =0 ; -if (!(bfin_read_TWI_CONTROL () &TWI_ENA )) +if (!(read_CONTROL (iface) &TWI_ENA ))return -ENXIO ; -while (bfin_read_TWI_MASTER_STAT () &BUSBUSY ) { +while (read_MASTER_STAT (iface) &BUSBUSY )yield (); - } iface->writeNum =0 ; iface->readNum =0 ;
@@ -396,15 +464,15 @@ int bfin_twi_smbus_xfer(struct i2c_adapter *adap, u16 addr,/* FIFO Initiation. Data in FIFO should be discarded before * start a new operation. */ -bfin_write_TWI_FIFO_CTL (0x3 ); +write_FIFO_CTL (iface,0x3 );SSYNC (); -bfin_write_TWI_FIFO_CTL (0 ); +write_FIFO_CTL (iface,0 );/* clear int stat */ -bfin_write_TWI_INT_STAT (MERR |MCOMP |XMTSERV |RCVSERV ); +write_INT_STAT (iface,MERR |MCOMP |XMTSERV |RCVSERV );/* Set Transmit device address */ -bfin_write_TWI_MASTER_ADDR (addr); +write_MASTER_ADDR (iface, addr);SSYNC (); iface->timeout_timer.expires = jiffies +POLL_TIMEOUT ;
@@ -412,60 +480,64 @@ int bfin_twi_smbus_xfer(struct i2c_adapter *adap, u16 addr,switch (iface->cur_mode) {case TWI_I2C_MODE_STANDARDSUB : -bfin_write_TWI_XMT_DATA8 (iface->command); -bfin_write_TWI_INT_MASK (MCOMP |MERR | +write_XMT_DATA8 (iface, iface->command); +write_INT_MASK (iface,MCOMP |MERR | ((iface->read_write ==I2C_SMBUS_READ ) ?RCVSERV :XMTSERV ));SSYNC ();if (iface->writeNum +1 <=255 ) -bfin_write_TWI_MASTER_CTL ((iface->writeNum +1 ) <<6 ); +write_MASTER_CTL (iface, (iface->writeNum +1 ) <<6 );else { -bfin_write_TWI_MASTER_CTL (0xff <<6 ); +write_MASTER_CTL (iface,0xff <<6 ); iface->manual_stop =1 ; }/* Master enable */ -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () |MEN | +write_MASTER_CTL (iface,read_MASTER_CTL (iface) |MEN | ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ >100 ) ?FAST :0 ));break ;case TWI_I2C_MODE_COMBINED : -bfin_write_TWI_XMT_DATA8 (iface->command); -bfin_write_TWI_INT_MASK (MCOMP |MERR |RCVSERV |XMTSERV ); +write_XMT_DATA8 (iface, iface->command); +write_INT_MASK (iface,MCOMP |MERR |RCVSERV |XMTSERV );SSYNC ();if (iface->writeNum >0 ) -bfin_write_TWI_MASTER_CTL ((iface->writeNum +1 ) <<6 ); +write_MASTER_CTL (iface, (iface->writeNum +1 ) <<6 );else -bfin_write_TWI_MASTER_CTL (0x1 <<6 ); +write_MASTER_CTL (iface,0x1 <<6 );/* Master enable */ -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () |MEN | +write_MASTER_CTL (iface,read_MASTER_CTL (iface) |MEN | ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ >100 ) ?FAST :0 ));break ;default : -bfin_write_TWI_MASTER_CTL (0 ); +write_MASTER_CTL (iface,0 );if (size !=I2C_SMBUS_QUICK ) {/* Don't access xmit data register when this is a * read operation. */ if (iface->read_write !=I2C_SMBUS_READ ) {if (iface->writeNum >0 ) { -bfin_write_TWI_XMT_DATA8 (*(iface->transPtr++)); +write_XMT_DATA8 (iface, + *(iface->transPtr++));if (iface->writeNum <=255 ) -bfin_write_TWI_MASTER_CTL (iface->writeNum <<6 ); +write_MASTER_CTL (iface, + iface->writeNum <<6 );else { -bfin_write_TWI_MASTER_CTL (0xff <<6 ); +write_MASTER_CTL (iface, +0xff <<6 ); iface->manual_stop =1 ; } iface->writeNum--; }else { -bfin_write_TWI_XMT_DATA8 (iface->command); -bfin_write_TWI_MASTER_CTL (1 <<6 ); +write_XMT_DATA8 (iface, iface->command); +write_MASTER_CTL (iface,1 <<6 ); } }else {if (iface->readNum >0 && iface->readNum <=255 ) -bfin_write_TWI_MASTER_CTL (iface->readNum <<6 ); +write_MASTER_CTL (iface, + iface->readNum <<6 );else if (iface->readNum >255 ) { -bfin_write_TWI_MASTER_CTL (0xff <<6 ); +write_MASTER_CTL (iface,0xff <<6 ); iface->manual_stop =1 ; }else {del_timer (&iface->timeout_timer);
@@ -473,13 +545,13 @@ int bfin_twi_smbus_xfer(struct i2c_adapter *adap, u16 addr, } } } -bfin_write_TWI_INT_MASK (MCOMP |MERR | +write_INT_MASK (iface,MCOMP |MERR | ((iface->read_write ==I2C_SMBUS_READ ) ?RCVSERV :XMTSERV ));SSYNC ();/* Master enable */ -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () |MEN | +write_MASTER_CTL (iface,read_MASTER_CTL (iface) |MEN | ((iface->read_write ==I2C_SMBUS_READ ) ?MDIR :0 ) | ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ >100 ) ?FAST :0 ));break ;
@@ -514,10 +586,10 @@ static struct i2c_algorithm bfin_twi_algorithm = {static int i2c_bfin_twi_suspend (struct platform_device *dev,pm_message_t state) { -/* struct bfin_twi_iface *iface = platform_get_drvdata(dev);*/ +struct bfin_twi_iface *iface =platform_get_drvdata (dev);/* Disable TWI */ -bfin_write_TWI_CONTROL (bfin_read_TWI_CONTROL () & ~TWI_ENA ); +write_CONTROL (iface,read_CONTROL (iface) & ~TWI_ENA );SSYNC ();return 0 ;
@@ -525,64 +597,106 @@ static int i2c_bfin_twi_suspend(struct platform_device *dev, pm_message_t state)static int i2c_bfin_twi_resume (struct platform_device *dev) { -/* struct bfin_twi_iface *iface = platform_get_drvdata(dev);*/ +struct bfin_twi_iface *iface =platform_get_drvdata (dev);/* Enable TWI */ -bfin_write_TWI_CONTROL (bfin_read_TWI_CONTROL () |TWI_ENA ); +write_CONTROL (iface,read_CONTROL (iface) |TWI_ENA );SSYNC ();return 0 ; } -static int i2c_bfin_twi_probe (struct platform_device *dev) +static int i2c_bfin_twi_probe (struct platform_device *pdev) { -struct bfin_twi_iface *iface = &twi_iface; +struct bfin_twi_iface *iface;struct i2c_adapter *p_adap; +struct resource *res;int rc; + iface =kzalloc (sizeof (struct bfin_twi_iface ),GFP_KERNEL ); +if (!iface) { +dev_err (&(pdev->dev),"Cannot allocate memory\n" ); + rc = -ENOMEM ; + goto out_error_nomem; + } +spin_lock_init (&(iface->lock));init_completion (&(iface->complete)); - iface->irq =IRQ_TWI ; + +/* Find and map our resources */ + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (res ==NULL ) { +dev_err (&(pdev->dev),"Cannot get IORESOURCE_MEM\n" ); + rc = -ENOENT ; + goto out_error_get_res; + } + + iface->regs_base = (u32 )ioremap (res->start, (res->end - res->start)+1 ); +if (!iface->regs_base) { +dev_err (&(pdev->dev),"Cannot map IO\n" ); + rc = -ENXIO ; + goto out_error_ioremap; + } + + iface->irq =platform_get_irq (pdev,0 ); +if (iface->irq <0 ) { +dev_err (&(pdev->dev),"No DMA channel specified\n" ); + rc = -ENOENT ; + goto out_error_no_irq; + }init_timer (&(iface->timeout_timer)); iface->timeout_timer.function = bfin_twi_timeout; iface->timeout_timer.data = (unsigned long )iface; - p_adap = &iface->adap; - p_adap->id =I2C_HW_BLACKFIN ; -strlcpy (p_adap->name, dev->name,sizeof (p_adap->name)); + p_adap = &(iface->adap); + p_adap->id =I2C_HW_B_BLACKFIN ; +strlcpy (p_adap->name, pdev->name,sizeof (p_adap->name)); p_adap->algo = &bfin_twi_algorithm; p_adap->algo_data = iface; p_adap->class =I2C_CLASS_ALL ; - p_adap->dev.parent = &dev->dev; + p_adap->dev.parent = &pdev->dev; rc =request_irq (iface->irq, bfin_twi_interrupt_entry, -IRQF_DISABLED , dev->name, iface); +IRQF_DISABLED , pdev->name, iface);if (rc) { -dev_err (&(p_adap->dev),"i2c-bfin-twi: can't get IRQ %d !\n" , +dev_err (&(pdev->dev),"i2c-bfin-twi: can't get IRQ %d !\n" , iface->irq); -return -ENODEV ; + rc = -ENODEV ; + goto out_error_req_irq; }/* Set TWI internal clock as 10MHz */ -bfin_write_TWI_CONTROL (((get_sclk () /1024 /1024 +5 ) /10 ) &0x7F ); +write_CONTROL (iface, ((get_sclk () /1024 /1024 +5 ) /10 ) &0x7F );/* Set Twi interface clock as specified */ -bfin_write_TWI_CLKDIV (((5 *1024 /CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ ) - <<8 ) | ((5 *1024 /CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ ) +write_CLKDIV (iface, ((5 *1024 /CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ ) + <<8 ) | ((5 *1024 /CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ ) &0xFF ));/* Enable TWI */ -bfin_write_TWI_CONTROL (bfin_read_TWI_CONTROL () |TWI_ENA ); +write_CONTROL (iface,read_CONTROL (iface) |TWI_ENA );SSYNC (); rc =i2c_add_adapter (p_adap);if (rc <0 )free_irq (iface->irq, iface);else -platform_set_drvdata (dev, iface); +platform_set_drvdata (pdev, iface); + +dev_info (&(pdev->dev),"Blackfin I2C TWI driver, regs_base @ 0x%08x\n" , + iface->regs_base);return rc; + +out_error_req_irq: +out_error_no_irq: +iounmap ((void *)iface->regs_base); +out_error_ioremap: +out_error_get_res: +kfree (iface); +out_error_nomem: +return rc; }static int i2c_bfin_twi_remove (struct platform_device *pdev)
@@ -610,8 +724,6 @@ static struct platform_driver i2c_bfin_twi_driver = {static int __init i2c_bfin_twi_init (void ) { -pr_info ("I2C: Blackfin I2C TWI driver\n" ); -return platform_driver_register (&i2c_bfin_twi_driver); }
Signature · 1 line
1.5.3.4
Re: [PATCH 1/2] Blackfin I2C/TWI driver: Add platform_resource interface to support multi-port TWI controllers
Hi Bryan,
Quoted 5 lines · Bryan Wu
- Add repeat start feature to avoid break of a bundle of i2c master xfer operation Create a new mode
TWI_I2C_MODE_REPEAT
No change to smbus operation- Add
platform_resourceinterface to support multi-port TWI controllers
I asked for two separate patches for these two changes, and can only repeat myself. So I'm only doing a quick review for now, I will do a more careful review when the patch is split into functional changes.
Quoted 12 lines
Signed-off-by Sonic Zhang <[email protected]>Signed-off-by Bryan Wu <[email protected]>--- drivers/i2c/busses/i2c-bfin-twi.c | 414 +++++++++++++++++++++++-------------- 1 files changed, 263 insertions(+), 151 deletions(-)drivers/i2c/busses/i2c-bfin-twi.c +0
-0
drivers/i2c/busses/i2c-bfin-twi.c line 13
Quoted 7 lines
drivers/i2c/busses/i2c-bfin-twi.c +4
-0@@ -7,6 +7,10 @@* * Copyright (c) 2005-2007 Analog Devices, Inc. * +* Modified: +* Aug 01, 2007 add platform_resource interface to support multi-port +* TWI controllers. (Bryan Wu <[email protected]>) +*
Changelog doesn't belong there, we have git for that.
Quoted 35 lines
drivers/i2c/busses/i2c-bfin-twi.c +18
-1* This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -42,6 +46,7 @@#define TWI_I2C_MODE_STANDARD 0x01#define TWI_I2C_MODE_STANDARDSUB 0x02#define TWI_I2C_MODE_COMBINED 0x04 +#define TWI_I2C_MODE_REPEAT 0x08struct bfin_twi_iface {int irq;@@ -58,39 +63,69 @@ struct bfin_twi_iface {struct timer_list timeout_timer;struct i2c_adapter adap;struct completion complete; +struct i2c_msg *pmsg; +int msg_num; +int cur_msg; +u32 regs_base; }; -static struct bfin_twi_iface twi_iface; + +#define DEFINE_TWI_REG (reg, off) \ +static inline u16 read_##reg(struct bfin_twi_iface *iface) \ + { return bfin_read16(iface->regs_base + off); } \ +static inline void write_##reg(struct bfin_twi_iface *iface, u16 v) \ + {bfin_write16(iface->regs_base + off, v); } + +DEFINE_TWI_REG(CLKDIV, 0x00) +DEFINE_TWI_REG(CONTROL, 0x04) +DEFINE_TWI_REG(SLAVE_CTL, 0x08) +DEFINE_TWI_REG(SLAVE_STAT, 0x0C) +DEFINE_TWI_REG(SLAVE_ADDR, 0x10) +DEFINE_TWI_REG (MASTER_CTL ,0x14 )
drivers/i2c/busses/i2c-bfin-twi.c struct bfin_twi_iface { · line 94
Quoted 10 lines
drivers/i2c/busses/i2c-bfin-twi.c +10
-0+DEFINE_TWI_REG(MASTER_STAT, 0x18) +DEFINE_TWI_REG(MASTER_ADDR, 0x1C) +DEFINE_TWI_REG(INT_STAT, 0x20) +DEFINE_TWI_REG(INT_MASK, 0x24) +DEFINE_TWI_REG(FIFO_CTL, 0x28) +DEFINE_TWI_REG(FIFO_STAT, 0x2C) +DEFINE_TWI_REG(XMT_DATA8, 0x80) +DEFINE_TWI_REG(XMT_DATA16, 0x84) +DEFINE_TWI_REG(RCV_DATA8, 0x88) +DEFINE_TWI_REG (RCV_DATA16 ,0x8C )
While this is better than the original code, my preference would go to simple defines for the register offsets, and just one read and one write functions operating on these. Something like:
#define TWI_REG_CLKDIV 0x00
#define TWI_REG_CONTROL 0x04
#define TWI_REG_SLAVE_CTL 0x08
#define TWI_REG_SLAVE_STAT 0x0C
(...)
static inline u16 twi_read(struct bfin_twi_iface *iface, int off)
{
return bfin_read16(iface->regs_base + off);
}static inline void twi_write(struct bfin_twi_iface *iface, int off, u16 v)
{
bfin_write16(iface->regs_base + off, v);
}Macro-generated functions should be avoided as much as possible.
Also, with either change above (yours or mine) the original macros in blackfin-specific header files are no longer needed, so your patch should remove them.
Quoted 191 lines
drivers/i2c/busses/i2c-bfin-twi.c +81
-38static void bfin_twi_handle_interrupt (struct bfin_twi_iface *iface) { -unsigned short twi_int_status =bfin_read_TWI_INT_STAT (); -unsigned short mast_stat =bfin_read_TWI_MASTER_STAT (); +unsigned short twi_int_status =read_INT_STAT (iface); +unsigned short mast_stat =read_MASTER_STAT (iface);if (twi_int_status &XMTSERV ) {/* Transmit next data */ if (iface->writeNum >0 ) { -bfin_write_TWI_XMT_DATA8 (*(iface->transPtr++)); +write_XMT_DATA8 (iface, *(iface->transPtr++)); iface->writeNum--; }/* start receive immediately after complete sending in * combine mode. */ -else if (iface->cur_mode ==TWI_I2C_MODE_COMBINED ) { -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () - |MDIR |RSTART ); - }else if (iface->manual_stop) -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () - |STOP ); +else if (iface->cur_mode ==TWI_I2C_MODE_COMBINED ) +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) |MDIR |RSTART ); +else if (iface->manual_stop) +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) |STOP ); +else if (iface->cur_mode ==TWI_I2C_MODE_REPEAT && + iface->cur_msg+1 < iface->msg_num) +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) |RSTART );SSYNC ();/* Clear status */ -bfin_write_TWI_INT_STAT (XMTSERV ); +write_INT_STAT (iface,XMTSERV );SSYNC (); }if (twi_int_status &RCVSERV ) {if (iface->readNum >0 ) {/* Receive next data */ - *(iface->transPtr) =bfin_read_TWI_RCV_DATA8 (); + *(iface->transPtr) =read_RCV_DATA8 (iface);if (iface->cur_mode ==TWI_I2C_MODE_COMBINED ) {/* Change combine mode into sub mode after * read first data. @@ -105,28 +140,33 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface) iface->transPtr++; iface->readNum--; }else if (iface->manual_stop) { -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () - |STOP ); +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) |STOP ); +SSYNC (); + }else if (iface->cur_mode ==TWI_I2C_MODE_REPEAT && + iface->cur_msg+1 < iface->msg_num) { +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) |RSTART );SSYNC (); }/* Clear interrupt source */ -bfin_write_TWI_INT_STAT (RCVSERV ); +write_INT_STAT (iface,RCVSERV );SSYNC (); }if (twi_int_status &MERR ) { -bfin_write_TWI_INT_STAT (MERR ); -bfin_write_TWI_INT_MASK (0 ); -bfin_write_TWI_MASTER_STAT (0x3e ); -bfin_write_TWI_MASTER_CTL (0 ); +write_INT_STAT (iface,MERR ); +write_INT_MASK (iface,0 ); +write_MASTER_STAT (iface,0x3e ); +write_MASTER_CTL (iface,0 );SSYNC (); - iface->result =-1 ; + iface->result = -EIO ;/* if both err and complete int stats are set, return proper * results. */ if (twi_int_status &MCOMP ) { -bfin_write_TWI_INT_STAT (MCOMP ); -bfin_write_TWI_INT_MASK (0 ); -bfin_write_TWI_MASTER_CTL (0 ); +write_INT_STAT (iface,MCOMP ); +write_INT_MASK (iface,0 ); +write_MASTER_CTL (iface,0 );SSYNC ();/* If it is a quick transfer, only address bug no data, * not an err, return 1. @@ -143,7 +183,7 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface)return ; }if (twi_int_status &MCOMP ) { -bfin_write_TWI_INT_STAT (MCOMP ); +write_INT_STAT (iface,MCOMP );SSYNC ();if (iface->cur_mode ==TWI_I2C_MODE_COMBINED ) {if (iface->readNum ==0 ) {@@ -152,28 +192,63 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface)*/ iface->readNum =1 ; iface->manual_stop =1 ; -bfin_write_TWI_MASTER_CTL ( -bfin_read_TWI_MASTER_CTL () - | (0xff <<6 )); +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) | (0xff <<6 )); }else {/* set the readd number in other * combine mode. */ -bfin_write_TWI_MASTER_CTL ( - (bfin_read_TWI_MASTER_CTL () & +write_MASTER_CTL (iface, + (read_MASTER_CTL (iface) & (~(0xff <<6 ))) | - ( iface->readNum <<6 )); + (iface->readNum <<6 )); + } +/* remove restart bit and enable master receive */ +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) & ~RSTART ); +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) |MEN |MDIR ); +SSYNC (); + }else if (iface->cur_mode ==TWI_I2C_MODE_REPEAT && + iface->cur_msg+1 < iface->msg_num) { + iface->cur_msg++; + iface->transPtr = iface->pmsg[iface->cur_msg].buf; + iface->writeNum = iface->readNum = + iface->pmsg[iface->cur_msg].len; +/* Set Transmit device address */ +write_MASTER_ADDR (iface, + iface->pmsg[iface->cur_msg].addr); +if (iface->pmsg[iface->cur_msg].flags &I2C_M_RD ) + iface->read_write =I2C_SMBUS_READ ; +else { + iface->read_write =I2C_SMBUS_WRITE ; +/* Transmit first data */ +if (iface->writeNum >0 ) { +write_XMT_DATA8 (iface, + *(iface->transPtr++)); + iface->writeNum--; +SSYNC (); + } + } + +if (iface->pmsg[iface->cur_msg].len <=255 ) +write_MASTER_CTL (iface, + iface->pmsg[iface->cur_msg].len <<6 ); +else if (iface->pmsg[iface->cur_msg].len >255 ) { +write_MASTER_CTL (iface,0xff <<6 ); + iface->manual_stop =1 ; }/* remove restart bit and enable master receive */ -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () & - ~RSTART ); -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () | -MEN |MDIR ); +write_MASTER_CTL (iface, +read_MASTER_CTL (iface) & ~RSTART ); +write_MASTER_CTL (iface,read_MASTER_CTL (iface) | +MEN | ((iface->read_write ==I2C_SMBUS_READ ) ? +MDIR :0 ));SSYNC (); }else { iface->result =1 ; -bfin_write_TWI_INT_MASK (0 ); -bfin_write_TWI_MASTER_CTL (0 ); +write_INT_MASK (iface,0 ); +write_MASTER_CTL (iface,0 );SSYNC ();complete (&iface->complete); }@@ -221,91 +296,85 @@ static int bfin_twi_master_xfer(struct i2c_adapter *adap, {struct bfin_twi_iface *iface = adap->algo_data;struct i2c_msg *pmsg; -int i, ret;int rc =0 ; -if (!(bfin_read_TWI_CONTROL () &TWI_ENA )) +if (!(read_CONTROL (iface) &TWI_ENA ))return -ENXIO ; -while (bfin_read_TWI_MASTER_STAT () &BUSBUSY ) { +while (read_MASTER_STAT (iface) &BUSBUSY )
drivers/i2c/busses/i2c-bfin-twi.c static int bfin_twi_master_xfer(struct i2c_adapter *adap, · line 314
Quoted 10 lines
drivers/i2c/busses/i2c-bfin-twi.c +9
-0yield (); + + iface->pmsg = msgs; + iface->msg_num = num; + iface->cur_msg =0 ; + + pmsg = &msgs[0 ]; +if (pmsg->flags &I2C_M_TEN ) { +dev_err (&(adap->dev),"i2c-bfin-twi: 10 bits addr " +"not supported !\n" );
Do not include "i2c-bfin-twi", dev_err() prints it for you already.
Also note that the parentheses in "&(adap->dev)" are not needed and usually omitted.
Both comments above apply to other places in your patch as well.
Quoted 148 lines
drivers/i2c/busses/i2c-bfin-twi.c +52
-67+return -EINVAL ; } - ret =0 ; -for (i =0 ; rc >=0 && i < num; i++) { - pmsg = &msgs[i]; -if (pmsg->flags &I2C_M_TEN ) { -dev_err (&(adap->dev),"i2c-bfin-twi: 10 bits addr " -"not supported !\n" ); - rc = -EINVAL ; -break ; - } + iface->cur_mode =TWI_I2C_MODE_REPEAT ; + iface->manual_stop =0 ; + iface->transPtr = pmsg->buf; + iface->writeNum = iface->readNum = pmsg->len; + iface->result =0 ; + iface->timeout_count =10 ; +/* Set Transmit device address */ +write_MASTER_ADDR (iface, pmsg->addr); - iface->cur_mode =TWI_I2C_MODE_STANDARD ; - iface->manual_stop =0 ; - iface->transPtr = pmsg->buf; - iface->writeNum = iface->readNum = pmsg->len; - iface->result =0 ; - iface->timeout_count =10 ; -/* Set Transmit device address */ -bfin_write_TWI_MASTER_ADDR (pmsg->addr); - -/* FIFO Initiation. Data in FIFO should be -* discarded before start a new operation. -*/ -bfin_write_TWI_FIFO_CTL (0x3 ); -SSYNC (); -bfin_write_TWI_FIFO_CTL (0 ); -SSYNC (); +/* FIFO Initiation. Data in FIFO should be +* discarded before start a new operation. +*/ +write_FIFO_CTL (iface,0x3 ); +SSYNC (); +write_FIFO_CTL (iface,0 ); +SSYNC (); -if (pmsg->flags &I2C_M_RD ) - iface->read_write =I2C_SMBUS_READ ; -else { - iface->read_write =I2C_SMBUS_WRITE ; -/* Transmit first data */ -if (iface->writeNum >0 ) { -bfin_write_TWI_XMT_DATA8 (*(iface->transPtr++)); - iface->writeNum--; -SSYNC (); - } +if (pmsg->flags &I2C_M_RD ) + iface->read_write =I2C_SMBUS_READ ; +else { + iface->read_write =I2C_SMBUS_WRITE ; +/* Transmit first data */ +if (iface->writeNum >0 ) { +write_XMT_DATA8 (iface, *(iface->transPtr++)); + iface->writeNum--; +SSYNC (); } + } -/* clear int stat */ -bfin_write_TWI_INT_STAT (MERR |MCOMP |XMTSERV |RCVSERV ); +/* clear int stat */ +write_INT_STAT (iface,MERR |MCOMP |XMTSERV |RCVSERV ); -/* Interrupt mask . Enable XMT, RCV interrupt */ -bfin_write_TWI_INT_MASK (MCOMP |MERR | - ((iface->read_write ==I2C_SMBUS_READ )? -RCVSERV :XMTSERV )); -SSYNC (); +/* Interrupt mask . Enable XMT, RCV interrupt */ +write_INT_MASK (iface,MCOMP |MERR |RCVSERV |XMTSERV ); +SSYNC (); -if (pmsg->len >0 && pmsg->len <=255 ) -bfin_write_TWI_MASTER_CTL (pmsg->len <<6 ); -else if (pmsg->len >255 ) { -bfin_write_TWI_MASTER_CTL (0xff <<6 ); - iface->manual_stop =1 ; - }else -break ; +if (pmsg->len <=255 ) +write_MASTER_CTL (iface, pmsg->len <<6 ); +else if (pmsg->len >255 ) { +write_MASTER_CTL (iface,0xff <<6 ); + iface->manual_stop =1 ; + } - iface->timeout_timer.expires = jiffies +POLL_TIMEOUT ; -add_timer (&iface->timeout_timer); + iface->timeout_timer.expires = jiffies +POLL_TIMEOUT ; +add_timer (&iface->timeout_timer); -/* Master enable */ -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () |MEN | - ((iface->read_write ==I2C_SMBUS_READ ) ?MDIR :0 ) | - ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ >100 ) ?FAST :0 )); -SSYNC (); +/* Master enable */ +write_MASTER_CTL (iface,read_MASTER_CTL (iface) |MEN | + ((iface->read_write ==I2C_SMBUS_READ ) ?MDIR :0 ) | + ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ >100 ) ?FAST :0 )); +SSYNC (); -wait_for_completion (&iface->complete); +wait_for_completion (&iface->complete); - rc = iface->result; -if (rc ==1 ) - ret++; -else if (rc ==-1 ) -break ; - } + rc = iface->result; -return ret; +if (rc ==1 ) +return num; +else +return rc; }/* @@ -319,12 +388,11 @@ int bfin_twi_smbus_xfer(struct i2c_adapter *adap, u16 addr,struct bfin_twi_iface *iface = adap->algo_data;int rc =0 ; -if (!(bfin_read_TWI_CONTROL () &TWI_ENA )) +if (!(read_CONTROL (iface) &TWI_ENA ))return -ENXIO ; -while (bfin_read_TWI_MASTER_STAT () &BUSBUSY ) { +while (read_MASTER_STAT (iface) &BUSBUSY )yield (); - } iface->writeNum =0 ; iface->readNum =0 ;@@ -396,15 +464,15 @@ int bfin_twi_smbus_xfer(struct i2c_adapter *adap, u16 addr,/* FIFO Initiation. Data in FIFO should be discarded before * start a new operation.
drivers/i2c/busses/i2c-bfin-twi.c int bfin_twi_smbus_xfer(struct i2c_adapter *adap, u16 addr, · line 472
Quoted 10 lines
drivers/i2c/busses/i2c-bfin-twi.c +3
-3*/ -bfin_write_TWI_FIFO_CTL (0x3 ); +write_FIFO_CTL (iface,0x3 );SSYNC (); -bfin_write_TWI_FIFO_CTL (0 ); +write_FIFO_CTL (iface,0 );/* clear int stat */ -bfin_write_TWI_INT_STAT (MERR |MCOMP |XMTSERV |RCVSERV ); +write_INT_STAT (iface,MERR |MCOMP |XMTSERV |RCVSERV );
Suggested spaces around |s.
Quoted 126 lines
drivers/i2c/busses/i2c-bfin-twi.c +28
-24/* Set Transmit device address */ -bfin_write_TWI_MASTER_ADDR (addr); +write_MASTER_ADDR (iface, addr);SSYNC (); iface->timeout_timer.expires = jiffies +POLL_TIMEOUT ;@@ -412,60 +480,64 @@ int bfin_twi_smbus_xfer(struct i2c_adapter *adap, u16 addr,switch (iface->cur_mode) {case TWI_I2C_MODE_STANDARDSUB : -bfin_write_TWI_XMT_DATA8 (iface->command); -bfin_write_TWI_INT_MASK (MCOMP |MERR | +write_XMT_DATA8 (iface, iface->command); +write_INT_MASK (iface,MCOMP |MERR | ((iface->read_write ==I2C_SMBUS_READ ) ?RCVSERV :XMTSERV ));SSYNC ();if (iface->writeNum +1 <=255 ) -bfin_write_TWI_MASTER_CTL ((iface->writeNum +1 ) <<6 ); +write_MASTER_CTL (iface, (iface->writeNum +1 ) <<6 );else { -bfin_write_TWI_MASTER_CTL (0xff <<6 ); +write_MASTER_CTL (iface,0xff <<6 ); iface->manual_stop =1 ; }/* Master enable */ -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () |MEN | +write_MASTER_CTL (iface,read_MASTER_CTL (iface) |MEN | ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ >100 ) ?FAST :0 ));break ;case TWI_I2C_MODE_COMBINED : -bfin_write_TWI_XMT_DATA8 (iface->command); -bfin_write_TWI_INT_MASK (MCOMP |MERR |RCVSERV |XMTSERV ); +write_XMT_DATA8 (iface, iface->command); +write_INT_MASK (iface,MCOMP |MERR |RCVSERV |XMTSERV );SSYNC ();if (iface->writeNum >0 ) -bfin_write_TWI_MASTER_CTL ((iface->writeNum +1 ) <<6 ); +write_MASTER_CTL (iface, (iface->writeNum +1 ) <<6 );else -bfin_write_TWI_MASTER_CTL (0x1 <<6 ); +write_MASTER_CTL (iface,0x1 <<6 );/* Master enable */ -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () |MEN | +write_MASTER_CTL (iface,read_MASTER_CTL (iface) |MEN | ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ >100 ) ?FAST :0 ));break ;default : -bfin_write_TWI_MASTER_CTL (0 ); +write_MASTER_CTL (iface,0 );if (size !=I2C_SMBUS_QUICK ) {/* Don't access xmit data register when this is a * read operation. */ if (iface->read_write !=I2C_SMBUS_READ ) {if (iface->writeNum >0 ) { -bfin_write_TWI_XMT_DATA8 (*(iface->transPtr++)); +write_XMT_DATA8 (iface, + *(iface->transPtr++));if (iface->writeNum <=255 ) -bfin_write_TWI_MASTER_CTL (iface->writeNum <<6 ); +write_MASTER_CTL (iface, + iface->writeNum <<6 );else { -bfin_write_TWI_MASTER_CTL (0xff <<6 ); +write_MASTER_CTL (iface, +0xff <<6 ); iface->manual_stop =1 ; } iface->writeNum--; }else { -bfin_write_TWI_XMT_DATA8 (iface->command); -bfin_write_TWI_MASTER_CTL (1 <<6 ); +write_XMT_DATA8 (iface, iface->command); +write_MASTER_CTL (iface,1 <<6 ); } }else {if (iface->readNum >0 && iface->readNum <=255 ) -bfin_write_TWI_MASTER_CTL (iface->readNum <<6 ); +write_MASTER_CTL (iface, + iface->readNum <<6 );else if (iface->readNum >255 ) { -bfin_write_TWI_MASTER_CTL (0xff <<6 ); +write_MASTER_CTL (iface,0xff <<6 ); iface->manual_stop =1 ; }else {del_timer (&iface->timeout_timer);@@ -473,13 +545,13 @@ int bfin_twi_smbus_xfer(struct i2c_adapter *adap, u16 addr, } } } -bfin_write_TWI_INT_MASK (MCOMP |MERR | +write_INT_MASK (iface,MCOMP |MERR | ((iface->read_write ==I2C_SMBUS_READ ) ?RCVSERV :XMTSERV ));SSYNC ();/* Master enable */ -bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () |MEN | +write_MASTER_CTL (iface,read_MASTER_CTL (iface) |MEN | ((iface->read_write ==I2C_SMBUS_READ ) ?MDIR :0 ) | ((CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ >100 ) ?FAST :0 ));break ;@@ -514,10 +586,10 @@ static struct i2c_algorithm bfin_twi_algorithm = {static int i2c_bfin_twi_suspend (struct platform_device *dev,pm_message_t state) { -/* struct bfin_twi_iface *iface = platform_get_drvdata(dev);*/ +struct bfin_twi_iface *iface =platform_get_drvdata (dev);/* Disable TWI */ -bfin_write_TWI_CONTROL (bfin_read_TWI_CONTROL () & ~TWI_ENA ); +write_CONTROL (iface,read_CONTROL (iface) & ~TWI_ENA );SSYNC ();return 0 ;@@ -525,64 +597,106 @@ static int i2c_bfin_twi_suspend(struct platform_device *dev, pm_message_t state)static int i2c_bfin_twi_resume (struct platform_device *dev) { -/* struct bfin_twi_iface *iface = platform_get_drvdata(dev);*/ +struct bfin_twi_iface *iface =platform_get_drvdata (dev);
drivers/i2c/busses/i2c-bfin-twi.c static int i2c_bfin_twi_suspend(struct platform_device *dev, pm_message_t state) · line 609
Quoted 10 lines
drivers/i2c/busses/i2c-bfin-twi.c +2
-2/* Enable TWI */ -bfin_write_TWI_CONTROL (bfin_read_TWI_CONTROL () |TWI_ENA ); +write_CONTROL (iface,read_CONTROL (iface) |TWI_ENA );SSYNC ();return 0 ; } -static int i2c_bfin_twi_probe (struct platform_device *dev) +static int i2c_bfin_twi_probe (struct platform_device *pdev)
This change adds some noise to your patch. I'm fine with cleanups but they should go to separate patches, so that the patches that contain real changes are easier to review.
Quoted 26 lines
drivers/i2c/busses/i2c-bfin-twi.c +18
-2{ -struct bfin_twi_iface *iface = &twi_iface; +struct bfin_twi_iface *iface;struct i2c_adapter *p_adap; +struct resource *res;int rc; + iface =kzalloc (sizeof (struct bfin_twi_iface ),GFP_KERNEL ); +if (!iface) { +dev_err (&(pdev->dev),"Cannot allocate memory\n" ); + rc = -ENOMEM ; + goto out_error_nomem; + } +spin_lock_init (&(iface->lock));init_completion (&(iface->complete)); - iface->irq =IRQ_TWI ; + +/* Find and map our resources */ + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (res ==NULL ) { +dev_err (&(pdev->dev),"Cannot get IORESOURCE_MEM\n" ); + rc = -ENOENT ; + goto out_error_get_res; + } +
drivers/i2c/busses/i2c-bfin-twi.c static int i2c_bfin_twi_suspend(struct platform_device *dev, pm_message_t state) · line 643
Quoted 10 lines
drivers/i2c/busses/i2c-bfin-twi.c +10
-0+ iface->regs_base = (u32 )ioremap (res->start, (res->end - res->start)+1 ); +if (!iface->regs_base) { +dev_err (&(pdev->dev),"Cannot map IO\n" ); + rc = -ENXIO ; + goto out_error_ioremap; + } + + iface->irq =platform_get_irq (pdev,0 ); +if (iface->irq <0 ) { +dev_err (&(pdev->dev),"No DMA channel specified\n" );
DMA? You mean IRQ.
drivers/i2c/busses/i2c-bfin-twi.c static int i2c_bfin_twi_suspend(struct platform_device *dev, pm_message_t state) · line 652
Quoted 12 lines
drivers/i2c/busses/i2c-bfin-twi.c +4
-3+ rc = -ENOENT ; + goto out_error_no_irq; + }init_timer (&(iface->timeout_timer)); iface->timeout_timer.function = bfin_twi_timeout; iface->timeout_timer.data = (unsigned long )iface; - p_adap = &iface->adap; - p_adap->id =I2C_HW_BLACKFIN ; -strlcpy (p_adap->name, dev->name,sizeof (p_adap->name)); + p_adap = &(iface->adap);
This change is a no-op.
drivers/i2c/busses/i2c-bfin-twi.c static int i2c_bfin_twi_suspend(struct platform_device *dev, pm_message_t state) · line 653
Quoted 1 line
drivers/i2c/busses/i2c-bfin-twi.c +1
-0+ p_adap->id =I2C_HW_B_BLACKFIN ;
And this one breaks the build.
Quoted 34 lines
drivers/i2c/busses/i2c-bfin-twi.c +10
-8+strlcpy (p_adap->name, pdev->name,sizeof (p_adap->name)); p_adap->algo = &bfin_twi_algorithm; p_adap->algo_data = iface; p_adap->class =I2C_CLASS_ALL ; - p_adap->dev.parent = &dev->dev; + p_adap->dev.parent = &pdev->dev; rc =request_irq (iface->irq, bfin_twi_interrupt_entry, -IRQF_DISABLED , dev->name, iface); +IRQF_DISABLED , pdev->name, iface);if (rc) { -dev_err (&(p_adap->dev),"i2c-bfin-twi: can't get IRQ %d !\n" , +dev_err (&(pdev->dev),"i2c-bfin-twi: can't get IRQ %d !\n" , iface->irq); -return -ENODEV ; + rc = -ENODEV ; + goto out_error_req_irq; }/* Set TWI internal clock as 10MHz */ -bfin_write_TWI_CONTROL (((get_sclk () /1024 /1024 +5 ) /10 ) &0x7F ); +write_CONTROL (iface, ((get_sclk () /1024 /1024 +5 ) /10 ) &0x7F );/* Set Twi interface clock as specified */ -bfin_write_TWI_CLKDIV (((5 *1024 /CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ ) - <<8 ) | ((5 *1024 /CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ ) +write_CLKDIV (iface, ((5 *1024 /CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ ) + <<8 ) | ((5 *1024 /CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ ) &0xFF ));/* Enable TWI */ -bfin_write_TWI_CONTROL (bfin_read_TWI_CONTROL () |TWI_ENA ); +write_CONTROL (iface,read_CONTROL (iface) |TWI_ENA );SSYNC ();
drivers/i2c/busses/i2c-bfin-twi.c static int i2c_bfin_twi_suspend(struct platform_device *dev, pm_message_t state) · line 688
Quoted 10 lines
drivers/i2c/busses/i2c-bfin-twi.c +4
-1rc =i2c_add_adapter (p_adap);if (rc <0 )free_irq (iface->irq, iface);else -platform_set_drvdata (dev, iface); +platform_set_drvdata (pdev, iface); + +dev_info (&(pdev->dev),"Blackfin I2C TWI driver, regs_base @ 0x%08x\n" , + iface->regs_base);
What you advertise here is a device, not the driver itself.
Quoted 23 lines
drivers/i2c/busses/i2c-bfin-twi.c +9
-2return rc; + +out_error_req_irq: +out_error_no_irq: +iounmap ((void *)iface->regs_base); +out_error_ioremap: +out_error_get_res: +kfree (iface); +out_error_nomem: +return rc; }static int i2c_bfin_twi_remove (struct platform_device *pdev)@@ -610,8 +724,6 @@ static struct platform_driver i2c_bfin_twi_driver = {static int __init i2c_bfin_twi_init (void ) { -pr_info ("I2C: Blackfin I2C TWI driver\n" ); -return platform_driver_register (&i2c_bfin_twi_driver); }
Signature · 1 line
Jean Delvare
PATCH 2/2 Blackfin I2C/TWI driver: add missing pin mux operation
In reply to Bryan Wu--- drivers/i2c/busses/i2c-bfin-twi.c | 49 ++++++++++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 11 deletions(-)
drivers/i2c/busses/i2c-bfin-twi.c +38 -11
@@ -38,8 +38,18 @@#include <linux/platform_device.h> #include <asm/blackfin.h> +#include <asm/portmux.h> #include <asm/irq.h> +#define DRV_NAME "i2c-bfin-twi" +#define DRV_AUTHOR "Sonic Zhang, Bryan Wu" +#define DRV_DESC "Blackfin BF5xx on-chip I2C TWI Contoller Driver" +#define DRV_VERSION "1.8" + +MODULE_AUTHOR (DRV_AUTHOR ); +MODULE_DESCRIPTION (DRV_DESC ); +MODULE_LICENSE ("GPL" ); +#define POLL_TIMEOUT (2 * HZ)/* SMBus mode*/
@@ -67,6 +77,7 @@ struct bfin_twi_iface {int msg_num;int cur_msg;u32 regs_base; +int bus_num; };
@@ -93,6 +104,24 @@ DEFINE_TWI_REG(XMT_DATA16, 0x84) DEFINE_TWI_REG(RCV_DATA8, 0x88) DEFINE_TWI_REG(RCV_DATA16, 0x8C) +static int setup_pin_mux (int action,struct bfin_twi_iface *iface) +{ + +u16 pin_req[2 ][3 ] = { + {P_TWI0_SCL ,P_TWI0_SDA ,0 }, + {P_TWI1_SCL ,P_TWI1_SDA ,0 }, + }; + +if (action) { +if (peripheral_request_list (pin_req[iface->bus_num],DRV_NAME )) +return -EFAULT ; + }else { +peripheral_free_list (pin_req[iface->bus_num]); + } + +return 0 ; +} +static void bfin_twi_handle_interrupt (struct bfin_twi_iface *iface) {unsigned short twi_int_status =read_INT_STAT (iface);
@@ -310,8 +339,7 @@ static int bfin_twi_master_xfer(struct i2c_adapter *adap, pmsg = &msgs[0 ];if (pmsg->flags &I2C_M_TEN ) { -dev_err (&(adap->dev),"i2c-bfin-twi: 10 bits addr " -"not supported !\n" ); +dev_err (&(adap->dev),"10 bits addr not supported !\n" );return -EINVAL ; }
@@ -645,6 +673,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev) goto out_error_no_irq; } + iface->bus_num = pdev->id;init_timer (&(iface->timeout_timer)); iface->timeout_timer.function = bfin_twi_timeout; iface->timeout_timer.data = (unsigned long )iface;
@@ -657,11 +686,12 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev) p_adap->class =I2C_CLASS_ALL ; p_adap->dev.parent = &pdev->dev; +setup_pin_mux (1 , iface); + rc =request_irq (iface->irq, bfin_twi_interrupt_entry,IRQF_DISABLED , pdev->name, iface);if (rc) { -dev_err (&(pdev->dev),"i2c-bfin-twi: can't get IRQ %d !\n" , - iface->irq); +dev_err (&(pdev->dev),"can't get IRQ %d !\n" , iface->irq); rc = -ENODEV ; goto out_error_req_irq; }
@@ -684,8 +714,8 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)else platform_set_drvdata (pdev, iface); -dev_info (&(pdev->dev),"Blackfin I2C TWI driver, regs_base @ 0x%08x\n" , - iface->regs_base); +dev_info (&(pdev->dev),"%s, Version %s, regs_base@0x%08x\n" , +DRV_DESC ,DRV_VERSION , iface->regs_base);return rc;
@@ -707,6 +737,7 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev)i2c_del_adapter (&(iface->adap));free_irq (iface->irq, iface); +setup_pin_mux (0 , iface);return 0 ; }
@@ -717,7 +748,7 @@ static struct platform_driver i2c_bfin_twi_driver = { .suspend = i2c_bfin_twi_suspend, .resume = i2c_bfin_twi_resume, .driver = { - .name = "i2c-bfin-twi", + .name = DRV_NAME, .owner = THIS_MODULE, }, };
@@ -732,9 +763,5 @@ static void __exit i2c_bfin_twi_exit(void)platform_driver_unregister (&i2c_bfin_twi_driver); } -MODULE_AUTHOR ("Sonic Zhang <[email protected]>" ); -MODULE_DESCRIPTION ("I2C-Bus adapter routines for Blackfin TWI" ); -MODULE_LICENSE ("GPL" ); -module_init (i2c_bfin_twi_init);module_exit (i2c_bfin_twi_exit);
Signature · 1 line
1.5.3.4
Re: [PATCH 2/2] Blackfin I2C/TWI driver: add missing pin mux operation
On Tue, 30 Oct 2007 17:33:17 +0800, Bryan Wu wrote:
Please include a description of the bug your patch is fixing. "missing pin mux operation" doesn't tell me much.
Quoted 15 lines
Signed-off-by Bryan Wu <[email protected]>--- drivers/i2c/busses/i2c-bfin-twi.c | 49 ++++++++++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 11 deletions(-)drivers/i2c/busses/i2c-bfin-twi.c +1
-0@@ -38,8 +38,18 @@#include <linux/platform_device.h> #include <asm/blackfin.h> +#include <asm/portmux.h> #include <asm/irq.h>
drivers/i2c/busses/i2c-bfin-twi.c line 52
Quoted 10 lines
drivers/i2c/busses/i2c-bfin-twi.c +9
-0+#define DRV_NAME "i2c-bfin-twi" +#define DRV_AUTHOR "Sonic Zhang, Bryan Wu" +#define DRV_DESC "Blackfin BF5xx on-chip I2C TWI Contoller Driver" +#define DRV_VERSION "1.8" + +MODULE_AUTHOR (DRV_AUTHOR ); +MODULE_DESCRIPTION (DRV_DESC ); +MODULE_LICENSE ("GPL" ); +
I pretty much doubt that these changes have anything to do with the bug you're fixing -> separate patch please.
Quoted 12 lines
drivers/i2c/busses/i2c-bfin-twi.c +1
-0#define POLL_TIMEOUT (2 * HZ)/* SMBus mode*/ @@ -67,6 +77,7 @@ struct bfin_twi_iface {int msg_num;int cur_msg;u32 regs_base; +int bus_num; };
drivers/i2c/busses/i2c-bfin-twi.c DEFINE_TWI_REG(XMT_DATA16, 0x84) · line 110
Quoted 7 lines
drivers/i2c/busses/i2c-bfin-twi.c +4
-0@@ -93,6 +104,24 @@ DEFINE_TWI_REG(XMT_DATA16, 0x84) DEFINE_TWI_REG(RCV_DATA8, 0x88) DEFINE_TWI_REG(RCV_DATA16, 0x8C) +static int setup_pin_mux (int action,struct bfin_twi_iface *iface) +{ + +u16 pin_req[2 ][3 ] = {
Could be declared const?
Quoted 18 lines
drivers/i2c/busses/i2c-bfin-twi.c +14
-0+ {P_TWI0_SCL, P_TWI0_SDA, 0}, + {P_TWI1_SCL, P_TWI1_SDA, 0}, + }; + +if (action) { +if (peripheral_request_list (pin_req[iface->bus_num],DRV_NAME )) +return -EFAULT ; + }else { +peripheral_free_list (pin_req[iface->bus_num]); + } + +return 0 ; +} +static void bfin_twi_handle_interrupt (struct bfin_twi_iface *iface) {unsigned short twi_int_status =read_INT_STAT (iface);
drivers/i2c/busses/i2c-bfin-twi.c static int bfin_twi_master_xfer(struct i2c_adapter *adap, · line 342
Quoted 6 lines
drivers/i2c/busses/i2c-bfin-twi.c +1
-2@@ -310,8 +339,7 @@ static int bfin_twi_master_xfer(struct i2c_adapter *adap, pmsg = &msgs[0 ];if (pmsg->flags &I2C_M_TEN ) { -dev_err (&(adap->dev),"i2c-bfin-twi: 10 bits addr " -"not supported !\n" ); +dev_err (&(adap->dev),"10 bits addr not supported !\n" );
You're fixing an error introduced by the previous patch, please fix it in the original patch instead.
Quoted 64 lines
drivers/i2c/busses/i2c-bfin-twi.c +8
-9return -EINVAL ; }@@ -645,6 +673,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev) goto out_error_no_irq; } + iface->bus_num = pdev->id;init_timer (&(iface->timeout_timer)); iface->timeout_timer.function = bfin_twi_timeout; iface->timeout_timer.data = (unsigned long )iface;@@ -657,11 +686,12 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev) p_adap->class =I2C_CLASS_ALL ; p_adap->dev.parent = &pdev->dev; +setup_pin_mux (1 , iface); + rc =request_irq (iface->irq, bfin_twi_interrupt_entry,IRQF_DISABLED , pdev->name, iface);if (rc) { -dev_err (&(pdev->dev),"i2c-bfin-twi: can't get IRQ %d !\n" , - iface->irq); +dev_err (&(pdev->dev),"can't get IRQ %d !\n" , iface->irq); rc = -ENODEV ; goto out_error_req_irq; }@@ -684,8 +714,8 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)else platform_set_drvdata (pdev, iface); -dev_info (&(pdev->dev),"Blackfin I2C TWI driver, regs_base @ 0x%08x\n" , - iface->regs_base); +dev_info (&(pdev->dev),"%s, Version %s, regs_base@0x%08x\n" , +DRV_DESC ,DRV_VERSION , iface->regs_base);return rc;@@ -707,6 +737,7 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev)i2c_del_adapter (&(iface->adap));free_irq (iface->irq, iface); +setup_pin_mux (0 , iface);return 0 ; }@@ -717,7 +748,7 @@ static struct platform_driver i2c_bfin_twi_driver = { .suspend = i2c_bfin_twi_suspend, .resume = i2c_bfin_twi_resume, .driver = { - .name = "i2c-bfin-twi", + .name = DRV_NAME, .owner = THIS_MODULE, }, };@@ -732,9 +763,5 @@ static void __exit i2c_bfin_twi_exit(void)platform_driver_unregister (&i2c_bfin_twi_driver); } -MODULE_AUTHOR ("Sonic Zhang <[email protected]>" ); -MODULE_DESCRIPTION ("I2C-Bus adapter routines for Blackfin TWI" ); -MODULE_LICENSE ("GPL" ); -module_init (i2c_bfin_twi_init);module_exit (i2c_bfin_twi_exit);
Signature · 1 line
Jean Delvare
Re: [PATCH 2/2] Blackfin I2C/TWI driver: add missing pin mux operation
In reply to Bryan Wudrivers/i2c/busses/i2c-bfin-twi.c DEFINE_TWI_REG(XMT_DATA16, 0x84) · line 113
Quoted 9 lines · Bryan Wu
drivers/i2c/busses/i2c-bfin-twi.c +7
-0+static int setup_pin_mux (int action,struct bfin_twi_iface *iface) +{ + +u16 pin_req[2 ][3 ] = { + {P_TWI0_SCL ,P_TWI0_SDA ,0 }, + {P_TWI1_SCL ,P_TWI1_SDA ,0 }, + };
might be better to have this in the boards file ... consider the scenario on the BF54x where the user wants to use I2C0 and not I2C1 or vice versa so that they can use the set of pins for something else ... this would prevent such a setup
drivers/i2c/busses/i2c-bfin-twi.c DEFINE_TWI_REG(XMT_DATA16, 0x84) · line 123
Quoted 9 lines
drivers/i2c/busses/i2c-bfin-twi.c +9
-0+if (action) { +if (peripheral_request_list (pin_req[iface->bus_num],DRV_NAME )) +return -EFAULT ; + }else { +peripheral_free_list (pin_req[iface->bus_num]); + } + +return 0 ; +}
EFAULT is incorrect i think ... want to pass back the actual value from peripheral_request_list()
drivers/i2c/busses/i2c-bfin-twi.c DEFINE_TWI_REG(XMT_DATA16, 0x84) · line 113
Quoted 9 lines
drivers/i2c/busses/i2c-bfin-twi.c +7
-0+static int setup_pin_mux (int action,struct bfin_twi_iface *iface) +{ + +u16 pin_req[2 ][3 ] = { + {P_TWI0_SCL ,P_TWI0_SDA ,0 }, + {P_TWI1_SCL ,P_TWI1_SDA ,0 }, + };
might be better to have this in the boards file ... consider the scenario on the BF54x where the user wants to use I2C0 and not I2C1 or vice versa so that they can use the set of pins for something else ... this would prevent such a setup
if (action)
return peripheral_request_list(pin_req[iface->bus_num],
DRV_NAME);
else
peripheral_free_list(pin_req[iface->bus_num]);
return 0;-mike
Re: [PATCH 2/2] Blackfin I2C/TWI driver: add missing pin mux operation
Quoted 16 lines · Mike Frysinger
drivers/i2c/busses/i2c-bfin-twi.c DEFINE_TWI_REG(XMT_DATA16, 0x84) · line 113
Quoted 9 lines · Bryan Wu
drivers/i2c/busses/i2c-bfin-twi.c +7
-0+static int setup_pin_mux (int action,struct bfin_twi_iface *iface) +{ + +u16 pin_req[2 ][3 ] = { + {P_TWI0_SCL ,P_TWI0_SDA ,0 }, + {P_TWI1_SCL ,P_TWI1_SDA ,0 }, + };might be better to have this in the boards file ... consider the scenario on the BF54x where the user wants to use I2C0 and not I2C1 or vice versa so that they can use the set of pins for something else ... this would prevent such a setup
Yes, I plan to use new style I2C driver interface as Jean suggested before. The whole hard coded pin_req list can be passed to the i2c-bfin-twi.c dynamically.
Quoted 4 lines
Quoted 4 lines
drivers/i2c/busses/i2c-bfin-twi.c +4
-0+if (action) { +if (peripheral_request_list (pin_req[iface->bus_num],DRV_NAME )) +return -EFAULT ; + }else {
Quoted 9 lines
drivers/i2c/busses/i2c-bfin-twi.c DEFINE_TWI_REG(XMT_DATA16, 0x84) · line 123
Quoted 5 lines
drivers/i2c/busses/i2c-bfin-twi.c +5
-0+peripheral_free_list (pin_req[iface->bus_num]); + } + +return 0 ; +}EFAULT is incorrect i think ... want to pass back the actual value from
peripheral_request_list()
It will be removed in the new style interface.
Quoted 29 lines
drivers/i2c/busses/i2c-bfin-twi.c DEFINE_TWI_REG(XMT_DATA16, 0x84) · line 113
Quoted 9 lines
drivers/i2c/busses/i2c-bfin-twi.c +7
-0+static int setup_pin_mux (int action,struct bfin_twi_iface *iface) +{ + +u16 pin_req[2 ][3 ] = { + {P_TWI0_SCL ,P_TWI0_SDA ,0 }, + {P_TWI1_SCL ,P_TWI1_SDA ,0 }, + };might be better to have this in the boards file ... consider the scenario on the BF54x where the user wants to use I2C0 and not I2C1 or vice versa so that they can use the set of pins for something else ... this would prevent such a setup
if (action) return peripheral_request_list(pin_req[iface->bus_num], DRV_NAME); else peripheral_free_list(pin_req[iface->bus_num]); return 0;(quoted diff) +0
-2-mike -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/