Blackfin I2C TWI driver updates for 2.6.24
cover Blackfin I2C TWI driver updates for 2.6.24
- BF54x multiport supports
- bug fixing
PATCH 1/2 Blackfin I2C/TWI driver: Add repeat start feature to avoid break of a bundle of i2c master xfer operation.
From: Sonic Zhang <[email protected]>
Create a new mode TWI_I2C_MODE_REPEAT.
No change to smbus operation.
Signed-off-by Sonic Zhang <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
--- drivers/i2c/busses/i2c-bfin-twi.c | 180 +++++++++++++++++++++++-------------- 1 files changed, 112 insertions(+), 68 deletions(-)
drivers/i2c/busses/i2c-bfin-twi.c +112 -68
@@ -42,6 +42,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 {struct mutex twi_lock;
@@ -59,6 +60,9 @@ 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; };static struct bfin_twi_iface twi_iface;
@@ -77,12 +81,16 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface)/* start receive immediately after complete sending in * combine mode. */ - else if (iface->cur_mode == TWI_I2C_MODE_COMBINED) { + 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) + else if (iface->manual_stop) bfin_write_TWI_MASTER_CTL(bfin_read_TWI_MASTER_CTL() | STOP); + else if (iface->cur_mode == TWI_I2C_MODE_REPEAT && + iface->cur_msg+1 < iface->msg_num) + bfin_write_TWI_MASTER_CTL(bfin_read_TWI_MASTER_CTL() + | RSTART);SSYNC ();/* Clear status */ bfin_write_TWI_INT_STAT (XMTSERV );
@@ -109,6 +117,11 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface)bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () |STOP );SSYNC (); + }else if (iface->cur_mode ==TWI_I2C_MODE_REPEAT && + iface->cur_msg+1 < iface->msg_num) { +bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () + |RSTART ); +SSYNC (); }/* Clear interrupt source */ bfin_write_TWI_INT_STAT (RCVSERV );
@@ -120,7 +133,7 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface)bfin_write_TWI_MASTER_STAT (0x3e );bfin_write_TWI_MASTER_CTL (0 );SSYNC (); - iface->result =-1 ; + iface->result = -EIO ;/* if both err and complete int stats are set, return proper * results. */
@@ -171,6 +184,42 @@ static void bfin_twi_handle_interrupt(struct bfin_twi_iface *iface)bfin_write_TWI_MASTER_CTL (bfin_read_TWI_MASTER_CTL () |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 */ +bfin_write_TWI_MASTER_ADDR ( + 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 ) { +bfin_write_TWI_XMT_DATA8 ( + *(iface->transPtr++)); + iface->writeNum--; +SSYNC (); + } + } + +if (iface->pmsg[iface->cur_msg].len <=255 ) +bfin_write_TWI_MASTER_CTL ( + iface->pmsg[iface->cur_msg].len <<6 ); +else if (iface->pmsg[iface->cur_msg].len >255 ) { +bfin_write_TWI_MASTER_CTL (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 | ((iface->read_write ==I2C_SMBUS_READ ) ? +MDIR :0 )); +SSYNC (); }else { iface->result =1 ;bfin_write_TWI_INT_MASK (0 );
@@ -222,7 +271,6 @@ 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 ))
@@ -236,84 +284,80 @@ static int bfin_twi_master_xfer(struct i2c_adapter *adap,mutex_lock (&iface->twi_lock); } - 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->pmsg = msgs; + iface->msg_num = num; + iface->cur_msg =0 ; - 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 (); + pmsg = &msgs[0 ]; +if (pmsg->flags &I2C_M_TEN ) { +dev_err (&(adap->dev),"i2c-bfin-twi: 10 bits addr " +"not supported !\n" ); +return -EINVAL ; + } -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 (); - } + 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 */ +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 (); + +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 (); } + } -/* clear int stat */ -bfin_write_TWI_INT_STAT (MERR |MCOMP |XMTSERV |RCVSERV ); +/* clear int stat */ +bfin_write_TWI_INT_STAT (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 */ +bfin_write_TWI_INT_MASK (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 ) +bfin_write_TWI_MASTER_CTL (pmsg->len <<6 ); +else if (pmsg->len >255 ) { +bfin_write_TWI_MASTER_CTL (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 */ +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 (); -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;/* Release mutex */ mutex_unlock (&iface->twi_lock); -return ret; +if (rc ==1 ) +return num; +else +return rc; }/*
Signature · 1 line
1.5.3.4
PATCH 2/2 Blackifn I2C/TWI driver: add platform_resource interface to support multi-port TWI controllers and remove old I2C BF54x porting
In reply to Bryan WuSigned-off-by Bryan Wu <[email protected]>
--- drivers/i2c/busses/Kconfig | 6 +- drivers/i2c/busses/i2c-bfin-twi.c | 246 ++++++++++++++-------- include/asm-blackfin/mach-bf548/cdefBF54x_base.h | 33 --- 3 files changed, 160 insertions(+), 125 deletions(-)
drivers/i2c/busses/Kconfig +3 -3
@@ -92,10 +92,10 @@ config I2C_AU1550 config I2C_BLACKFIN_TWI tristate "Blackfin TWI I2C support" - depends on BF534 || BF536 || BF537 || BF54x + depends on I2C && (BF534 || BF536 || BF537 || BF54x) help This is the TWI I2C device driver for Blackfin 534/536/537/54x. - This driver can also be built as a module. If so, the module + This driver can also be built as a module. If so, the module will be called i2c-bfin-twi. config I2C_BLACKFIN_TWI_CLK_KHZ
@@ -104,7 +104,7 @@ config I2C_BLACKFIN_TWI_CLK_KHZ range 10 400 default 50 help - The unit of the TWI clock is kHz. + The unit of the TWI clock is kilo HZ. config I2C_ELEKTOR tristate "Elektor ISA card"
drivers/i2c/busses/i2c-bfin-twi.c +157 -89
536 lines not on this page · raw message
include/asm-blackfin/mach-bf548/cdefBF54x_base.h +0 -33
@@ -244,39 +244,6 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)#define bfin_read_TWI0_RCV_DATA16 () bfin_read16(TWI0_RCV_DATA16)#define bfin_write_TWI0_RCV_DATA16 (val) bfin_write16(TWI0_RCV_DATA16, val) -#define bfin_read_TWI_CLKDIV () bfin_read16(TWI0_CLKDIV) -#define bfin_write_TWI_CLKDIV (val) bfin_write16(TWI0_CLKDIV, val) -#define bfin_read_TWI_CONTROL () bfin_read16(TWI0_CONTROL) -#define bfin_write_TWI_CONTROL (val) bfin_write16(TWI0_CONTROL, val) -#define bfin_read_TWI_SLAVE_CTRL () bfin_read16(TWI0_SLAVE_CTRL) -#define bfin_write_TWI_SLAVE_CTRL (val) bfin_write16(TWI0_SLAVE_CTRL, val) -#define bfin_read_TWI_SLAVE_STAT () bfin_read16(TWI0_SLAVE_STAT) -#define bfin_write_TWI_SLAVE_STAT (val) bfin_write16(TWI0_SLAVE_STAT, val) -#define bfin_read_TWI_SLAVE_ADDR () bfin_read16(TWI0_SLAVE_ADDR) -#define bfin_write_TWI_SLAVE_ADDR (val) bfin_write16(TWI0_SLAVE_ADDR, val) -#define bfin_read_TWI_MASTER_CTL () bfin_read16(TWI0_MASTER_CTRL) -#define bfin_write_TWI_MASTER_CTL (val) bfin_write16(TWI0_MASTER_CTRL, val) -#define bfin_read_TWI_MASTER_STAT () bfin_read16(TWI0_MASTER_STAT) -#define bfin_write_TWI_MASTER_STAT (val) bfin_write16(TWI0_MASTER_STAT, val) -#define bfin_read_TWI_MASTER_ADDR () bfin_read16(TWI0_MASTER_ADDR) -#define bfin_write_TWI_MASTER_ADDR (val) bfin_write16(TWI0_MASTER_ADDR, val) -#define bfin_read_TWI_INT_STAT () bfin_read16(TWI0_INT_STAT) -#define bfin_write_TWI_INT_STAT (val) bfin_write16(TWI0_INT_STAT, val) -#define bfin_read_TWI_INT_MASK () bfin_read16(TWI0_INT_MASK) -#define bfin_write_TWI_INT_MASK (val) bfin_write16(TWI0_INT_MASK, val) -#define bfin_read_TWI_FIFO_CTL () bfin_read16(TWI0_FIFO_CTRL) -#define bfin_write_TWI_FIFO_CTL (val) bfin_write16(TWI0_FIFO_CTRL, val) -#define bfin_read_TWI_FIFO_STAT () bfin_read16(TWI0_FIFO_STAT) -#define bfin_write_TWI_FIFO_STAT (val) bfin_write16(TWI0_FIFO_STAT, val) -#define bfin_read_TWI_XMT_DATA8 () bfin_read16(TWI0_XMT_DATA8) -#define bfin_write_TWI_XMT_DATA8 (val) bfin_write16(TWI0_XMT_DATA8, val) -#define bfin_read_TWI_XMT_DATA16 () bfin_read16(TWI0_XMT_DATA16) -#define bfin_write_TWI_XMT_DATA16 (val) bfin_write16(TWI0_XMT_DATA16, val) -#define bfin_read_TWI_RCV_DATA8 () bfin_read16(TWI0_RCV_DATA8) -#define bfin_write_TWI_RCV_DATA8 (val) bfin_write16(TWI0_RCV_DATA8, val) -#define bfin_read_TWI_RCV_DATA16 () bfin_read16(TWI0_RCV_DATA16) -#define bfin_write_TWI_RCV_DATA16 (val) bfin_write16(TWI0_RCV_DATA16, val) -/* SPORT0 is not defined in the shared file because it is not available on the ADSP-BF542 and ADSP-BF544 bfin_read_()rocessors */ /* SPORT1 Registers */
Signature · 1 line
1.5.3.4