i2c: add zhaoxin i2c controller driver
v3 cover i2c: add zhaoxin i2c controller driver
Hi Andi, Wolfram,
Due to some corporate and personal delays, I only recently had time to prepare the patch v3. Please kindly review.
In version v2, the patch consists of 2 files.
In version v3, the patch consists of 12 files.
I wish it was a little clearer how I do with it.
Among them, patch 0001-0009 is mainly some format modification and removal of redundancy.
Patch 0010 splits i2c-wmt.c into i2c-wmt-plt.c and i2c-viai2c-common.c. Patch 0011 shows some differences between zhaoxin and wmt. Patch 0012 is the reset driver by zhaoxin's own controller.
Hans Hu (12):
i2c: wmt: Reduce redundant: bus busy check
i2c: wmt: Reduce redundant: wait event complete
i2c: wmt: Reduce redundant: clock mode setting
i2c: wmt: Reduce redundant: REG_CR setting
i2c: wmt: Reduce redundant: function parameter
i2c: wmt: delete .remove_new
i2c: wmt: create wmt_i2c_init for general init
i2c: wmt: rename marcos with prefix WMTI2C_
i2c: wmt: adjust line length to meet style
i2c: wmt: split out common files
i2c: via-common: add zhaoxin platform
i2c: add zhaoxin i2c controller driver
MAINTAINERS | 8 + drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 4 + drivers/i2c/busses/i2c-viai2c-common.c | 246 +++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 79 +++++ drivers/i2c/busses/i2c-wmt-plt.c | 139 ++++++++ drivers/i2c/busses/i2c-wmt.c | 466 ------------------------- drivers/i2c/busses/i2c-zhaoxin-plt.c | 296 ++++++++++++++++ 8 files changed, 782 insertions(+), 466 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-wmt-plt.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c create mode 100644 drivers/i2c/busses/i2c-zhaoxin-plt.c
Signature · 1 line
2.34.1
PATCH v3 1/12 i2c: wmt: Reduce redundant: bus busy check
Put wmt_i2c_wait_bus_not_busy() in a more appropriate place to reduce code redundancy
--- drivers/i2c/busses/i2c-wmt.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-)
drivers/i2c/busses/i2c-wmt.c +7 -12
@@ -128,12 +128,6 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg,unsigned long wait_result;int xfer_len =0 ; -if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c_dev); -if (ret <0 ) -return ret; - } -if (pmsg->len ==0 ) {/* * We still need to run through the while (..) once, so
@@ -219,12 +213,6 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg,unsigned long wait_result;u32 xfer_len =0 ; -if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c_dev); -if (ret <0 ) -return ret; - } - val =readw (i2c_dev->base +REG_CR ); val &= ~CR_TX_END ;writew (val, i2c_dev->base +REG_CR );
@@ -297,11 +285,18 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *pmsg;int i, is_last;int ret =0 ; +struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { is_last = ((i +1 ) == num); pmsg = &msgs[i]; +if (!(pmsg->flags &I2C_M_NOSTART )) { + ret =wmt_i2c_wait_bus_not_busy (i2c_dev); +if (ret <0 ) +return ret; + } +if (pmsg->flags &I2C_M_RD ) ret =wmt_i2c_read (adap, pmsg, is_last);else
Signature · 1 line
2.34.1
Wolfram Sang
AppliedRe: [PATCH v3 01/12] i2c: wmt: Reduce redundant: bus busy check
Quoted 4 lines · Hans Hu
Put
wmt_i2c_wait_bus_not_busy()in a more appropriate place to reduce code redundancySigned-off-by Hans Hu <[email protected]>
Applied to for-next, thanks!
PATCH v3 2/12 i2c: wmt: Reduce redundant: wait event complete
In reply to Hans HuPut the handling of interrupt events in a function class to reduce code redundancy.
--- drivers/i2c/busses/i2c-wmt.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
drivers/i2c/busses/i2c-wmt.c +6 -14
@@ -109,6 +109,12 @@ static int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)static int wmt_check_status (struct wmt_i2c_dev *i2c_dev) {int ret =0 ; +unsigned long wait_result; + + wait_result =wait_for_completion_timeout (&i2c_dev->complete, +msecs_to_jiffies (500 )); +if (!wait_result) +return -ETIMEDOUT ;if (i2c_dev->cmd_status &ISR_NACK_ADDR ) ret = -EIO ;
@@ -125,7 +131,6 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg,struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap);u16 val, tcr_val;int ret; -unsigned long wait_result;int xfer_len =0 ;if (pmsg->len ==0 ) {
@@ -167,12 +172,6 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg, }while (xfer_len < pmsg->len) { - wait_result =wait_for_completion_timeout (&i2c_dev->complete, -msecs_to_jiffies (500 )); - -if (wait_result ==0 ) -return -ETIMEDOUT ; - ret =wmt_check_status (i2c_dev);if (ret)return ret;
@@ -210,7 +209,6 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg,struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap);u16 val, tcr_val;int ret; -unsigned long wait_result;u32 xfer_len =0 ; val =readw (i2c_dev->base +REG_CR );
@@ -251,12 +249,6 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg, }while (xfer_len < pmsg->len) { - wait_result =wait_for_completion_timeout (&i2c_dev->complete, -msecs_to_jiffies (500 )); - -if (!wait_result) -return -ETIMEDOUT ; - ret =wmt_check_status (i2c_dev);if (ret)return ret;
Signature · 1 line
2.34.1
Wolfram Sang
AppliedRe: [PATCH v3 02/12] i2c: wmt: Reduce redundant: wait event complete
Quoted 4 lines · Hans Hu
Put the handling of interrupt events in a function class to reduce code redundancy.
Signed-off-by Hans Hu <[email protected]>
Applied to for-next, thanks!
PATCH v3 3/12 i2c: wmt: Reduce redundant: clock mode setting
In reply to Hans HuThe frequency setting mode is adjusted to reduce the code redundancy, and it is also convenient to share with zhaoxin
--- drivers/i2c/busses/i2c-wmt.c | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-)
drivers/i2c/busses/i2c-wmt.c +7 -21
@@ -74,9 +74,6 @@#define MCR_APB_96M 7#define MCR_APB_166M 12 -#define I2C_MODE_STANDARD 0 -#define I2C_MODE_FAST 1 -#define WMT_I2C_TIMEOUT (msecs_to_jiffies(1000))struct wmt_i2c_dev {
@@ -85,7 +82,7 @@ struct wmt_i2c_dev {struct device *dev;void __iomem *base;struct clk *clk; -int mode; +u16 tcr;int irq;u16 cmd_status; };
@@ -129,7 +126,7 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg, int last) {struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap); -u16 val, tcr_val; +u16 val, tcr_val = i2c_dev->tcr;int ret;int xfer_len =0 ;
@@ -156,11 +153,6 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg,reinit_completion (&i2c_dev->complete); -if (i2c_dev->mode ==I2C_MODE_STANDARD ) - tcr_val =TCR_STANDARD_MODE ; -else - tcr_val =TCR_FAST_MODE ; - tcr_val |= (TCR_MASTER_WRITE | (pmsg->addr &TCR_SLAVE_ADDR_MASK ));writew (tcr_val, i2c_dev->base +REG_TCR );
@@ -207,7 +199,7 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg, int last) {struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap); -u16 val, tcr_val; +u16 val, tcr_val = i2c_dev->tcr;int ret;u32 xfer_len =0 ;
@@ -233,11 +225,6 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg,reinit_completion (&i2c_dev->complete); -if (i2c_dev->mode ==I2C_MODE_STANDARD ) - tcr_val =TCR_STANDARD_MODE ; -else - tcr_val =TCR_FAST_MODE ; - tcr_val |=TCR_MASTER_READ | (pmsg->addr &TCR_SLAVE_ADDR_MASK );writew (tcr_val, i2c_dev->base +REG_TCR );
@@ -346,10 +333,10 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev)readw (i2c_dev->base +REG_CSR );/* read clear */ writew (ISR_WRITE_ALL , i2c_dev->base +REG_ISR ); -if (i2c_dev->mode ==I2C_MODE_STANDARD ) -writew (SCL_TIMEOUT (128 ) |TR_STD , i2c_dev->base +REG_TR ); -else +if (i2c_dev->tcr ==TCR_FAST_MODE )writew (SCL_TIMEOUT (128 ) |TR_HS , i2c_dev->base +REG_TR ); +else +writew (SCL_TIMEOUT (128 ) |TR_STD , i2c_dev->base +REG_TR );return 0 ; }
@@ -382,10 +369,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)return PTR_ERR (i2c_dev->clk); } - i2c_dev->mode =I2C_MODE_STANDARD ; err =of_property_read_u32 (np,"clock-frequency" , &clk_rate);if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) - i2c_dev->mode =I2C_MODE_FAST ; + i2c_dev->tcr =TCR_FAST_MODE ; i2c_dev->dev = &pdev->dev;
Signature · 1 line
2.34.1
Wolfram Sang
AppliedRe: [PATCH v3 03/12] i2c: wmt: Reduce redundant: clock mode setting
Quoted 4 lines · Hans Hu
The frequency setting mode is adjusted to reduce the code redundancy, and it is also convenient to share with zhaoxin
Signed-off-by Hans Hu <[email protected]>
Applied to for-next, thanks!
PATCH v3 4/12 i2c: wmt: Reduce redundant: REG_CR setting
In reply to Hans HuThese Settings for the same register, REG_CR,
can be put together to reduce code redundancy.
--- drivers/i2c/busses/i2c-wmt.c | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-)
drivers/i2c/busses/i2c-wmt.c +9 -26
@@ -144,9 +144,6 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg,if (!(pmsg->flags &I2C_M_NOSTART )) { val =readw (i2c_dev->base +REG_CR ); val &= ~CR_TX_END ; -writew (val, i2c_dev->base +REG_CR ); - - val =readw (i2c_dev->base +REG_CR ); val |=CR_CPU_RDY ;writew (val, i2c_dev->base +REG_CR ); }
@@ -204,24 +201,15 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg,u32 xfer_len =0 ; val =readw (i2c_dev->base +REG_CR ); - val &= ~CR_TX_END ; -writew (val, i2c_dev->base +REG_CR ); + val &= ~(CR_TX_END |CR_TX_NEXT_NO_ACK ); - val =readw (i2c_dev->base +REG_CR ); - val &= ~CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); - -if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +REG_CR ); +if (!(pmsg->flags &I2C_M_NOSTART )) val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); - } -if (pmsg->len ==1 ) { - val =readw (i2c_dev->base +REG_CR ); +if (pmsg->len ==1 ) val |=CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); - } + +writew (val, i2c_dev->base +REG_CR );reinit_completion (&i2c_dev->complete);
@@ -243,15 +231,10 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg, pmsg->buf[xfer_len] =readw (i2c_dev->base +REG_CDR ) >>8 ; xfer_len++; -if (xfer_len == pmsg->len -1 ) { - val =readw (i2c_dev->base +REG_CR ); - val |= (CR_TX_NEXT_NO_ACK |CR_CPU_RDY ); -writew (val, i2c_dev->base +REG_CR ); - }else { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); - } + val =readw (i2c_dev->base +REG_CR ) |CR_CPU_RDY ; +if (xfer_len == pmsg->len -1 ) + val |=CR_TX_NEXT_NO_ACK ; +writew (val, i2c_dev->base +REG_CR ); }return 0 ;
Signature · 1 line
2.34.1
Re: [PATCH v3 04/12] i2c: wmt: Reduce redundant: REG_CR setting
Quoted 4 lines · Hans Hu
These Settings for the same register,
REG_CR,
can be put together to reduce code redundancy.Signed-off-by Hans Hu <[email protected]>
Some registers require that you first write a certain value, and only then can write another value. Have you double checked with datasheets that these register writes can safely be aggregated?
Quoted 71 lines
--- drivers/i2c/busses/i2c-wmt.c | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-)drivers/i2c/busses/i2c-wmt.c +9
-26@@ -144,9 +144,6 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg,if (!(pmsg->flags &I2C_M_NOSTART )) { val =readw (i2c_dev->base +REG_CR ); val &= ~CR_TX_END ; -writew (val, i2c_dev->base +REG_CR ); - - val =readw (i2c_dev->base +REG_CR ); val |=CR_CPU_RDY ;writew (val, i2c_dev->base +REG_CR ); }@@ -204,24 +201,15 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg,u32 xfer_len =0 ; val =readw (i2c_dev->base +REG_CR ); - val &= ~CR_TX_END ; -writew (val, i2c_dev->base +REG_CR ); + val &= ~(CR_TX_END |CR_TX_NEXT_NO_ACK ); - val =readw (i2c_dev->base +REG_CR ); - val &= ~CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); - -if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +REG_CR ); +if (!(pmsg->flags &I2C_M_NOSTART )) val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); - } -if (pmsg->len ==1 ) { - val =readw (i2c_dev->base +REG_CR ); +if (pmsg->len ==1 ) val |=CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); - } + +writew (val, i2c_dev->base +REG_CR );reinit_completion (&i2c_dev->complete);@@ -243,15 +231,10 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg, pmsg->buf[xfer_len] =readw (i2c_dev->base +REG_CDR ) >>8 ; xfer_len++; -if (xfer_len == pmsg->len -1 ) { - val =readw (i2c_dev->base +REG_CR ); - val |= (CR_TX_NEXT_NO_ACK |CR_CPU_RDY ); -writew (val, i2c_dev->base +REG_CR ); - }else { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); - } + val =readw (i2c_dev->base +REG_CR ) |CR_CPU_RDY ; +if (xfer_len == pmsg->len -1 ) + val |=CR_TX_NEXT_NO_ACK ; +writew (val, i2c_dev->base +REG_CR ); }return 0 ;Signature · 1 line
2.34.1
Wolfram Sang
AppliedRe: [PATCH v3 04/12] i2c: wmt: Reduce redundant: REG_CR setting
Quoted 9 lines · Wolfram Sang
Quoted 4 lines · Hans Hu
These Settings for the same register,
REG_CR,
can be put together to reduce code redundancy.Signed-off-by Hans Hu <[email protected]>Some registers require that you first write a certain value, and only then can write another value. Have you double checked with datasheets that these register writes can safely be aggregated?
I found a WM8505 datasheet and it doesn't say anything about consecutive writes. And it works on your hardware.
Applied to for-next, thanks!
PATCH v3 5/12 i2c: wmt: Reduce redundant: function parameter
In reply to Hans HuUse more appropriate parameter passing to reduce the amount of code
--- drivers/i2c/busses/i2c-wmt.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/i2c/busses/i2c-wmt.c +5 -10
@@ -122,10 +122,9 @@ static int wmt_check_status(struct wmt_i2c_dev *i2c_dev)return ret; } -static int wmt_i2c_write (struct i2c_adapter *adap,struct i2c_msg *pmsg, +static int wmt_i2c_write (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg,int last) { -struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap);u16 val, tcr_val = i2c_dev->tcr;int ret;int xfer_len =0 ;
@@ -192,10 +191,8 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg,return 0 ; } -static int wmt_i2c_read (struct i2c_adapter *adap,struct i2c_msg *pmsg, -int last) +static int wmt_i2c_read (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg) { -struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap);u16 val, tcr_val = i2c_dev->tcr;int ret;u32 xfer_len =0 ;
@@ -245,13 +242,11 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap, int num) {struct i2c_msg *pmsg; -int i, is_last; +int i;int ret =0 ;struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { - is_last = ((i +1 ) == num); - pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) { ret =wmt_i2c_wait_bus_not_busy (i2c_dev);
@@ -260,9 +255,9 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap, }if (pmsg->flags &I2C_M_RD ) - ret =wmt_i2c_read (adap, pmsg, is_last); + ret =wmt_i2c_read (i2c_dev, pmsg);else - ret =wmt_i2c_write (adap, pmsg, is_last); + ret =wmt_i2c_write (i2c_dev, pmsg, (i +1 ) == num); }return (ret <0 ) ? ret : i;
Signature · 1 line
2.34.1
Re: [PATCH v3 05/12] i2c: wmt: Reduce redundant: function parameter
Quoted 4 lines · Hans Hu
Use more appropriate parameter passing to reduce the amount of code
Signed-off-by Hans Hu <[email protected]>---
Because I like most cleanups here: applied to for-next, thanks!
But this patch likely reveals a bug in the driver:
drivers/i2c/busses/i2c-wmt.c static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg, · line 194
Quoted 3 lines
drivers/i2c/busses/i2c-wmt.c +1
-2-static int wmt_i2c_read (struct i2c_adapter *adap,struct i2c_msg *pmsg, -int last) +static int wmt_i2c_read (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg)
It is valid for an I2C transfer, that the last message is a read message. So, instead of dropping it, I think the read function needs to handle 'last' as well.
Because this bug is already present in the driver, and I don't want to make rebasing a next version of this series too difficult, I argue that we fix it after your changes are included.
Happy hacking!
PATCH v3 6/12 i2c: wmt: delete .remove_new
In reply to Hans Huuse API devm_i2c_add_adapter instead of i2c_add_adapter, remove callback remove_new.
--- drivers/i2c/busses/i2c-wmt.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)
drivers/i2c/busses/i2c-wmt.c +1 -16
@@ -376,23 +376,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)return err; } - err =i2c_add_adapter (adap); -if (err) -return err; -platform_set_drvdata (pdev, i2c_dev); -return 0 ; -} - -static void wmt_i2c_remove (struct platform_device *pdev) -{ -struct wmt_i2c_dev *i2c_dev =platform_get_drvdata (pdev); - -/* Disable interrupts, clock and delete adapter */ -writew (0 , i2c_dev->base +REG_IMR ); -clk_disable_unprepare (i2c_dev->clk); -i2c_del_adapter (&i2c_dev->adapter); +return devm_i2c_add_adapter (&pdev->dev, &i2c_dev->adapter); }static const struct of_device_id wmt_i2c_dt_ids[] = {
@@ -402,7 +388,6 @@ static const struct of_device_id wmt_i2c_dt_ids[] = {static struct platform_driver wmt_i2c_driver = { .probe = wmt_i2c_probe, - .remove_new = wmt_i2c_remove, .driver = { .name ="wmt-i2c" , .of_match_table = wmt_i2c_dt_ids,
Signature · 1 line
2.34.1
Re: [PATCH v3 06/12] i2c: wmt: delete .remove_new
drivers/i2c/busses/i2c-wmt.c static int wmt_i2c_probe(struct platform_device *pdev) · line 394
Quoted 4 lines
drivers/i2c/busses/i2c-wmt.c +0
-3-/* Disable interrupts, clock and delete adapter */ -writew (0 , i2c_dev->base +REG_IMR ); -clk_disable_unprepare (i2c_dev->clk);
NACK to this patch. The above lines are very important and need to stay. It is, in fact, very dangerous to use devm_* and to not take care that interrupts are disabled before leaving remove().
I'd suggest to simply drop this patch.
Quoted 16 lines
drivers/i2c/busses/i2c-wmt.c +1
-2-i2c_del_adapter (&i2c_dev->adapter); +return devm_i2c_add_adapter (&pdev->dev, &i2c_dev->adapter); }static const struct of_device_id wmt_i2c_dt_ids[] = {@@ -402,7 +388,6 @@ static const struct of_device_id wmt_i2c_dt_ids[] = {static struct platform_driver wmt_i2c_driver = { .probe = wmt_i2c_probe, - .remove_new = wmt_i2c_remove, .driver = { .name ="wmt-i2c" , .of_match_table = wmt_i2c_dt_ids,Signature · 1 line
2.34.1
PATCH v3 7/12 i2c: wmt: create wmt_i2c_init for general init
In reply to Hans HuSome common initialization actions are put in the function wmt_i2c_init(), which is convenient to share with zhaoxin.
--- drivers/i2c/busses/i2c-wmt.c | 70 ++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 26 deletions(-)
drivers/i2c/busses/i2c-wmt.c +44 -26
@@ -286,6 +286,47 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)return IRQ_HANDLED ; } +int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +{ +int err; +int irq_flags; +struct wmt_i2c_dev *i2c_dev; +struct device_node *np = pdev->dev.of_node; + + i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); +if (!i2c_dev) +return -ENOMEM ; + + i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c_dev->base)) +return PTR_ERR (i2c_dev->base); + +if (np) { + irq_flags =0 ; + i2c_dev->irq =irq_of_parse_and_map (np,0 ); +if (!i2c_dev->irq) +return -EINVAL ; + }else { + irq_flags =IRQF_SHARED ; + i2c_dev->irq =platform_get_irq (pdev,0 ); +if (i2c_dev->irq <0 ) +return i2c_dev->irq; + } + + err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, + irq_flags, pdev->name, i2c_dev); +if (err) +return dev_err_probe (&pdev->dev, err, +"failed to request irq %i\n" , i2c_dev->irq); + + i2c_dev->dev = &pdev->dev; +init_completion (&i2c_dev->complete); +platform_set_drvdata (pdev, i2c_dev); + + *pi2c_dev = i2c_dev; +return 0 ; +} +static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) {int err;
@@ -327,19 +368,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) -return -ENOMEM ; - - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); - - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) { -dev_err (&pdev->dev,"irq missing or invalid\n" ); -return -EINVAL ; - } + err =wmt_i2c_init (pdev, &i2c_dev); +if (err) +return err; i2c_dev->clk =of_clk_get (np,0 );if (IS_ERR (i2c_dev->clk)) {
@@ -351,15 +382,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) i2c_dev->tcr =TCR_FAST_MODE ; - i2c_dev->dev = &pdev->dev; - - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr,0 , -"i2c" , i2c_dev); -if (err) { -dev_err (&pdev->dev,"failed to request irq %i\n" , i2c_dev->irq); -return err; - } - adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name));
@@ -368,16 +390,12 @@ static int wmt_i2c_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; -init_completion (&i2c_dev->complete); - err =wmt_i2c_reset_hardware (i2c_dev);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );return err; } -platform_set_drvdata (pdev, i2c_dev); -return devm_i2c_add_adapter (&pdev->dev, &i2c_dev->adapter); }
Signature · 1 line
2.34.1
Re: [PATCH v3 07/12] i2c: wmt: create wmt_i2c_init for general init
drivers/i2c/busses/i2c-wmt.c static irqreturn_t wmt_i2c_isr(int irq, void *data) · line 313
Quoted 5 lines
drivers/i2c/busses/i2c-wmt.c +4
-0+ irq_flags =IRQF_SHARED ; + i2c_dev->irq =platform_get_irq (pdev,0 ); +if (i2c_dev->irq <0 ) +return i2c_dev->irq;
Doesn't this belong to patch 11 where you introduce the new platform?
Sadly, I can't apply this patch anymore because patch 6 needs to be dropped.
Could you rebase this series on top of my for-next branch once I pushed it out later today? This will have the first cleanups already applied.
Re: [PATCH v3 07/12] i2c: wmt: create wmt_i2c_init for general init
Quoted 6 lines · Wolfram Sang
drivers/i2c/busses/i2c-wmt.c static irqreturn_t wmt_i2c_isr(int irq, void *data) · line 313
Quoted 4 lines
drivers/i2c/busses/i2c-wmt.c +4
-0+ irq_flags =IRQF_SHARED ; + i2c_dev->irq =platform_get_irq (pdev,0 ); +if (i2c_dev->irq <0 ) +return i2c_dev->irq;Doesn't this belong to patch 11 where you introduce the new platform?
Quoted 6 lines
Sadly, I can't apply this patch anymore because patch 6 needs to be dropped.
Could you rebase this series on top of my for-next branch once I pushed it out later today? This will have the first cleanups already applied.
Thanks for your review, I will rebase this series on your last for-next branch.
Re: [PATCH v3 07/12] i2c: wmt: create wmt_i2c_init for general init
Quoted 2 lines
Thanks for your review, I will rebase this series on your last for-next branch.
Thanks, I pushed it now.
PATCH v3 8/12 i2c: wmt: rename marcos with prefix WMTI2C_
In reply to Hans HuTweaked a few formatting things: rename marcos with prefix WMTI2C_
--- drivers/i2c/busses/i2c-wmt.c | 174 +++++++++++++++++------------------ 1 file changed, 87 insertions(+), 87 deletions(-)
drivers/i2c/busses/i2c-wmt.c +87 -87
@@ -20,59 +20,59 @@#include <linux/of_irq.h> #include <linux/platform_device.h> -#define REG_CR 0x00 -#define REG_TCR 0x02 -#define REG_CSR 0x04 -#define REG_ISR 0x06 -#define REG_IMR 0x08 -#define REG_CDR 0x0A -#define REG_TR 0x0C -#define REG_MCR 0x0E -#define REG_SLAVE_CR 0x10 -#define REG_SLAVE_SR 0x12 -#define REG_SLAVE_ISR 0x14 -#define REG_SLAVE_IMR 0x16 -#define REG_SLAVE_DR 0x18 -#define REG_SLAVE_TR 0x1A +#define WMTI2C_REG_CR 0x00 +#define WMTI2C_REG_TCR 0x02 +#define WMTI2C_REG_CSR 0x04 +#define WMTI2C_REG_ISR 0x06 +#define WMTI2C_REG_IMR 0x08 +#define WMTI2C_REG_CDR 0x0A +#define WMTI2C_REG_TR 0x0C +#define WMTI2C_REG_MCR 0x0E +#define WMTI2C_REG_SLAVE_CR 0x10 +#define WMTI2C_REG_SLAVE_SR 0x12 +#define WMTI2C_REG_SLAVE_ISR 0x14 +#define WMTI2C_REG_SLAVE_IMR 0x16 +#define WMTI2C_REG_SLAVE_DR 0x18 +#define WMTI2C_REG_SLAVE_TR 0x1A/* REG_CR Bit fields */ -#define CR_TX_NEXT_ACK 0x0000 -#define CR_ENABLE 0x0001 -#define CR_TX_NEXT_NO_ACK 0x0002 -#define CR_TX_END 0x0004 -#define CR_CPU_RDY 0x0008 -#define SLAV_MODE_SEL 0x8000 +#define WMTI2C_CR_TX_NEXT_ACK 0x0000 +#define WMTI2C_CR_ENABLE 0x0001 +#define WMTI2C_CR_TX_NEXT_NO_ACK 0x0002 +#define WMTI2C_CR_TX_END 0x0004 +#define WMTI2C_CR_CPU_RDY 0x0008 +#define WMTI2C_SLAV_MODE_SEL 0x8000/* REG_TCR Bit fields */ -#define TCR_STANDARD_MODE 0x0000 -#define TCR_MASTER_WRITE 0x0000 -#define TCR_HS_MODE 0x2000 -#define TCR_MASTER_READ 0x4000 -#define TCR_FAST_MODE 0x8000 -#define TCR_SLAVE_ADDR_MASK 0x007F +#define WMTI2C_TCR_STANDARD_MODE 0x0000 +#define WMTI2C_TCR_MASTER_WRITE 0x0000 +#define WMTI2C_TCR_HS_MODE 0x2000 +#define WMTI2C_TCR_MASTER_READ 0x4000 +#define WMTI2C_TCR_FAST_MODE 0x8000 +#define WMTI2C_TCR_SLAVE_ADDR_MASK 0x007F/* REG_ISR Bit fields */ -#define ISR_NACK_ADDR 0x0001 -#define ISR_BYTE_END 0x0002 -#define ISR_SCL_TIMEOUT 0x0004 -#define ISR_WRITE_ALL 0x0007 +#define WMTI2C_ISR_NACK_ADDR 0x0001 +#define WMTI2C_ISR_BYTE_END 0x0002 +#define WMTI2C_ISR_SCL_TIMEOUT 0x0004 +#define WMTI2C_ISR_WRITE_ALL 0x0007/* REG_IMR Bit fields */ -#define IMR_ENABLE_ALL 0x0007 +#define WMTI2C_IMR_ENABLE_ALL 0x0007/* REG_CSR Bit fields */ -#define CSR_RCV_NOT_ACK 0x0001 -#define CSR_RCV_ACK_MASK 0x0001 -#define CSR_READY_MASK 0x0002 +#define WMTI2C_CSR_RCV_NOT_ACK 0x0001 +#define WMTI2C_CSR_RCV_ACK_MASK 0x0001 +#define WMTI2C_CSR_READY_MASK 0x0002/* REG_TR */ -#define SCL_TIMEOUT (x) (((x) & 0xFF) << 8) -#define TR_STD 0x0064 -#define TR_HS 0x0019 +#define WMTI2C_SCL_TIMEOUT (x) (((x) & 0xFF) << 8) +#define WMTI2C_TR_STD 0x0064 +#define WMTI2C_TR_HS 0x0019/* REG_MCR */ -#define MCR_APB_96M 7 -#define MCR_APB_166M 12 +#define WMTI2C_MCR_APB_96M 7 +#define WMTI2C_MCR_APB_166M 12#define WMT_I2C_TIMEOUT (msecs_to_jiffies(1000))
@@ -92,7 +92,7 @@ static int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)unsigned long timeout; timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +REG_CSR ) &CSR_READY_MASK )) { +while (!(readw (i2c_dev->base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) {dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" );return -EBUSY ;
@@ -113,10 +113,10 @@ static int wmt_check_status(struct wmt_i2c_dev *i2c_dev)if (!wait_result)return -ETIMEDOUT ; -if (i2c_dev->cmd_status &ISR_NACK_ADDR ) +if (i2c_dev->cmd_status &WMTI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c_dev->cmd_status &ISR_SCL_TIMEOUT ) +if (i2c_dev->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret;
@@ -135,28 +135,28 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg,* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , i2c_dev->base +REG_CDR ); +writew (0 , i2c_dev->base +WMTI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +WMTI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +REG_CR ); - val &= ~CR_TX_END ; - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val &= ~WMTI2C_CR_TX_END ; + val |=WMTI2C_CR_CPU_RDY ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }reinit_completion (&i2c_dev->complete); - tcr_val |= (TCR_MASTER_WRITE | (pmsg->addr &TCR_SLAVE_ADDR_MASK )); + tcr_val |= (WMTI2C_TCR_MASTER_WRITE | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val |=WMTI2C_CR_CPU_RDY ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) {
@@ -166,25 +166,25 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg, xfer_len++; - val =readw (i2c_dev->base +REG_CSR ); -if ((val &CSR_RCV_ACK_MASK ) ==CSR_RCV_NOT_ACK ) { + val =readw (i2c_dev->base +WMTI2C_REG_CSR ); +if ((val &WMTI2C_CSR_RCV_ACK_MASK ) ==WMTI2C_CSR_RCV_NOT_ACK ) {dev_dbg (i2c_dev->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =CR_TX_END |CR_CPU_RDY |CR_ENABLE ; -writew (val, i2c_dev->base +REG_CR ); + val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE ; +writew (val, i2c_dev->base +WMTI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (CR_ENABLE , i2c_dev->base +REG_CR ); +writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , i2c_dev->base + -REG_CDR ); -writew (CR_CPU_RDY |CR_ENABLE , i2c_dev->base +REG_CR ); +WMTI2C_REG_CDR ); +writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); } }
@@ -197,27 +197,27 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)int ret;u32 xfer_len =0 ; - val =readw (i2c_dev->base +REG_CR ); - val &= ~(CR_TX_END |CR_TX_NEXT_NO_ACK ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val &= ~(WMTI2C_CR_TX_END |WMTI2C_CR_TX_NEXT_NO_ACK );if (!(pmsg->flags &I2C_M_NOSTART )) - val |=CR_CPU_RDY ; + val |=WMTI2C_CR_CPU_RDY ;if (pmsg->len ==1 ) - val |=CR_TX_NEXT_NO_ACK ; + val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); +writew (val, i2c_dev->base +WMTI2C_REG_CR );reinit_completion (&i2c_dev->complete); - tcr_val |=TCR_MASTER_READ | (pmsg->addr &TCR_SLAVE_ADDR_MASK ); + tcr_val |=WMTI2C_TCR_MASTER_READ | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val |=WMTI2C_CR_CPU_RDY ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) {
@@ -225,13 +225,13 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)if (ret)return ret; - pmsg->buf[xfer_len] =readw (i2c_dev->base +REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (i2c_dev->base +WMTI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (i2c_dev->base +REG_CR ) |CR_CPU_RDY ; + val =readw (i2c_dev->base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) - val |=CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); + val |=WMTI2C_CR_TX_NEXT_NO_ACK ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }return 0 ;
@@ -278,8 +278,8 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)struct wmt_i2c_dev *i2c_dev = data;/* save the status and write-clear it */ - i2c_dev->cmd_status =readw (i2c_dev->base +REG_ISR ); -writew (i2c_dev->cmd_status, i2c_dev->base +REG_ISR ); + i2c_dev->cmd_status =readw (i2c_dev->base +WMTI2C_REG_ISR ); +writew (i2c_dev->cmd_status, i2c_dev->base +WMTI2C_REG_ISR );complete (&i2c_dev->complete);
@@ -344,18 +344,18 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev)return err; } -writew (0 , i2c_dev->base +REG_CR ); -writew (MCR_APB_166M , i2c_dev->base +REG_MCR ); -writew (ISR_WRITE_ALL , i2c_dev->base +REG_ISR ); -writew (IMR_ENABLE_ALL , i2c_dev->base +REG_IMR ); -writew (CR_ENABLE , i2c_dev->base +REG_CR ); -readw (i2c_dev->base +REG_CSR );/* read clear */ -writew (ISR_WRITE_ALL , i2c_dev->base +REG_ISR ); +writew (0 , i2c_dev->base +WMTI2C_REG_CR ); +writew (WMTI2C_MCR_APB_166M , i2c_dev->base +WMTI2C_REG_MCR ); +writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); +writew (WMTI2C_IMR_ENABLE_ALL , i2c_dev->base +WMTI2C_REG_IMR ); +writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); +readw (i2c_dev->base +WMTI2C_REG_CSR );/* read clear */ +writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); -if (i2c_dev->tcr ==TCR_FAST_MODE ) -writew (SCL_TIMEOUT (128 ) |TR_HS , i2c_dev->base +REG_TR ); +if (i2c_dev->tcr ==WMTI2C_TCR_FAST_MODE ) +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , i2c_dev->base +WMTI2C_REG_TR );else -writew (SCL_TIMEOUT (128 ) |TR_STD , i2c_dev->base +REG_TR ); +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , i2c_dev->base +WMTI2C_REG_TR );return 0 ; }
@@ -380,7 +380,7 @@ static int wmt_i2c_probe(struct platform_device *pdev) err =of_property_read_u32 (np,"clock-frequency" , &clk_rate);if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) - i2c_dev->tcr =TCR_FAST_MODE ; + i2c_dev->tcr =WMTI2C_TCR_FAST_MODE ; adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);
Signature · 1 line
2.34.1
PATCH v3 9/12 i2c: wmt: adjust line length to meet style
In reply to Hans HuTweaked a few formatting things:
rename wmt_i2c_dev to wmt_i2c, i2c_dev to i2c, etc.
--- drivers/i2c/busses/i2c-wmt.c | 203 ++++++++++++++++++----------------- 1 file changed, 107 insertions(+), 96 deletions(-)
drivers/i2c/busses/i2c-wmt.c +107 -96
@@ -76,7 +76,7 @@#define WMT_I2C_TIMEOUT (msecs_to_jiffies(1000)) -struct wmt_i2c_dev { +struct wmt_i2c {struct i2c_adapter adapter;struct completion complete;struct device *dev;
@@ -87,14 +87,16 @@ struct wmt_i2c_dev {u16 cmd_status; }; -static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c_dev *i2c_dev) +static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c *i2c) {unsigned long timeout; +void __iomem *base = i2c->base; timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) { +while (!(readw (base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) { -dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" ); +dev_warn (i2c->dev, +"timeout waiting for bus ready\n" );return -EBUSY ; }msleep (20 );
@@ -103,31 +105,32 @@ static int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)return 0 ; } -static int wmt_check_status (struct wmt_i2c_dev *i2c_dev) +static int wmt_check_status (struct wmt_i2c *i2c) {int ret =0 ;unsigned long wait_result; - wait_result =wait_for_completion_timeout (&i2c_dev->complete, + wait_result =wait_for_completion_timeout (&i2c->complete,msecs_to_jiffies (500 ));if (!wait_result)return -ETIMEDOUT ; -if (i2c_dev->cmd_status &WMTI2C_ISR_NACK_ADDR ) +if (i2c->cmd_status &WMTI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c_dev->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) +if (i2c->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret; } -static int wmt_i2c_write (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg, +static int wmt_i2c_write (struct wmt_i2c *i2c,struct i2c_msg *pmsg,int last) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;int xfer_len =0 ; +void __iomem *base = i2c->base;if (pmsg->len ==0 ) {/*
@@ -135,69 +138,73 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg,* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , i2c_dev->base +WMTI2C_REG_CDR ); +writew (0 , base +WMTI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +WMTI2C_REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , base +WMTI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val &= ~WMTI2C_CR_TX_END ; val |=WMTI2C_CR_CPU_RDY ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); } -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |= (WMTI2C_TCR_MASTER_WRITE | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); + tcr_val |= (WMTI2C_TCR_MASTER_WRITE + | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); -writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR ); +writew (tcr_val, base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val |=WMTI2C_CR_CPU_RDY ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =wmt_check_status (i2c);if (ret)return ret; xfer_len++; - val =readw (i2c_dev->base +WMTI2C_REG_CSR ); -if ((val &WMTI2C_CSR_RCV_ACK_MASK ) ==WMTI2C_CSR_RCV_NOT_ACK ) { -dev_dbg (i2c_dev->dev,"write RCV NACK error\n" ); + val =readw (base +WMTI2C_REG_CSR ); +if (val &WMTI2C_CSR_RCV_NOT_ACK ) { +dev_dbg (i2c->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); + val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY + |WMTI2C_CR_ENABLE ; +writew (val, base +WMTI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); +writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); }else { -writew (pmsg->buf[xfer_len] &0xFF , i2c_dev->base + -WMTI2C_REG_CDR ); -writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); +writew (pmsg->buf[xfer_len] &0xFF , + base +WMTI2C_REG_CDR ); +writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , + base +WMTI2C_REG_CR ); } }return 0 ; } -static int wmt_i2c_read (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg) +static int wmt_i2c_read (struct wmt_i2c *i2c,struct i2c_msg *pmsg) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;u32 xfer_len =0 ; +void __iomem *base = i2c->base; - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val &= ~(WMTI2C_CR_TX_END |WMTI2C_CR_TX_NEXT_NO_ACK );if (!(pmsg->flags &I2C_M_NOSTART ))
@@ -206,32 +213,33 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)if (pmsg->len ==1 ) val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |=WMTI2C_TCR_MASTER_READ | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); + tcr_val |=WMTI2C_TCR_MASTER_READ + | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); -writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR ); +writew (tcr_val, base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val |=WMTI2C_CR_CPU_RDY ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =wmt_check_status (i2c);if (ret)return ret; - pmsg->buf[xfer_len] =readw (i2c_dev->base +WMTI2C_REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (base +WMTI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (i2c_dev->base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ; + val =readw (base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); }return 0 ;
@@ -244,20 +252,20 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *pmsg;int i;int ret =0 ; -struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap); +struct wmt_i2c *i2c =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c_dev); + ret =wmt_i2c_wait_bus_not_busy (i2c);if (ret <0 )return ret; }if (pmsg->flags &I2C_M_RD ) - ret =wmt_i2c_read (i2c_dev, pmsg); + ret =wmt_i2c_read (i2c, pmsg);else - ret =wmt_i2c_write (i2c_dev, pmsg, (i +1 ) == num); + ret =wmt_i2c_write (i2c, pmsg, (i +1 ) == num); }return (ret <0 ) ? ret : i;
@@ -275,87 +283,90 @@ static const struct i2c_algorithm wmt_i2c_algo = {static irqreturn_t wmt_i2c_isr (int irq,void *data) { -struct wmt_i2c_dev *i2c_dev = data; +struct wmt_i2c *i2c = data;/* save the status and write-clear it */ - i2c_dev->cmd_status =readw (i2c_dev->base +WMTI2C_REG_ISR ); -writew (i2c_dev->cmd_status, i2c_dev->base +WMTI2C_REG_ISR ); + i2c->cmd_status =readw (i2c->base +WMTI2C_REG_ISR ); +writew (i2c->cmd_status, i2c->base +WMTI2C_REG_ISR ); -complete (&i2c_dev->complete); +complete (&i2c->complete);return IRQ_HANDLED ; } -int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c **pi2c) {int err;int irq_flags; -struct wmt_i2c_dev *i2c_dev; +struct wmt_i2c *i2c;struct device_node *np = pdev->dev.of_node; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) + i2c =devm_kzalloc (&pdev->dev,sizeof (*i2c),GFP_KERNEL ); +if (!i2c)return -ENOMEM ; - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); + i2c->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c->base)) +return PTR_ERR (i2c->base);if (np) { irq_flags =0 ; - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq)return -EINVAL ; }else { irq_flags =IRQF_SHARED ; - i2c_dev->irq =platform_get_irq (pdev,0 ); -if (i2c_dev->irq <0 ) -return i2c_dev->irq; + i2c->irq =platform_get_irq (pdev,0 ); +if (i2c->irq <0 ) +return i2c->irq; } - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, - irq_flags, pdev->name, i2c_dev); + err =devm_request_irq (&pdev->dev, i2c->irq, wmt_i2c_isr, + irq_flags, pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err, -"failed to request irq %i\n" , i2c_dev->irq); +"failed to request irq %i\n" , i2c->irq); - i2c_dev->dev = &pdev->dev; -init_completion (&i2c_dev->complete); -platform_set_drvdata (pdev, i2c_dev); + i2c->dev = &pdev->dev; +init_completion (&i2c->complete); +platform_set_drvdata (pdev, i2c); - *pi2c_dev = i2c_dev; + *pi2c = i2c;return 0 ; } -static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) +static int wmt_i2c_reset_hardware (struct wmt_i2c *i2c) {int err; +void __iomem *base = i2c->base; - err =clk_prepare_enable (i2c_dev->clk); + err =clk_prepare_enable (i2c->clk);if (err) { -dev_err (i2c_dev->dev,"failed to enable clock\n" ); +dev_err (i2c->dev,"failed to enable clock\n" );return err; } - err =clk_set_rate (i2c_dev->clk,20000000 ); + err =clk_set_rate (i2c->clk,20000000 );if (err) { -dev_err (i2c_dev->dev,"failed to set clock = 20Mhz\n" ); -clk_disable_unprepare (i2c_dev->clk); +dev_err (i2c->dev,"failed to set clock = 20Mhz\n" ); +clk_disable_unprepare (i2c->clk);return err; } -writew (0 , i2c_dev->base +WMTI2C_REG_CR ); -writew (WMTI2C_MCR_APB_166M , i2c_dev->base +WMTI2C_REG_MCR ); -writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); -writew (WMTI2C_IMR_ENABLE_ALL , i2c_dev->base +WMTI2C_REG_IMR ); -writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); -readw (i2c_dev->base +WMTI2C_REG_CSR );/* read clear */ -writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); - -if (i2c_dev->tcr ==WMTI2C_TCR_FAST_MODE ) -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , i2c_dev->base +WMTI2C_REG_TR ); +writew (0 , base +WMTI2C_REG_CR ); +writew (WMTI2C_MCR_APB_166M , base +WMTI2C_REG_MCR ); +writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); +writew (WMTI2C_IMR_ENABLE_ALL , base +WMTI2C_REG_IMR ); +writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); +readw (base +WMTI2C_REG_CSR );/* read clear */ +writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); + +if (i2c->tcr ==WMTI2C_TCR_FAST_MODE ) +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , + base +WMTI2C_REG_TR );else -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , i2c_dev->base +WMTI2C_REG_TR ); +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , + base +WMTI2C_REG_TR );return 0 ; }
@@ -363,40 +374,40 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev)static int wmt_i2c_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node; -struct wmt_i2c_dev *i2c_dev; +struct wmt_i2c *i2c;struct i2c_adapter *adap;int err;u32 clk_rate; - err =wmt_i2c_init (pdev, &i2c_dev); + err =wmt_i2c_init (pdev, &i2c);if (err)return err; - i2c_dev->clk =of_clk_get (np,0 ); -if (IS_ERR (i2c_dev->clk)) { + i2c->clk =of_clk_get (np,0 ); +if (IS_ERR (i2c->clk)) {dev_err (&pdev->dev,"unable to request clock\n" ); -return PTR_ERR (i2c_dev->clk); +return PTR_ERR (i2c->clk); } err =of_property_read_u32 (np,"clock-frequency" , &clk_rate);if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) - i2c_dev->tcr =WMTI2C_TCR_FAST_MODE ; + i2c->tcr =WMTI2C_TCR_FAST_MODE ; - adap = &i2c_dev->adapter; -i2c_set_adapdata (adap, i2c_dev); + adap = &i2c->adapter; +i2c_set_adapdata (adap, i2c);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name)); adap->owner =THIS_MODULE ; adap->algo = &wmt_i2c_algo; adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; - err =wmt_i2c_reset_hardware (i2c_dev); + err =wmt_i2c_reset_hardware (i2c);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );return err; } -return devm_i2c_add_adapter (&pdev->dev, &i2c_dev->adapter); +return devm_i2c_add_adapter (&pdev->dev, &i2c->adapter); }static const struct of_device_id wmt_i2c_dt_ids[] = {
Signature · 1 line
2.34.1
PATCH v3 10/12 i2c: wmt: split out common files
In reply to Hans HuSince the I2C IP of both wmt and zhaoxin come from VIA, the common driver is named as i2c-viai2c-common.c. Old i2c-wmt.c renamed to i2c-wmt-plt.c.
--- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 232 +++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 72 +++++ drivers/i2c/busses/i2c-wmt-plt.c | 139 ++++++++ drivers/i2c/busses/i2c-wmt.c | 431 ------------------------- 5 files changed, 445 insertions(+), 431 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-wmt-plt.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c
drivers/i2c/busses/Makefile +2 -0
@@ -120,7 +120,9 @@ obj-$(CONFIG_I2C_TEGRA_BPMP) += i2c-tegra-bpmp.o obj-$(CONFIG_I2C_UNIPHIER) += i2c-uniphier.o obj-$(CONFIG_I2C_UNIPHIER_F) += i2c-uniphier-f.o obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o +i2c-wmt-objs := i2c-wmt-plt.o i2c-viai2c-common.o obj-$(CONFIG_I2C_WMT) += i2c-wmt.o + i2c-octeon-objs := i2c-octeon-core.o i2c-octeon-platdrv.o obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o i2c-thunderx-objs := i2c-octeon-core.o i2c-thunderx-pcidrv.o
drivers/i2c/busses/i2c-viai2c-common.c new file +232 -0
232 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-common.h new file +72 -0
72 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt-plt.c new file +139 -0
139 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt.c deleted +0 -431
431 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v3 11/12 i2c: via-common: add zhaoxin platform
In reply to Hans HuThere are some differences between the design of zhaoxin i2c controller and wmt. Use VIAI2C_PLAT_WMT and VIAI2C_PLAT_ZHAOXIN to identify the two platforms.
--- drivers/i2c/busses/i2c-viai2c-common.c | 30 +++++++++++++++++++------- drivers/i2c/busses/i2c-viai2c-common.h | 7 ++++++ 2 files changed, 29 insertions(+), 8 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +22 -8
@@ -15,6 +15,13 @@ int viai2c_wait_bus_ready(struct viai2c *i2c)dev_warn (i2c->dev,"timeout waiting for bus ready\n" );return -EBUSY ; } +if (i2c->platform ==VIAI2C_PLAT_ZHAOXIN ) { +u16 tmp =ioread16 (i2c->base +VIAI2C_REG_CR ); + +iowrite16 (tmp |VIAI2C_CR_END_MASK , + i2c->base +VIAI2C_REG_CR ); + } +msleep (20 ); }
@@ -53,7 +60,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, bool last)writew (pmsg->buf[0 ] &0xFF , base +VIAI2C_REG_CDR ); } -if (!(pmsg->flags &I2C_M_NOSTART )) { +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) { val =readw (base +VIAI2C_REG_CR ); val &= ~VIAI2C_CR_TX_END ; val |=VIAI2C_CR_CPU_RDY ;
@@ -63,7 +70,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, bool last)reinit_completion (&i2c->complete);writew (tcr_val | pmsg->addr, base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && pmsg->flags &I2C_M_NOSTART ) { val =readw (base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, base +VIAI2C_REG_CR );
@@ -92,8 +99,10 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, bool last) }if (xfer_len == pmsg->len) { -if (!last) +if (i2c->platform ==VIAI2C_PLAT_WMT && !last)writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); +else if (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && last) +writeb (VIAI2C_CR_TX_END , base +VIAI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , base +VIAI2C_REG_CDR );
@@ -105,7 +114,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, bool last)return 0 ; } -static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg,bool first) {u16 val, tcr_val = i2c->tcr;u32 xfer_len =0 ;
@@ -114,7 +123,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg) val =readw (base +VIAI2C_REG_CR ); val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END ); -if (!(pmsg->flags &I2C_M_NOSTART )) +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 )
@@ -128,7 +137,8 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if ((i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) + || (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && !first)) { val =readw (base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, base +VIAI2C_REG_CR );
@@ -162,14 +172,15 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i]; -if (!(pmsg->flags &I2C_M_NOSTART )) { +if (!(pmsg->flags &I2C_M_NOSTART ) + && (i2c->platform ==VIAI2C_PLAT_WMT )) { ret =viai2c_wait_bus_ready (i2c);if (ret <0 )return ret; }if (pmsg->flags &I2C_M_RD ) - ret =viai2c_read (i2c, pmsg); + ret =viai2c_read (i2c, pmsg, i ==0 );else ret =viai2c_write (i2c, pmsg, i == (num -1 )); }
@@ -183,6 +194,9 @@ static irqreturn_t viai2c_isr(int irq, void *data)/* save the status and write-clear it */ i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +if (!i2c->cmd_status) +return IRQ_NONE ; +writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR );complete (&i2c->complete);
drivers/i2c/busses/i2c-viai2c-common.h +7 -0
@@ -50,6 +50,7 @@enum {VIAI2C_PLAT_WMT =1 , +VIAI2C_PLAT_ZHAOXIN };struct viai2c {
@@ -62,6 +63,12 @@ struct viai2c {int irq;u16 cmd_status;u8 platform; +u8 addr; +u16 tr; +u16 mcr; +u16 csr; +u8 fstp; +u8 hrv; };int viai2c_wait_bus_ready (struct viai2c *i2c);
Signature · 1 line
2.34.1
PATCH v3 12/12 i2c: add zhaoxin i2c controller driver
In reply to Hans HuAdd Zhaoxin I2C controller driver. It provides the access to the i2c busses, which connects to the touchpad, eeprom, I2S, etc.
Zhaoxin I2C controller has two separate busses, so may accommodate up to two I2C adapters. Those adapters are listed in the ACPI namespace with the "IIC1D17" HID, and probed by a platform driver.
The driver works with IRQ mode, and supports basic I2C features. Flags I2C_AQ_NO_ZERO_LEN and I2C_AQ_COMB_WRITE_THEN_READ are used to limit the unsupported access.
--- MAINTAINERS | 8 + drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-zhaoxin-plt.c | 296 +++++++++++++++++++++++++++ 4 files changed, 316 insertions(+) create mode 100644 drivers/i2c/busses/i2c-zhaoxin-plt.c
MAINTAINERS +8 -0
@@ -9915,6 +9915,14 @@ L: [email protected] F: Documentation/i2c/busses/i2c-ismt.rst F: drivers/i2c/busses/i2c-ismt.c +I2C/SMBUS ZHAOXIN DRIVER +M: Hans Hu <[email protected]> +L: [email protected] +S: Maintained +W: https://www.zhaoxin.com +F: drivers/i2c/busses/i2c-viai2c-common.c +F: drivers/i2c/busses/i2c-zhaoxin.c + I2C/SMBUS STUB DRIVER M: Jean Delvare <[email protected]> L: [email protected]
drivers/i2c/busses/Kconfig +10 -0
@@ -335,6 +335,16 @@ config I2C_VIAPRO if ACPI + config I2C_ZHAOXIN + tristate "Zhaoxin I2C Interface" + depends on PCI || COMPILE_TEST + help + If you say yes to this option, support will be included for the + ZHAOXIN I2C interface + + This driver can also be built as a module. If so, the module + will be called i2c-zhaoxin. + comment "ACPI drivers" config I2C_SCMI
drivers/i2c/busses/Makefile +2 -0
@@ -29,6 +29,8 @@ obj-$(CONFIG_I2C_SIS630) += i2c-sis630.o obj-$(CONFIG_I2C_SIS96X) += i2c-sis96x.o obj-$(CONFIG_I2C_VIA) += i2c-via.o obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o +i2c-zhaoxin-objs := i2c-zhaoxin-plt.o i2c-viai2c-common.o +obj-$(CONFIG_I2C_ZHAOXIN) += i2c-zhaoxin.o # Mac SMBus host controller drivers obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o
drivers/i2c/busses/i2c-zhaoxin-plt.c new file +296 -0
296 lines not on this page · raw message
Signature · 1 line
2.34.1
Hi,
Quoted 1 line
Due to some corporate and personal delays, I only recently had time
Don't worry, we are glad that you are back.
Quoted 1 line
to prepare the patch v3. Please kindly review.
Yes, I will have a look, hopefully soon after the merge window is over. Really cool to see this new version. Most people drop off when I ask them to refactor their new driver to an existing one. But you made it, awesome!
All the best,
Wolfram
v4 cover i2c: add zhaoxin i2c controller driver
In reply to Hans HuIn version v4, the patch consists of 8 files. This version is based on the latest for-next branch, with some adjustments as suggested by Wolfram.
Hans Hu (8):
i2c: wmt: create wmt_i2c_init for general init
i2c: wmt: rename marcos with prefix WMTI2C_
i2c: wmt: adjust line length to meet style
i2c: wmt: split out common files
i2c: wmt: rename with prefix VIAI2C_ and viai2c_
i2c: wmt: fix a bug when thread blocked
i2c: wmt: add platform type VIAI2C_PLAT_WMT
i2c: add zhaoxin i2c controller driver
MAINTAINERS | 8 + drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 4 + drivers/i2c/busses/i2c-viai2c-common.c | 278 +++++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 79 +++++ drivers/i2c/busses/i2c-wmt-plt.c | 139 +++++++++ drivers/i2c/busses/i2c-wmt.c | 417 ------------------------- drivers/i2c/busses/i2c-zhaoxin-plt.c | 299 ++++++++++++++++++ 8 files changed, 817 insertions(+), 417 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-wmt-plt.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c create mode 100644 drivers/i2c/busses/i2c-zhaoxin-plt.c
Signature · 1 line
2.34.1
PATCH v4 1/8 i2c: wmt: create wmt_i2c_init for general init
Some common initialization actions are put in the function wmt_i2c_init(), which is convenient to share with zhaoxin.
--- drivers/i2c/busses/i2c-wmt.c | 67 +++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 31 deletions(-)
drivers/i2c/busses/i2c-wmt.c +36 -31
@@ -286,6 +286,38 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)return IRQ_HANDLED ; } +int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +{ +int err; +struct wmt_i2c_dev *i2c_dev; +struct device_node *np = pdev->dev.of_node; + + i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); +if (!i2c_dev) +return -ENOMEM ; + + i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c_dev->base)) +return PTR_ERR (i2c_dev->base); + + i2c_dev->irq =irq_of_parse_and_map (np,0 ); +if (!i2c_dev->irq) +return -EINVAL ; + + err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, +0 , pdev->name, i2c_dev); +if (err) +return dev_err_probe (&pdev->dev, err, +"failed to request irq %i\n" , i2c_dev->irq); + + i2c_dev->dev = &pdev->dev; +init_completion (&i2c_dev->complete); +platform_set_drvdata (pdev, i2c_dev); + + *pi2c_dev = i2c_dev; +return 0 ; +} +static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) {int err;
@@ -327,19 +359,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) -return -ENOMEM ; - - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); - - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) { -dev_err (&pdev->dev,"irq missing or invalid\n" ); -return -EINVAL ; - } + err =wmt_i2c_init (pdev, &i2c_dev); +if (err) +return err; i2c_dev->clk =of_clk_get (np,0 );if (IS_ERR (i2c_dev->clk)) {
@@ -351,15 +373,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) i2c_dev->tcr =TCR_FAST_MODE ; - i2c_dev->dev = &pdev->dev; - - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr,0 , -"i2c" , i2c_dev); -if (err) { -dev_err (&pdev->dev,"failed to request irq %i\n" , i2c_dev->irq); -return err; - } - adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name));
@@ -368,21 +381,13 @@ static int wmt_i2c_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; -init_completion (&i2c_dev->complete); - err =wmt_i2c_reset_hardware (i2c_dev);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );return err; } - err =i2c_add_adapter (adap); -if (err) -return err; - -platform_set_drvdata (pdev, i2c_dev); - -return 0 ; +return i2c_add_adapter (adap); }static void wmt_i2c_remove (struct platform_device *pdev)
Signature · 1 line
2.34.1
Re: [PATCH v4 1/8] i2c: wmt: create wmt_i2c_init for general init
Quoted 4 lines · Hans Hu
Some common initialization actions are put in the function
wmt_i2c_init(), which is convenient to share with zhaoxin.Signed-off-by Hans Hu <[email protected]>
I get a build error:
CC drivers/i2c/busses/i2c-wmt.odrivers/i2c/busses/i2c-wmt.c:289:5: error: no previous prototype for ‘wmt_i2c_init’ [-Werror=missing-prototypes]
289 | int wmt_i2c_init(struct platform_device *pdev, struct wmt_i2c_dev **pi2c_dev)
| ^~~~~~~~~~~~
Re: [PATCH v4 1/8] i2c: wmt: create wmt_i2c_init for general init
Quoted 11 lines · Wolfram Sang
Quoted 4 lines · Hans Hu
Some common initialization actions are put in the function
wmt_i2c_init(), which is convenient to share with zhaoxin.Signed-off-by Hans Hu <[email protected]>I get a build error:
CC
drivers/i2c/busses/i2c-wmt.odrivers/i2c/busses/i2c-wmt.c:289:5: error: no previous prototype for ‘wmt_i2c_init’ [-Werror=missing-prototypes]
289 | intwmt_i2c_init(struct platform_device *pdev, struct wmt_i2c_dev **pi2c_dev)| ^~~~~~~~~~~~
Sorry, I only checked after the last V4 patch using sparse/cocci/smatch. Fixed V5 will be re-sent within an hour.
PATCH v4 2/8 i2c: wmt: rename marcos with prefix WMTI2C_
In reply to Hans HuTweaked a few formatting things: rename marcos with prefix WMTI2C_
--- drivers/i2c/busses/i2c-wmt.c | 176 +++++++++++++++++------------------ 1 file changed, 88 insertions(+), 88 deletions(-)
drivers/i2c/busses/i2c-wmt.c +88 -88
@@ -20,59 +20,59 @@#include <linux/of_irq.h> #include <linux/platform_device.h> -#define REG_CR 0x00 -#define REG_TCR 0x02 -#define REG_CSR 0x04 -#define REG_ISR 0x06 -#define REG_IMR 0x08 -#define REG_CDR 0x0A -#define REG_TR 0x0C -#define REG_MCR 0x0E -#define REG_SLAVE_CR 0x10 -#define REG_SLAVE_SR 0x12 -#define REG_SLAVE_ISR 0x14 -#define REG_SLAVE_IMR 0x16 -#define REG_SLAVE_DR 0x18 -#define REG_SLAVE_TR 0x1A +#define WMTI2C_REG_CR 0x00 +#define WMTI2C_REG_TCR 0x02 +#define WMTI2C_REG_CSR 0x04 +#define WMTI2C_REG_ISR 0x06 +#define WMTI2C_REG_IMR 0x08 +#define WMTI2C_REG_CDR 0x0A +#define WMTI2C_REG_TR 0x0C +#define WMTI2C_REG_MCR 0x0E +#define WMTI2C_REG_SLAVE_CR 0x10 +#define WMTI2C_REG_SLAVE_SR 0x12 +#define WMTI2C_REG_SLAVE_ISR 0x14 +#define WMTI2C_REG_SLAVE_IMR 0x16 +#define WMTI2C_REG_SLAVE_DR 0x18 +#define WMTI2C_REG_SLAVE_TR 0x1A/* REG_CR Bit fields */ -#define CR_TX_NEXT_ACK 0x0000 -#define CR_ENABLE 0x0001 -#define CR_TX_NEXT_NO_ACK 0x0002 -#define CR_TX_END 0x0004 -#define CR_CPU_RDY 0x0008 -#define SLAV_MODE_SEL 0x8000 +#define WMTI2C_CR_TX_NEXT_ACK 0x0000 +#define WMTI2C_CR_ENABLE 0x0001 +#define WMTI2C_CR_TX_NEXT_NO_ACK 0x0002 +#define WMTI2C_CR_TX_END 0x0004 +#define WMTI2C_CR_CPU_RDY 0x0008 +#define WMTI2C_SLAV_MODE_SEL 0x8000/* REG_TCR Bit fields */ -#define TCR_STANDARD_MODE 0x0000 -#define TCR_MASTER_WRITE 0x0000 -#define TCR_HS_MODE 0x2000 -#define TCR_MASTER_READ 0x4000 -#define TCR_FAST_MODE 0x8000 -#define TCR_SLAVE_ADDR_MASK 0x007F +#define WMTI2C_TCR_STANDARD_MODE 0x0000 +#define WMTI2C_TCR_MASTER_WRITE 0x0000 +#define WMTI2C_TCR_HS_MODE 0x2000 +#define WMTI2C_TCR_MASTER_READ 0x4000 +#define WMTI2C_TCR_FAST_MODE 0x8000 +#define WMTI2C_TCR_SLAVE_ADDR_MASK 0x007F/* REG_ISR Bit fields */ -#define ISR_NACK_ADDR 0x0001 -#define ISR_BYTE_END 0x0002 -#define ISR_SCL_TIMEOUT 0x0004 -#define ISR_WRITE_ALL 0x0007 +#define WMTI2C_ISR_NACK_ADDR 0x0001 +#define WMTI2C_ISR_BYTE_END 0x0002 +#define WMTI2C_ISR_SCL_TIMEOUT 0x0004 +#define WMTI2C_ISR_WRITE_ALL 0x0007/* REG_IMR Bit fields */ -#define IMR_ENABLE_ALL 0x0007 +#define WMTI2C_IMR_ENABLE_ALL 0x0007/* REG_CSR Bit fields */ -#define CSR_RCV_NOT_ACK 0x0001 -#define CSR_RCV_ACK_MASK 0x0001 -#define CSR_READY_MASK 0x0002 +#define WMTI2C_CSR_RCV_NOT_ACK 0x0001 +#define WMTI2C_CSR_RCV_ACK_MASK 0x0001 +#define WMTI2C_CSR_READY_MASK 0x0002/* REG_TR */ -#define SCL_TIMEOUT (x) (((x) & 0xFF) << 8) -#define TR_STD 0x0064 -#define TR_HS 0x0019 +#define WMTI2C_SCL_TIMEOUT (x) (((x) & 0xFF) << 8) +#define WMTI2C_TR_STD 0x0064 +#define WMTI2C_TR_HS 0x0019/* REG_MCR */ -#define MCR_APB_96M 7 -#define MCR_APB_166M 12 +#define WMTI2C_MCR_APB_96M 7 +#define WMTI2C_MCR_APB_166M 12#define WMT_I2C_TIMEOUT (msecs_to_jiffies(1000))
@@ -92,7 +92,7 @@ static int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)unsigned long timeout; timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +REG_CSR ) &CSR_READY_MASK )) { +while (!(readw (i2c_dev->base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) {dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" );return -EBUSY ;
@@ -113,10 +113,10 @@ static int wmt_check_status(struct wmt_i2c_dev *i2c_dev)if (!wait_result)return -ETIMEDOUT ; -if (i2c_dev->cmd_status &ISR_NACK_ADDR ) +if (i2c_dev->cmd_status &WMTI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c_dev->cmd_status &ISR_SCL_TIMEOUT ) +if (i2c_dev->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret;
@@ -135,28 +135,28 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg,* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , i2c_dev->base +REG_CDR ); +writew (0 , i2c_dev->base +WMTI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +WMTI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +REG_CR ); - val &= ~CR_TX_END ; - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val &= ~WMTI2C_CR_TX_END ; + val |=WMTI2C_CR_CPU_RDY ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }reinit_completion (&i2c_dev->complete); - tcr_val |= (TCR_MASTER_WRITE | (pmsg->addr &TCR_SLAVE_ADDR_MASK )); + tcr_val |= (WMTI2C_TCR_MASTER_WRITE | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val |=WMTI2C_CR_CPU_RDY ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) {
@@ -166,25 +166,25 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg, xfer_len++; - val =readw (i2c_dev->base +REG_CSR ); -if ((val &CSR_RCV_ACK_MASK ) ==CSR_RCV_NOT_ACK ) { + val =readw (i2c_dev->base +WMTI2C_REG_CSR ); +if ((val &WMTI2C_CSR_RCV_ACK_MASK ) ==WMTI2C_CSR_RCV_NOT_ACK ) {dev_dbg (i2c_dev->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =CR_TX_END |CR_CPU_RDY |CR_ENABLE ; -writew (val, i2c_dev->base +REG_CR ); + val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE ; +writew (val, i2c_dev->base +WMTI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (CR_ENABLE , i2c_dev->base +REG_CR ); +writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , i2c_dev->base + -REG_CDR ); -writew (CR_CPU_RDY |CR_ENABLE , i2c_dev->base +REG_CR ); +WMTI2C_REG_CDR ); +writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); } }
@@ -197,27 +197,27 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)int ret;u32 xfer_len =0 ; - val =readw (i2c_dev->base +REG_CR ); - val &= ~(CR_TX_END |CR_TX_NEXT_NO_ACK ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val &= ~(WMTI2C_CR_TX_END |WMTI2C_CR_TX_NEXT_NO_ACK );if (!(pmsg->flags &I2C_M_NOSTART )) - val |=CR_CPU_RDY ; + val |=WMTI2C_CR_CPU_RDY ;if (pmsg->len ==1 ) - val |=CR_TX_NEXT_NO_ACK ; + val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); +writew (val, i2c_dev->base +WMTI2C_REG_CR );reinit_completion (&i2c_dev->complete); - tcr_val |=TCR_MASTER_READ | (pmsg->addr &TCR_SLAVE_ADDR_MASK ); + tcr_val |=WMTI2C_TCR_MASTER_READ | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val |=WMTI2C_CR_CPU_RDY ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) {
@@ -225,13 +225,13 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)if (ret)return ret; - pmsg->buf[xfer_len] =readw (i2c_dev->base +REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (i2c_dev->base +WMTI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (i2c_dev->base +REG_CR ) |CR_CPU_RDY ; + val =readw (i2c_dev->base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) - val |=CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); + val |=WMTI2C_CR_TX_NEXT_NO_ACK ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }return 0 ;
@@ -278,8 +278,8 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)struct wmt_i2c_dev *i2c_dev = data;/* save the status and write-clear it */ - i2c_dev->cmd_status =readw (i2c_dev->base +REG_ISR ); -writew (i2c_dev->cmd_status, i2c_dev->base +REG_ISR ); + i2c_dev->cmd_status =readw (i2c_dev->base +WMTI2C_REG_ISR ); +writew (i2c_dev->cmd_status, i2c_dev->base +WMTI2C_REG_ISR );complete (&i2c_dev->complete);
@@ -335,18 +335,18 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev)return err; } -writew (0 , i2c_dev->base +REG_CR ); -writew (MCR_APB_166M , i2c_dev->base +REG_MCR ); -writew (ISR_WRITE_ALL , i2c_dev->base +REG_ISR ); -writew (IMR_ENABLE_ALL , i2c_dev->base +REG_IMR ); -writew (CR_ENABLE , i2c_dev->base +REG_CR ); -readw (i2c_dev->base +REG_CSR );/* read clear */ -writew (ISR_WRITE_ALL , i2c_dev->base +REG_ISR ); +writew (0 , i2c_dev->base +WMTI2C_REG_CR ); +writew (WMTI2C_MCR_APB_166M , i2c_dev->base +WMTI2C_REG_MCR ); +writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); +writew (WMTI2C_IMR_ENABLE_ALL , i2c_dev->base +WMTI2C_REG_IMR ); +writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); +readw (i2c_dev->base +WMTI2C_REG_CSR );/* read clear */ +writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); -if (i2c_dev->tcr ==TCR_FAST_MODE ) -writew (SCL_TIMEOUT (128 ) |TR_HS , i2c_dev->base +REG_TR ); +if (i2c_dev->tcr ==WMTI2C_TCR_FAST_MODE ) +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , i2c_dev->base +WMTI2C_REG_TR );else -writew (SCL_TIMEOUT (128 ) |TR_STD , i2c_dev->base +REG_TR ); +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , i2c_dev->base +WMTI2C_REG_TR );return 0 ; }
@@ -371,7 +371,7 @@ static int wmt_i2c_probe(struct platform_device *pdev) err =of_property_read_u32 (np,"clock-frequency" , &clk_rate);if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) - i2c_dev->tcr =TCR_FAST_MODE ; + i2c_dev->tcr =WMTI2C_TCR_FAST_MODE ; adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);
@@ -395,7 +395,7 @@ static void wmt_i2c_remove(struct platform_device *pdev)struct wmt_i2c_dev *i2c_dev =platform_get_drvdata (pdev);/* Disable interrupts, clock and delete adapter */ -writew (0 , i2c_dev->base +REG_IMR ); +writew (0 , i2c_dev->base +WMTI2C_REG_IMR );clk_disable_unprepare (i2c_dev->clk);i2c_del_adapter (&i2c_dev->adapter); }
Signature · 1 line
2.34.1
PATCH v4 3/8 i2c: wmt: adjust line length to meet style
In reply to Hans HuTweaked a few formatting things:
rename wmt_i2c_dev to wmt_i2c, i2c_dev to i2c, etc.
--- drivers/i2c/busses/i2c-wmt.c | 199 ++++++++++++++++++----------------- 1 file changed, 104 insertions(+), 95 deletions(-)
drivers/i2c/busses/i2c-wmt.c +104 -95
@@ -76,7 +76,7 @@#define WMT_I2C_TIMEOUT (msecs_to_jiffies(1000)) -struct wmt_i2c_dev { +struct wmt_i2c {struct i2c_adapter adapter;struct completion complete;struct device *dev;
@@ -87,14 +87,16 @@ struct wmt_i2c_dev {u16 cmd_status; }; -static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c_dev *i2c_dev) +static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c *i2c) {unsigned long timeout; +void __iomem *base = i2c->base; timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) { +while (!(readw (base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) { -dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" ); +dev_warn (i2c->dev, +"timeout waiting for bus ready\n" );return -EBUSY ; }msleep (20 );
@@ -103,31 +105,32 @@ static int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)return 0 ; } -static int wmt_check_status (struct wmt_i2c_dev *i2c_dev) +static int wmt_check_status (struct wmt_i2c *i2c) {int ret =0 ;unsigned long wait_result; - wait_result =wait_for_completion_timeout (&i2c_dev->complete, + wait_result =wait_for_completion_timeout (&i2c->complete,msecs_to_jiffies (500 ));if (!wait_result)return -ETIMEDOUT ; -if (i2c_dev->cmd_status &WMTI2C_ISR_NACK_ADDR ) +if (i2c->cmd_status &WMTI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c_dev->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) +if (i2c->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret; } -static int wmt_i2c_write (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg, +static int wmt_i2c_write (struct wmt_i2c *i2c,struct i2c_msg *pmsg,int last) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;int xfer_len =0 ; +void __iomem *base = i2c->base;if (pmsg->len ==0 ) {/*
@@ -135,69 +138,73 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg,* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , i2c_dev->base +WMTI2C_REG_CDR ); +writew (0 , base +WMTI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +WMTI2C_REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , base +WMTI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val &= ~WMTI2C_CR_TX_END ; val |=WMTI2C_CR_CPU_RDY ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); } -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |= (WMTI2C_TCR_MASTER_WRITE | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); + tcr_val |= (WMTI2C_TCR_MASTER_WRITE + | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); -writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR ); +writew (tcr_val, base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val |=WMTI2C_CR_CPU_RDY ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =wmt_check_status (i2c);if (ret)return ret; xfer_len++; - val =readw (i2c_dev->base +WMTI2C_REG_CSR ); -if ((val &WMTI2C_CSR_RCV_ACK_MASK ) ==WMTI2C_CSR_RCV_NOT_ACK ) { -dev_dbg (i2c_dev->dev,"write RCV NACK error\n" ); + val =readw (base +WMTI2C_REG_CSR ); +if (val &WMTI2C_CSR_RCV_NOT_ACK ) { +dev_dbg (i2c->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); + val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY + |WMTI2C_CR_ENABLE ; +writew (val, base +WMTI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); +writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); }else { -writew (pmsg->buf[xfer_len] &0xFF , i2c_dev->base + -WMTI2C_REG_CDR ); -writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); +writew (pmsg->buf[xfer_len] &0xFF , + base +WMTI2C_REG_CDR ); +writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , + base +WMTI2C_REG_CR ); } }return 0 ; } -static int wmt_i2c_read (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg) +static int wmt_i2c_read (struct wmt_i2c *i2c,struct i2c_msg *pmsg) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;u32 xfer_len =0 ; +void __iomem *base = i2c->base; - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val &= ~(WMTI2C_CR_TX_END |WMTI2C_CR_TX_NEXT_NO_ACK );if (!(pmsg->flags &I2C_M_NOSTART ))
@@ -206,32 +213,33 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)if (pmsg->len ==1 ) val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |=WMTI2C_TCR_MASTER_READ | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); + tcr_val |=WMTI2C_TCR_MASTER_READ + | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); -writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR ); +writew (tcr_val, base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val |=WMTI2C_CR_CPU_RDY ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =wmt_check_status (i2c);if (ret)return ret; - pmsg->buf[xfer_len] =readw (i2c_dev->base +WMTI2C_REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (base +WMTI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (i2c_dev->base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ; + val =readw (base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); }return 0 ;
@@ -244,20 +252,20 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *pmsg;int i;int ret =0 ; -struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap); +struct wmt_i2c *i2c =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c_dev); + ret =wmt_i2c_wait_bus_not_busy (i2c);if (ret <0 )return ret; }if (pmsg->flags &I2C_M_RD ) - ret =wmt_i2c_read (i2c_dev, pmsg); + ret =wmt_i2c_read (i2c, pmsg);else - ret =wmt_i2c_write (i2c_dev, pmsg, (i +1 ) == num); + ret =wmt_i2c_write (i2c, pmsg, (i +1 ) == num); }return (ret <0 ) ? ret : i;
@@ -275,78 +283,79 @@ static const struct i2c_algorithm wmt_i2c_algo = {static irqreturn_t wmt_i2c_isr (int irq,void *data) { -struct wmt_i2c_dev *i2c_dev = data; +struct wmt_i2c *i2c = data;/* save the status and write-clear it */ - i2c_dev->cmd_status =readw (i2c_dev->base +WMTI2C_REG_ISR ); -writew (i2c_dev->cmd_status, i2c_dev->base +WMTI2C_REG_ISR ); + i2c->cmd_status =readw (i2c->base +WMTI2C_REG_ISR ); +writew (i2c->cmd_status, i2c->base +WMTI2C_REG_ISR ); -complete (&i2c_dev->complete); +complete (&i2c->complete);return IRQ_HANDLED ; } -int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c **pi2c) {int err; -struct wmt_i2c_dev *i2c_dev; +struct wmt_i2c *i2c;struct device_node *np = pdev->dev.of_node; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) + i2c =devm_kzalloc (&pdev->dev,sizeof (*i2c),GFP_KERNEL ); +if (!i2c)return -ENOMEM ; - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); + i2c->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c->base)) +return PTR_ERR (i2c->base); - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq)return -EINVAL ; - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, -0 , pdev->name, i2c_dev); + err =devm_request_irq (&pdev->dev, i2c->irq, wmt_i2c_isr, +0 , pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err, -"failed to request irq %i\n" , i2c_dev->irq); +"failed to request irq %i\n" , i2c->irq); - i2c_dev->dev = &pdev->dev; -init_completion (&i2c_dev->complete); -platform_set_drvdata (pdev, i2c_dev); + i2c->dev = &pdev->dev; +init_completion (&i2c->complete); +platform_set_drvdata (pdev, i2c); - *pi2c_dev = i2c_dev; + *pi2c = i2c;return 0 ; } -static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) +static int wmt_i2c_reset_hardware (struct wmt_i2c *i2c) {int err; +void __iomem *base = i2c->base; - err =clk_prepare_enable (i2c_dev->clk); + err =clk_prepare_enable (i2c->clk);if (err) { -dev_err (i2c_dev->dev,"failed to enable clock\n" ); +dev_err (i2c->dev,"failed to enable clock\n" );return err; } - err =clk_set_rate (i2c_dev->clk,20000000 ); + err =clk_set_rate (i2c->clk,20000000 );if (err) { -dev_err (i2c_dev->dev,"failed to set clock = 20Mhz\n" ); -clk_disable_unprepare (i2c_dev->clk); +dev_err (i2c->dev,"failed to set clock = 20Mhz\n" ); +clk_disable_unprepare (i2c->clk);return err; } -writew (0 , i2c_dev->base +WMTI2C_REG_CR ); -writew (WMTI2C_MCR_APB_166M , i2c_dev->base +WMTI2C_REG_MCR ); -writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); -writew (WMTI2C_IMR_ENABLE_ALL , i2c_dev->base +WMTI2C_REG_IMR ); -writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); -readw (i2c_dev->base +WMTI2C_REG_CSR );/* read clear */ -writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); +writew (0 , base +WMTI2C_REG_CR ); +writew (WMTI2C_MCR_APB_166M , base +WMTI2C_REG_MCR ); +writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); +writew (WMTI2C_IMR_ENABLE_ALL , base +WMTI2C_REG_IMR ); +writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); +readw (base +WMTI2C_REG_CSR );/* read clear */ +writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); -if (i2c_dev->tcr ==WMTI2C_TCR_FAST_MODE ) -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , i2c_dev->base +WMTI2C_REG_TR ); +if (i2c->tcr ==WMTI2C_TCR_FAST_MODE ) +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , base +WMTI2C_REG_TR );else -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , i2c_dev->base +WMTI2C_REG_TR ); +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , base +WMTI2C_REG_TR );return 0 ; }
@@ -354,34 +363,34 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev)static int wmt_i2c_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node; -struct wmt_i2c_dev *i2c_dev; +struct wmt_i2c *i2c;struct i2c_adapter *adap;int err;u32 clk_rate; - err =wmt_i2c_init (pdev, &i2c_dev); + err =wmt_i2c_init (pdev, &i2c);if (err)return err; - i2c_dev->clk =of_clk_get (np,0 ); -if (IS_ERR (i2c_dev->clk)) { + i2c->clk =of_clk_get (np,0 ); +if (IS_ERR (i2c->clk)) {dev_err (&pdev->dev,"unable to request clock\n" ); -return PTR_ERR (i2c_dev->clk); +return PTR_ERR (i2c->clk); } err =of_property_read_u32 (np,"clock-frequency" , &clk_rate);if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) - i2c_dev->tcr =WMTI2C_TCR_FAST_MODE ; + i2c->tcr =WMTI2C_TCR_FAST_MODE ; - adap = &i2c_dev->adapter; -i2c_set_adapdata (adap, i2c_dev); + adap = &i2c->adapter; +i2c_set_adapdata (adap, i2c);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name)); adap->owner =THIS_MODULE ; adap->algo = &wmt_i2c_algo; adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; - err =wmt_i2c_reset_hardware (i2c_dev); + err =wmt_i2c_reset_hardware (i2c);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );return err;
@@ -392,12 +401,12 @@ static int wmt_i2c_probe(struct platform_device *pdev)static void wmt_i2c_remove (struct platform_device *pdev) { -struct wmt_i2c_dev *i2c_dev =platform_get_drvdata (pdev); +struct wmt_i2c *i2c =platform_get_drvdata (pdev);/* Disable interrupts, clock and delete adapter */ -writew (0 , i2c_dev->base +WMTI2C_REG_IMR ); -clk_disable_unprepare (i2c_dev->clk); -i2c_del_adapter (&i2c_dev->adapter); +writew (0 , i2c->base +WMTI2C_REG_IMR ); +clk_disable_unprepare (i2c->clk); +i2c_del_adapter (&i2c->adapter); }static const struct of_device_id wmt_i2c_dt_ids[] = {
Signature · 1 line
2.34.1
PATCH v4 4/8 i2c: wmt: split out common files
In reply to Hans HuSince the I2C IP of both wmt and zhaoxin come from VIA, the common driver is named as i2c-viai2c-common.c. Old i2c-wmt.c renamed to i2c-wmt-plt.c.
--- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 234 ++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 66 ++++ drivers/i2c/busses/i2c-wmt-plt.c | 137 ++++++++ drivers/i2c/busses/i2c-wmt.c | 431 ------------------------- 5 files changed, 439 insertions(+), 431 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-wmt-plt.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c
drivers/i2c/busses/Makefile +2 -0
@@ -120,7 +120,9 @@ obj-$(CONFIG_I2C_TEGRA_BPMP) += i2c-tegra-bpmp.o obj-$(CONFIG_I2C_UNIPHIER) += i2c-uniphier.o obj-$(CONFIG_I2C_UNIPHIER_F) += i2c-uniphier-f.o obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o +i2c-wmt-objs := i2c-wmt-plt.o i2c-viai2c-common.o obj-$(CONFIG_I2C_WMT) += i2c-wmt.o + i2c-octeon-objs := i2c-octeon-core.o i2c-octeon-platdrv.o obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o i2c-thunderx-objs := i2c-octeon-core.o i2c-thunderx-pcidrv.o
drivers/i2c/busses/i2c-viai2c-common.c new file +234 -0
234 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-common.h new file +66 -0
66 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt-plt.c new file +137 -0
137 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt.c deleted +0 -431
431 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v4 5/8 i2c: wmt: rename with prefix VIAI2C_ and viai2c_
In reply to Hans HuSince the I2C IP of both wmt and zhaoxin come from VIA. So, rename common register, function and variable's name to VIAI2C_ and viai2c_.
--- drivers/i2c/busses/i2c-viai2c-common.c | 118 ++++++++++++------------- drivers/i2c/busses/i2c-viai2c-common.h | 60 ++++++------- drivers/i2c/busses/i2c-wmt-plt.c | 30 ++++--- 3 files changed, 105 insertions(+), 103 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +59 -59
@@ -2,15 +2,15 @@#include <linux/of_irq.h> #include "i2c-viai2c-common.h" -#define WMT_I2C_TIMEOUT (msecs_to_jiffies(1000)) +#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000)) -static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c *i2c) +static int viai2c_wait_bus_ready (struct viai2c *i2c) {unsigned long timeout;void __iomem *base = i2c->base; - timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) { + timeout = jiffies +VIAI2C_TIMEOUT ; +while (!(readw (base +VIAI2C_REG_CSR ) &VIAI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) {dev_warn (i2c->dev,"timeout waiting for bus ready\n" );
@@ -22,7 +22,7 @@ static int wmt_i2c_wait_bus_not_busy(struct wmt_i2c *i2c)return 0 ; } -static int wmt_check_status (struct wmt_i2c *i2c) +static int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ;unsigned long wait_result;
@@ -32,29 +32,29 @@ static int wmt_check_status(struct wmt_i2c *i2c)if (!wait_result)return -ETIMEDOUT ; -if (i2c->cmd_status &WMTI2C_ISR_NACK_ADDR ) +if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) +if (i2c->cmd_status &VIAI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret; } -static irqreturn_t wmt_i2c_isr (int irq,void *data) +static irqreturn_t viai2c_isr (int irq,void *data) { -struct wmt_i2c *i2c = data; +struct viai2c *i2c = data;/* save the status and write-clear it */ - i2c->cmd_status =readw (i2c->base +WMTI2C_REG_ISR ); -writew (i2c->cmd_status, i2c->base +WMTI2C_REG_ISR ); + i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR );complete (&i2c->complete);return IRQ_HANDLED ; } -static int wmt_i2c_write (struct wmt_i2c *i2c,struct i2c_msg *pmsg, +static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,int last) {u16 val, tcr_val = i2c->tcr;
@@ -68,143 +68,143 @@ static int wmt_i2c_write(struct wmt_i2c *i2c, struct i2c_msg *pmsg,* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , base +WMTI2C_REG_CDR ); +writew (0 , base +VIAI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , base +WMTI2C_REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , base +VIAI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (base +WMTI2C_REG_CR ); - val &= ~WMTI2C_CR_TX_END ; - val |=WMTI2C_CR_CPU_RDY ; -writew (val, base +WMTI2C_REG_CR ); + val =readw (base +VIAI2C_REG_CR ); + val &= ~VIAI2C_CR_TX_END ; + val |=VIAI2C_CR_CPU_RDY ; +writew (val, base +VIAI2C_REG_CR ); }reinit_completion (&i2c->complete); - tcr_val |= (WMTI2C_TCR_MASTER_WRITE - | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); + tcr_val |= (VIAI2C_TCR_MASTER_WRITE + | (pmsg->addr &VIAI2C_TCR_SLAVE_ADDR_MASK )); -writew (tcr_val, base +WMTI2C_REG_TCR ); +writew (tcr_val, base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (base +WMTI2C_REG_CR ); - val |=WMTI2C_CR_CPU_RDY ; -writew (val, base +WMTI2C_REG_CR ); + val =readw (base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c); + ret =viai2c_wait_status (i2c);if (ret)return ret; xfer_len++; - val =readw (base +WMTI2C_REG_CSR ); -if (val &WMTI2C_CSR_RCV_NOT_ACK ) { + val =readw (base +VIAI2C_REG_CSR ); +if (val &VIAI2C_CSR_RCV_NOT_ACK ) {dev_dbg (i2c->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY - |WMTI2C_CR_ENABLE ; -writew (val, base +WMTI2C_REG_CR ); + val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY + |VIAI2C_CR_ENABLE ; +writew (val, base +VIAI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); +writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , - base +WMTI2C_REG_CDR ); -writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , - base +WMTI2C_REG_CR ); + base +VIAI2C_REG_CDR ); +writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , + base +VIAI2C_REG_CR ); } }return 0 ; } -static int wmt_i2c_read (struct wmt_i2c *i2c,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) {u16 val, tcr_val = i2c->tcr;int ret;u32 xfer_len =0 ;void __iomem *base = i2c->base; - val =readw (base +WMTI2C_REG_CR ); - val &= ~(WMTI2C_CR_TX_END |WMTI2C_CR_TX_NEXT_NO_ACK ); + val =readw (base +VIAI2C_REG_CR ); + val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END );if (!(pmsg->flags &I2C_M_NOSTART )) - val |=WMTI2C_CR_CPU_RDY ; + val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 ) - val |=WMTI2C_CR_TX_NEXT_NO_ACK ; + val |=VIAI2C_CR_RX_END ; -writew (val, base +WMTI2C_REG_CR ); +writew (val, base +VIAI2C_REG_CR );reinit_completion (&i2c->complete); - tcr_val |=WMTI2C_TCR_MASTER_READ - | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); + tcr_val |=VIAI2C_TCR_MASTER_READ + | (pmsg->addr &VIAI2C_TCR_SLAVE_ADDR_MASK ); -writew (tcr_val, base +WMTI2C_REG_TCR ); +writew (tcr_val, base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (base +WMTI2C_REG_CR ); - val |=WMTI2C_CR_CPU_RDY ; -writew (val, base +WMTI2C_REG_CR ); + val =readw (base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c); + ret =viai2c_wait_status (i2c);if (ret)return ret; - pmsg->buf[xfer_len] =readw (base +WMTI2C_REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (base +VIAI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ; + val =readw (base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) - val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, base +WMTI2C_REG_CR ); + val |=VIAI2C_CR_RX_END ; +writew (val, base +VIAI2C_REG_CR ); }return 0 ; } -int wmt_i2c_xfer (struct i2c_adapter *adap, +int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num) {struct i2c_msg *pmsg;int i;int ret =0 ; -struct wmt_i2c *i2c =i2c_get_adapdata (adap); +struct viai2c *i2c =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c); + ret =viai2c_wait_bus_ready (i2c);if (ret <0 )return ret; }if (pmsg->flags &I2C_M_RD ) - ret =wmt_i2c_read (i2c, pmsg); + ret =viai2c_read (i2c, pmsg);else - ret =wmt_i2c_write (i2c, pmsg, (i +1 ) == num); + ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }return (ret <0 ) ? ret : i; } -int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c **pi2c) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) {int err; -struct wmt_i2c *i2c; +struct viai2c *i2c;struct device_node *np = pdev->dev.of_node; i2c =devm_kzalloc (&pdev->dev,sizeof (*i2c),GFP_KERNEL );
@@ -219,7 +219,7 @@ int wmt_i2c_init(struct platform_device *pdev, struct wmt_i2c **pi2c)if (!i2c->irq)return -EINVAL ; - err =devm_request_irq (&pdev->dev, i2c->irq, wmt_i2c_isr, + err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr,0 , pdev->name, i2c);if (err) return dev_err_probe(&pdev->dev, err,
drivers/i2c/busses/i2c-viai2c-common.h +30 -30
81 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt-plt.c +16 -14
@@ -22,13 +22,15 @@#define WMTI2C_MCR_APB_96M 7#define WMTI2C_MCR_APB_166M 12 +#define wmt_i2c viai2c +static u32 wmt_i2c_func (struct i2c_adapter *adap) {return I2C_FUNC_I2C |I2C_FUNC_SMBUS_EMUL |I2C_FUNC_NOSTART ; }static const struct i2c_algorithm wmt_i2c_algo = { - .master_xfer = wmt_i2c_xfer, + .master_xfer = viai2c_xfer, .functionality = wmt_i2c_func, };
@@ -50,18 +52,18 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c *i2c)return err; } -writew (0 , base +WMTI2C_REG_CR ); -writew (WMTI2C_MCR_APB_166M , base +WMTI2C_REG_MCR ); -writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); -writew (WMTI2C_IMR_ENABLE_ALL , base +WMTI2C_REG_IMR ); -writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); -readw (base +WMTI2C_REG_CSR );/* read clear */ -writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); +writew (0 , base +VIAI2C_REG_CR ); +writew (WMTI2C_MCR_APB_166M , base +VIAI2C_REG_MCR ); +writew (VIAI2C_ISR_MASK_ALL , base +VIAI2C_REG_ISR ); +writew (VIAI2C_IMR_ENABLE_ALL , base +VIAI2C_REG_IMR ); +writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); +readw (base +VIAI2C_REG_CSR );/* read clear */ +writew (VIAI2C_ISR_MASK_ALL , base +VIAI2C_REG_ISR ); -if (i2c->tcr ==WMTI2C_TCR_FAST_MODE ) -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , base +WMTI2C_REG_TR ); +if (i2c->tcr ==VIAI2C_TCR_FAST ) +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , base +VIAI2C_REG_TR );else -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , base +WMTI2C_REG_TR ); +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , base +VIAI2C_REG_TR );return 0 ; }
@@ -74,7 +76,7 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - err =wmt_i2c_init (pdev, &i2c); + err =viai2c_init (pdev, &i2c);if (err)return err;
@@ -86,7 +88,7 @@ static int wmt_i2c_probe(struct platform_device *pdev) err =of_property_read_u32 (np,"clock-frequency" , &clk_rate);if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) - i2c->tcr =WMTI2C_TCR_FAST_MODE ; + i2c->tcr =VIAI2C_TCR_FAST ; adap = &i2c->adapter;i2c_set_adapdata (adap, i2c);
@@ -110,7 +112,7 @@ static void wmt_i2c_remove(struct platform_device *pdev)struct wmt_i2c *i2c =platform_get_drvdata (pdev);/* Disable interrupts, clock and delete adapter */ -writew (0 , i2c->base +WMTI2C_REG_IMR ); +writew (0 , i2c->base +VIAI2C_REG_IMR );clk_disable_unprepare (i2c->clk);i2c_del_adapter (&i2c->adapter); }
Signature · 1 line
2.34.1
PATCH v4 6/8 i2c: wmt: fix a bug when thread blocked
In reply to Hans HuDuring each byte access, the host performs clock stretching. In this case, the thread may be interrupted by preemption, resulting in a long stretching time.
However, some touchpad can only tolerate host clock stretching of no more than 200 ms. We reduce the impact of this through a retransmission mechanism.
--- drivers/i2c/busses/i2c-viai2c-common.c | 37 +++++++++++++++++++++----- drivers/i2c/busses/i2c-viai2c-common.h | 2 ++ 2 files changed, 33 insertions(+), 6 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +31 -6
@@ -2,7 +2,8 @@#include <linux/of_irq.h> #include "i2c-viai2c-common.h" -#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000)) +#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000)) +#define VIAI2C_STRETCHING_TIMEOUT 200static int viai2c_wait_bus_ready (struct viai2c *i2c) {
@@ -25,12 +26,35 @@ static int viai2c_wait_bus_ready(struct viai2c *i2c)static int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ; -unsigned long wait_result; +unsigned long time_left; +unsigned long delta_ms; + + time_left =wait_for_completion_timeout (&i2c->complete, +VIAI2C_TIMEOUT ); +if (!time_left) { +dev_err (i2c->dev,"bus transfer timeout\n" ); +return -EIO ; + } - wait_result =wait_for_completion_timeout (&i2c->complete, -msecs_to_jiffies (500 )); -if (!wait_result) -return -ETIMEDOUT ; +/* +* During each byte access, the host performs clock stretching. +* In this case, the thread may be interrupted by preemption, +* resulting in a long stretching time. +* However, some touchpad can only tolerate host clock stretching +* of no more than 200 ms. We reduce the impact of this through +* a retransmission mechanism. +*/ +local_irq_disable (); + i2c->to =ktime_get (); + delta_ms =ktime_to_ms (ktime_sub (i2c->to, i2c->ti)); +if (delta_ms >VIAI2C_STRETCHING_TIMEOUT ) { +local_irq_enable (); +dev_warn (i2c->dev,"thread blocked more than %ldms\n" , + delta_ms); +return -EAGAIN ; + } + i2c->ti = i2c->to; +local_irq_enable ();if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ;
@@ -184,6 +208,7 @@ int viai2c_xfer(struct i2c_adapter *adap,int ret =0 ;struct viai2c *i2c =i2c_get_adapdata (adap); + i2c->to = i2c->ti =ktime_get ();for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) {
drivers/i2c/busses/i2c-viai2c-common.h +2 -0
@@ -58,6 +58,8 @@ struct viai2c {u16 tcr;int irq;u16 cmd_status; +ktime_t ti; +ktime_t to; };int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num);
Signature · 1 line
2.34.1
PATCH v4 7/8 i2c: wmt: add platform type VIAI2C_PLAT_WMT
In reply to Hans HuEnumeration variables are added to differentiate between different platforms
--- drivers/i2c/busses/i2c-viai2c-common.c | 34 ++++++++++++++++---------- drivers/i2c/busses/i2c-viai2c-common.h | 7 +++++- drivers/i2c/busses/i2c-wmt-plt.c | 2 +- 3 files changed, 28 insertions(+), 15 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +21 -13
@@ -78,8 +78,7 @@ static irqreturn_t viai2c_isr(int irq, void *data)return IRQ_HANDLED ; } -static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg, -int last) +static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,bool last) {u16 val, tcr_val = i2c->tcr;int ret;
@@ -97,7 +96,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg,writew (pmsg->buf[0 ] &0xFF , base +VIAI2C_REG_CDR ); } -if (!(pmsg->flags &I2C_M_NOSTART )) { +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) { val =readw (base +VIAI2C_REG_CR ); val &= ~VIAI2C_CR_TX_END ; val |=VIAI2C_CR_CPU_RDY ;
@@ -111,7 +110,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg,writew (tcr_val, base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && pmsg->flags &I2C_M_NOSTART ) { val =readw (base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, base +VIAI2C_REG_CR );
@@ -138,7 +137,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, }if (xfer_len == pmsg->len) { -if (last !=1 ) +if (i2c->platform ==VIAI2C_PLAT_WMT && !last)writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); }else { writew(pmsg->buf[xfer_len] & 0xFF,
@@ -161,7 +160,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg) val =readw (base +VIAI2C_REG_CR ); val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END ); -if (!(pmsg->flags &I2C_M_NOSTART )) +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 )
@@ -176,7 +175,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) { val =readw (base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, base +VIAI2C_REG_CR );
@@ -211,7 +210,8 @@ int viai2c_xfer(struct i2c_adapter *adap, i2c->to = i2c->ti =ktime_get ();for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i]; -if (!(pmsg->flags &I2C_M_NOSTART )) { +if ((i2c->platform ==VIAI2C_PLAT_WMT ) + && !(pmsg->flags &I2C_M_NOSTART )) { ret =viai2c_wait_bus_ready (i2c);if (ret <0 )return ret;
@@ -226,9 +226,10 @@ int viai2c_xfer(struct i2c_adapter *adap,return (ret <0 ) ? ret : i; } -int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat) {int err; +int irq_flags;struct viai2c *i2c;struct device_node *np = pdev->dev.of_node;
@@ -240,12 +241,19 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c)if (IS_ERR (i2c->base))return PTR_ERR (i2c->base); - i2c->irq =irq_of_parse_and_map (np,0 ); -if (!i2c->irq) -return -EINVAL ; +if (plat ==VIAI2C_PLAT_WMT ) { + irq_flags =0 ; + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq) +return -EINVAL ; + }else +return dev_err_probe (&pdev->dev, -EINVAL , +"wrong platform type\n" ); + + i2c->platform = plat; err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr, -0 , pdev->name, i2c); + irq_flags, pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err,"failed to request irq %i\n" , i2c->irq);
drivers/i2c/busses/i2c-viai2c-common.h +6 -1
@@ -49,6 +49,10 @@#define VIAI2C_REG_TR 0x0C#define VIAI2C_REG_MCR 0x0E +enum { +VIAI2C_PLAT_WMT =1 , +}; +struct viai2c {struct i2c_adapter adapter;struct completion complete;
@@ -60,9 +64,10 @@ struct viai2c {u16 cmd_status;ktime_t ti;ktime_t to; + u8 platform; };int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num); -int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c); +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat);#endif
drivers/i2c/busses/i2c-wmt-plt.c +1 -1
@@ -76,7 +76,7 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - err =viai2c_init (pdev, &i2c); + err =viai2c_init (pdev, &i2c,VIAI2C_PLAT_WMT );if (err)return err;
Signature · 1 line
2.34.1
PATCH v4 8/8 i2c: add zhaoxin i2c controller driver
In reply to Hans HuAdd Zhaoxin I2C controller driver. It provides the access to the i2c busses, which connects to the touchpad, eeprom, I2S, etc.
Zhaoxin I2C controller has two separate busses, so may accommodate up to two I2C adapters. Those adapters are listed in the ACPI namespace with the "IIC1D17" HID, and probed by a platform driver.
The driver works with IRQ mode, and supports basic I2C features. Flags I2C_AQ_NO_ZERO_LEN and I2C_AQ_COMB_WRITE_THEN_READ are used to limit the unsupported access.
--- MAINTAINERS | 8 + drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 21 +- drivers/i2c/busses/i2c-viai2c-common.h | 6 + drivers/i2c/busses/i2c-zhaoxin-plt.c | 299 +++++++++++++++++++++++++ 6 files changed, 341 insertions(+), 5 deletions(-) create mode 100644 drivers/i2c/busses/i2c-zhaoxin-plt.c
MAINTAINERS +8 -0
@@ -10023,6 +10023,14 @@ L: [email protected] F: Documentation/i2c/busses/i2c-ismt.rst F: drivers/i2c/busses/i2c-ismt.c +I2C/SMBUS ZHAOXIN DRIVER +M: Hans Hu <[email protected]> +L: [email protected] +S: Maintained +W: https://www.zhaoxin.com +F: drivers/i2c/busses/i2c-viai2c-common.c +F: drivers/i2c/busses/i2c-zhaoxin.c + I2C/SMBUS STUB DRIVER M: Jean Delvare <[email protected]> L: [email protected]
drivers/i2c/busses/Kconfig +10 -0
@@ -336,6 +336,16 @@ config I2C_VIAPRO if ACPI +config I2C_ZHAOXIN + tristate "Zhaoxin I2C Interface" + depends on PCI || COMPILE_TEST + help + If you say yes to this option, support will be included for the + ZHAOXIN I2C interface + + This driver can also be built as a module. If so, the module + will be called i2c-zhaoxin. + comment "ACPI drivers" config I2C_SCMI
drivers/i2c/busses/Makefile +2 -0
@@ -29,6 +29,8 @@ obj-$(CONFIG_I2C_SIS630) += i2c-sis630.o obj-$(CONFIG_I2C_SIS96X) += i2c-sis96x.o obj-$(CONFIG_I2C_VIA) += i2c-via.o obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o +i2c-zhaoxin-objs := i2c-zhaoxin-plt.o i2c-viai2c-common.o +obj-$(CONFIG_I2C_ZHAOXIN) += i2c-zhaoxin.o # Mac SMBus host controller drivers obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o
drivers/i2c/busses/i2c-viai2c-common.c +16 -5
@@ -5,7 +5,7 @@#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000))#define VIAI2C_STRETCHING_TIMEOUT 200 -static int viai2c_wait_bus_ready (struct viai2c *i2c) +int viai2c_wait_bus_ready (struct viai2c *i2c) {unsigned long timeout;void __iomem *base = i2c->base;
@@ -23,7 +23,7 @@ static int viai2c_wait_bus_ready(struct viai2c *i2c)return 0 ; } -static int viai2c_wait_status (struct viai2c *i2c) +int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ;unsigned long time_left;
@@ -71,6 +71,9 @@ static irqreturn_t viai2c_isr(int irq, void *data)/* save the status and write-clear it */ i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +if (!i2c->cmd_status) +return IRQ_NONE ; +writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR );complete (&i2c->complete);
@@ -139,6 +142,8 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, bool last)if (xfer_len == pmsg->len) {if (i2c->platform ==VIAI2C_PLAT_WMT && !last)writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); +else if (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && last) +writeb (VIAI2C_CR_TX_END , base +VIAI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , base +VIAI2C_REG_CDR );
@@ -150,7 +155,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, bool last)return 0 ; } -static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg,bool first) {u16 val, tcr_val = i2c->tcr;int ret;
@@ -175,7 +180,8 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, base +VIAI2C_REG_TCR ); -if (i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) { +if ((i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) + || (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && !first)) { val =readw (base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, base +VIAI2C_REG_CR );
@@ -218,7 +224,7 @@ int viai2c_xfer(struct i2c_adapter *adap, }if (pmsg->flags &I2C_M_RD ) - ret =viai2c_read (i2c, pmsg); + ret =viai2c_read (i2c, pmsg, i ==0 );else ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }
@@ -246,6 +252,11 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c, int plat) i2c->irq =irq_of_parse_and_map (np,0 );if (!i2c->irq)return -EINVAL ; + }else if (plat ==VIAI2C_PLAT_ZHAOXIN ) { + irq_flags =IRQF_SHARED ; + i2c->irq =platform_get_irq (pdev,0 ); +if (i2c->irq <0 ) +return i2c->irq; }else return dev_err_probe (&pdev->dev, -EINVAL ,"wrong platform type\n" );
drivers/i2c/busses/i2c-viai2c-common.h +6 -0
@@ -51,6 +51,7 @@enum {VIAI2C_PLAT_WMT =1 , +VIAI2C_PLAT_ZHAOXIN };struct viai2c {
@@ -65,8 +66,13 @@ struct viai2c {ktime_t ti;ktime_t to;u8 platform; +u8 hrv; +u16 tr; +u16 mcr; }; +int viai2c_wait_status (struct viai2c *i2c); +int viai2c_wait_bus_ready (struct viai2c *i2c);int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num);int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat);
drivers/i2c/busses/i2c-zhaoxin-plt.c new file +299 -0
299 lines not on this page · raw message
Signature · 1 line
2.34.1
v5 cover i2c: add zhaoxin i2c controller driver
In reply to Hans HuIn version v4, the patch consists of 8 files. This version is based on the latest for-next branch, with some adjustments as suggested by Wolfram.
Hans Hu (8):
i2c: wmt: create wmt_i2c_init for general init
i2c: wmt: rename marcos with prefix WMTI2C_
i2c: wmt: adjust line length to meet style
i2c: wmt: split out common files
i2c: wmt: rename with prefix VIAI2C_ and viai2c_
i2c: wmt: fix a bug when thread blocked
i2c: wmt: add platform type VIAI2C_PLAT_WMT
i2c: add zhaoxin i2c controller driver
MAINTAINERS | 10 +- drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 4 + drivers/i2c/busses/i2c-viai2c-common.c | 278 +++++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 79 +++++ drivers/i2c/busses/i2c-wmt-plt.c | 139 +++++++++ drivers/i2c/busses/i2c-wmt.c | 417 ------------------------- drivers/i2c/busses/i2c-zhaoxin-plt.c | 298 ++++++++++++++++++ 8 files changed, 817 insertions(+), 418 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-wmt-plt.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c create mode 100644 drivers/i2c/busses/i2c-zhaoxin-plt.c
Signature · 1 line
2.34.1
PATCH v5 1/8 i2c: wmt: create wmt_i2c_init for general init
v4->v5:
add previous prototype 'static' for wmt_i2c_init().
Some common initialization actions are put in the function wmt_i2c_init(), which is convenient to share with zhaoxin.
--- drivers/i2c/busses/i2c-wmt.c | 67 +++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 31 deletions(-)
drivers/i2c/busses/i2c-wmt.c +36 -31
@@ -286,6 +286,38 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)return IRQ_HANDLED ; } +static int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +{ +int err; +struct wmt_i2c_dev *i2c_dev; +struct device_node *np = pdev->dev.of_node; + + i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); +if (!i2c_dev) +return -ENOMEM ; + + i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c_dev->base)) +return PTR_ERR (i2c_dev->base); + + i2c_dev->irq =irq_of_parse_and_map (np,0 ); +if (!i2c_dev->irq) +return -EINVAL ; + + err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, +0 , pdev->name, i2c_dev); +if (err) +return dev_err_probe (&pdev->dev, err, +"failed to request irq %i\n" , i2c_dev->irq); + + i2c_dev->dev = &pdev->dev; +init_completion (&i2c_dev->complete); +platform_set_drvdata (pdev, i2c_dev); + + *pi2c_dev = i2c_dev; +return 0 ; +} +static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) {int err;
@@ -327,19 +359,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) -return -ENOMEM ; - - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); - - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) { -dev_err (&pdev->dev,"irq missing or invalid\n" ); -return -EINVAL ; - } + err =wmt_i2c_init (pdev, &i2c_dev); +if (err) +return err; i2c_dev->clk =of_clk_get (np,0 );if (IS_ERR (i2c_dev->clk)) {
@@ -351,15 +373,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) i2c_dev->tcr =TCR_FAST_MODE ; - i2c_dev->dev = &pdev->dev; - - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr,0 , -"i2c" , i2c_dev); -if (err) { -dev_err (&pdev->dev,"failed to request irq %i\n" , i2c_dev->irq); -return err; - } - adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name));
@@ -368,21 +381,13 @@ static int wmt_i2c_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; -init_completion (&i2c_dev->complete); - err =wmt_i2c_reset_hardware (i2c_dev);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );return err; } - err =i2c_add_adapter (adap); -if (err) -return err; - -platform_set_drvdata (pdev, i2c_dev); - -return 0 ; +return i2c_add_adapter (adap); }static void wmt_i2c_remove (struct platform_device *pdev)
Signature · 1 line
2.34.1
PATCH v5 2/8 i2c: wmt: rename marcos with prefix WMTI2C_
In reply to Hans HuTweaked a few formatting things: rename marcos with prefix WMTI2C_
--- drivers/i2c/busses/i2c-wmt.c | 176 +++++++++++++++++------------------ 1 file changed, 88 insertions(+), 88 deletions(-)
drivers/i2c/busses/i2c-wmt.c +88 -88
@@ -20,59 +20,59 @@#include <linux/of_irq.h> #include <linux/platform_device.h> -#define REG_CR 0x00 -#define REG_TCR 0x02 -#define REG_CSR 0x04 -#define REG_ISR 0x06 -#define REG_IMR 0x08 -#define REG_CDR 0x0A -#define REG_TR 0x0C -#define REG_MCR 0x0E -#define REG_SLAVE_CR 0x10 -#define REG_SLAVE_SR 0x12 -#define REG_SLAVE_ISR 0x14 -#define REG_SLAVE_IMR 0x16 -#define REG_SLAVE_DR 0x18 -#define REG_SLAVE_TR 0x1A +#define WMTI2C_REG_CR 0x00 +#define WMTI2C_REG_TCR 0x02 +#define WMTI2C_REG_CSR 0x04 +#define WMTI2C_REG_ISR 0x06 +#define WMTI2C_REG_IMR 0x08 +#define WMTI2C_REG_CDR 0x0A +#define WMTI2C_REG_TR 0x0C +#define WMTI2C_REG_MCR 0x0E +#define WMTI2C_REG_SLAVE_CR 0x10 +#define WMTI2C_REG_SLAVE_SR 0x12 +#define WMTI2C_REG_SLAVE_ISR 0x14 +#define WMTI2C_REG_SLAVE_IMR 0x16 +#define WMTI2C_REG_SLAVE_DR 0x18 +#define WMTI2C_REG_SLAVE_TR 0x1A/* REG_CR Bit fields */ -#define CR_TX_NEXT_ACK 0x0000 -#define CR_ENABLE 0x0001 -#define CR_TX_NEXT_NO_ACK 0x0002 -#define CR_TX_END 0x0004 -#define CR_CPU_RDY 0x0008 -#define SLAV_MODE_SEL 0x8000 +#define WMTI2C_CR_TX_NEXT_ACK 0x0000 +#define WMTI2C_CR_ENABLE 0x0001 +#define WMTI2C_CR_TX_NEXT_NO_ACK 0x0002 +#define WMTI2C_CR_TX_END 0x0004 +#define WMTI2C_CR_CPU_RDY 0x0008 +#define WMTI2C_SLAV_MODE_SEL 0x8000/* REG_TCR Bit fields */ -#define TCR_STANDARD_MODE 0x0000 -#define TCR_MASTER_WRITE 0x0000 -#define TCR_HS_MODE 0x2000 -#define TCR_MASTER_READ 0x4000 -#define TCR_FAST_MODE 0x8000 -#define TCR_SLAVE_ADDR_MASK 0x007F +#define WMTI2C_TCR_STANDARD_MODE 0x0000 +#define WMTI2C_TCR_MASTER_WRITE 0x0000 +#define WMTI2C_TCR_HS_MODE 0x2000 +#define WMTI2C_TCR_MASTER_READ 0x4000 +#define WMTI2C_TCR_FAST_MODE 0x8000 +#define WMTI2C_TCR_SLAVE_ADDR_MASK 0x007F/* REG_ISR Bit fields */ -#define ISR_NACK_ADDR 0x0001 -#define ISR_BYTE_END 0x0002 -#define ISR_SCL_TIMEOUT 0x0004 -#define ISR_WRITE_ALL 0x0007 +#define WMTI2C_ISR_NACK_ADDR 0x0001 +#define WMTI2C_ISR_BYTE_END 0x0002 +#define WMTI2C_ISR_SCL_TIMEOUT 0x0004 +#define WMTI2C_ISR_WRITE_ALL 0x0007/* REG_IMR Bit fields */ -#define IMR_ENABLE_ALL 0x0007 +#define WMTI2C_IMR_ENABLE_ALL 0x0007/* REG_CSR Bit fields */ -#define CSR_RCV_NOT_ACK 0x0001 -#define CSR_RCV_ACK_MASK 0x0001 -#define CSR_READY_MASK 0x0002 +#define WMTI2C_CSR_RCV_NOT_ACK 0x0001 +#define WMTI2C_CSR_RCV_ACK_MASK 0x0001 +#define WMTI2C_CSR_READY_MASK 0x0002/* REG_TR */ -#define SCL_TIMEOUT (x) (((x) & 0xFF) << 8) -#define TR_STD 0x0064 -#define TR_HS 0x0019 +#define WMTI2C_SCL_TIMEOUT (x) (((x) & 0xFF) << 8) +#define WMTI2C_TR_STD 0x0064 +#define WMTI2C_TR_HS 0x0019/* REG_MCR */ -#define MCR_APB_96M 7 -#define MCR_APB_166M 12 +#define WMTI2C_MCR_APB_96M 7 +#define WMTI2C_MCR_APB_166M 12#define WMT_I2C_TIMEOUT (msecs_to_jiffies(1000))
@@ -92,7 +92,7 @@ static int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)unsigned long timeout; timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +REG_CSR ) &CSR_READY_MASK )) { +while (!(readw (i2c_dev->base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) {dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" );return -EBUSY ;
@@ -113,10 +113,10 @@ static int wmt_check_status(struct wmt_i2c_dev *i2c_dev)if (!wait_result)return -ETIMEDOUT ; -if (i2c_dev->cmd_status &ISR_NACK_ADDR ) +if (i2c_dev->cmd_status &WMTI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c_dev->cmd_status &ISR_SCL_TIMEOUT ) +if (i2c_dev->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret;
@@ -135,28 +135,28 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg,* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , i2c_dev->base +REG_CDR ); +writew (0 , i2c_dev->base +WMTI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +WMTI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +REG_CR ); - val &= ~CR_TX_END ; - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val &= ~WMTI2C_CR_TX_END ; + val |=WMTI2C_CR_CPU_RDY ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }reinit_completion (&i2c_dev->complete); - tcr_val |= (TCR_MASTER_WRITE | (pmsg->addr &TCR_SLAVE_ADDR_MASK )); + tcr_val |= (WMTI2C_TCR_MASTER_WRITE | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val |=WMTI2C_CR_CPU_RDY ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) {
@@ -166,25 +166,25 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg, xfer_len++; - val =readw (i2c_dev->base +REG_CSR ); -if ((val &CSR_RCV_ACK_MASK ) ==CSR_RCV_NOT_ACK ) { + val =readw (i2c_dev->base +WMTI2C_REG_CSR ); +if ((val &WMTI2C_CSR_RCV_ACK_MASK ) ==WMTI2C_CSR_RCV_NOT_ACK ) {dev_dbg (i2c_dev->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =CR_TX_END |CR_CPU_RDY |CR_ENABLE ; -writew (val, i2c_dev->base +REG_CR ); + val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE ; +writew (val, i2c_dev->base +WMTI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (CR_ENABLE , i2c_dev->base +REG_CR ); +writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , i2c_dev->base + -REG_CDR ); -writew (CR_CPU_RDY |CR_ENABLE , i2c_dev->base +REG_CR ); +WMTI2C_REG_CDR ); +writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); } }
@@ -197,27 +197,27 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)int ret;u32 xfer_len =0 ; - val =readw (i2c_dev->base +REG_CR ); - val &= ~(CR_TX_END |CR_TX_NEXT_NO_ACK ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val &= ~(WMTI2C_CR_TX_END |WMTI2C_CR_TX_NEXT_NO_ACK );if (!(pmsg->flags &I2C_M_NOSTART )) - val |=CR_CPU_RDY ; + val |=WMTI2C_CR_CPU_RDY ;if (pmsg->len ==1 ) - val |=CR_TX_NEXT_NO_ACK ; + val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); +writew (val, i2c_dev->base +WMTI2C_REG_CR );reinit_completion (&i2c_dev->complete); - tcr_val |=TCR_MASTER_READ | (pmsg->addr &TCR_SLAVE_ADDR_MASK ); + tcr_val |=WMTI2C_TCR_MASTER_READ | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val |=WMTI2C_CR_CPU_RDY ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) {
@@ -225,13 +225,13 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)if (ret)return ret; - pmsg->buf[xfer_len] =readw (i2c_dev->base +REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (i2c_dev->base +WMTI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (i2c_dev->base +REG_CR ) |CR_CPU_RDY ; + val =readw (i2c_dev->base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) - val |=CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); + val |=WMTI2C_CR_TX_NEXT_NO_ACK ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }return 0 ;
@@ -278,8 +278,8 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)struct wmt_i2c_dev *i2c_dev = data;/* save the status and write-clear it */ - i2c_dev->cmd_status =readw (i2c_dev->base +REG_ISR ); -writew (i2c_dev->cmd_status, i2c_dev->base +REG_ISR ); + i2c_dev->cmd_status =readw (i2c_dev->base +WMTI2C_REG_ISR ); +writew (i2c_dev->cmd_status, i2c_dev->base +WMTI2C_REG_ISR );complete (&i2c_dev->complete);
@@ -335,18 +335,18 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev)return err; } -writew (0 , i2c_dev->base +REG_CR ); -writew (MCR_APB_166M , i2c_dev->base +REG_MCR ); -writew (ISR_WRITE_ALL , i2c_dev->base +REG_ISR ); -writew (IMR_ENABLE_ALL , i2c_dev->base +REG_IMR ); -writew (CR_ENABLE , i2c_dev->base +REG_CR ); -readw (i2c_dev->base +REG_CSR );/* read clear */ -writew (ISR_WRITE_ALL , i2c_dev->base +REG_ISR ); +writew (0 , i2c_dev->base +WMTI2C_REG_CR ); +writew (WMTI2C_MCR_APB_166M , i2c_dev->base +WMTI2C_REG_MCR ); +writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); +writew (WMTI2C_IMR_ENABLE_ALL , i2c_dev->base +WMTI2C_REG_IMR ); +writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); +readw (i2c_dev->base +WMTI2C_REG_CSR );/* read clear */ +writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); -if (i2c_dev->tcr ==TCR_FAST_MODE ) -writew (SCL_TIMEOUT (128 ) |TR_HS , i2c_dev->base +REG_TR ); +if (i2c_dev->tcr ==WMTI2C_TCR_FAST_MODE ) +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , i2c_dev->base +WMTI2C_REG_TR );else -writew (SCL_TIMEOUT (128 ) |TR_STD , i2c_dev->base +REG_TR ); +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , i2c_dev->base +WMTI2C_REG_TR );return 0 ; }
@@ -371,7 +371,7 @@ static int wmt_i2c_probe(struct platform_device *pdev) err =of_property_read_u32 (np,"clock-frequency" , &clk_rate);if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) - i2c_dev->tcr =TCR_FAST_MODE ; + i2c_dev->tcr =WMTI2C_TCR_FAST_MODE ; adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);
@@ -395,7 +395,7 @@ static void wmt_i2c_remove(struct platform_device *pdev)struct wmt_i2c_dev *i2c_dev =platform_get_drvdata (pdev);/* Disable interrupts, clock and delete adapter */ -writew (0 , i2c_dev->base +REG_IMR ); +writew (0 , i2c_dev->base +WMTI2C_REG_IMR );clk_disable_unprepare (i2c_dev->clk);i2c_del_adapter (&i2c_dev->adapter); }
Signature · 1 line
2.34.1
PATCH v5 3/8 i2c: wmt: adjust line length to meet style
In reply to Hans Huv4->v5:
add previous prototype 'static' for wmt_i2c_init().
Tweaked a few formatting things:
rename wmt_i2c_dev to wmt_i2c, i2c_dev to i2c, etc.
--- drivers/i2c/busses/i2c-wmt.c | 199 ++++++++++++++++++----------------- 1 file changed, 104 insertions(+), 95 deletions(-)
drivers/i2c/busses/i2c-wmt.c +104 -95
@@ -76,7 +76,7 @@#define WMT_I2C_TIMEOUT (msecs_to_jiffies(1000)) -struct wmt_i2c_dev { +struct wmt_i2c {struct i2c_adapter adapter;struct completion complete;struct device *dev;
@@ -87,14 +87,16 @@ struct wmt_i2c_dev {u16 cmd_status; }; -static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c_dev *i2c_dev) +static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c *i2c) {unsigned long timeout; +void __iomem *base = i2c->base; timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) { +while (!(readw (base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) { -dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" ); +dev_warn (i2c->dev, +"timeout waiting for bus ready\n" );return -EBUSY ; }msleep (20 );
@@ -103,31 +105,32 @@ static int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)return 0 ; } -static int wmt_check_status (struct wmt_i2c_dev *i2c_dev) +static int wmt_check_status (struct wmt_i2c *i2c) {int ret =0 ;unsigned long wait_result; - wait_result =wait_for_completion_timeout (&i2c_dev->complete, + wait_result =wait_for_completion_timeout (&i2c->complete,msecs_to_jiffies (500 ));if (!wait_result)return -ETIMEDOUT ; -if (i2c_dev->cmd_status &WMTI2C_ISR_NACK_ADDR ) +if (i2c->cmd_status &WMTI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c_dev->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) +if (i2c->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret; } -static int wmt_i2c_write (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg, +static int wmt_i2c_write (struct wmt_i2c *i2c,struct i2c_msg *pmsg,int last) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;int xfer_len =0 ; +void __iomem *base = i2c->base;if (pmsg->len ==0 ) {/*
@@ -135,69 +138,73 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg,* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , i2c_dev->base +WMTI2C_REG_CDR ); +writew (0 , base +WMTI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +WMTI2C_REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , base +WMTI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val &= ~WMTI2C_CR_TX_END ; val |=WMTI2C_CR_CPU_RDY ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); } -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |= (WMTI2C_TCR_MASTER_WRITE | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); + tcr_val |= (WMTI2C_TCR_MASTER_WRITE + | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); -writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR ); +writew (tcr_val, base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val |=WMTI2C_CR_CPU_RDY ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =wmt_check_status (i2c);if (ret)return ret; xfer_len++; - val =readw (i2c_dev->base +WMTI2C_REG_CSR ); -if ((val &WMTI2C_CSR_RCV_ACK_MASK ) ==WMTI2C_CSR_RCV_NOT_ACK ) { -dev_dbg (i2c_dev->dev,"write RCV NACK error\n" ); + val =readw (base +WMTI2C_REG_CSR ); +if (val &WMTI2C_CSR_RCV_NOT_ACK ) { +dev_dbg (i2c->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); + val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY + |WMTI2C_CR_ENABLE ; +writew (val, base +WMTI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); +writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); }else { -writew (pmsg->buf[xfer_len] &0xFF , i2c_dev->base + -WMTI2C_REG_CDR ); -writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); +writew (pmsg->buf[xfer_len] &0xFF , + base +WMTI2C_REG_CDR ); +writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , + base +WMTI2C_REG_CR ); } }return 0 ; } -static int wmt_i2c_read (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg) +static int wmt_i2c_read (struct wmt_i2c *i2c,struct i2c_msg *pmsg) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;u32 xfer_len =0 ; +void __iomem *base = i2c->base; - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val &= ~(WMTI2C_CR_TX_END |WMTI2C_CR_TX_NEXT_NO_ACK );if (!(pmsg->flags &I2C_M_NOSTART ))
@@ -206,32 +213,33 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)if (pmsg->len ==1 ) val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |=WMTI2C_TCR_MASTER_READ | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); + tcr_val |=WMTI2C_TCR_MASTER_READ + | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); -writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR ); +writew (tcr_val, base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val |=WMTI2C_CR_CPU_RDY ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =wmt_check_status (i2c);if (ret)return ret; - pmsg->buf[xfer_len] =readw (i2c_dev->base +WMTI2C_REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (base +WMTI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (i2c_dev->base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ; + val =readw (base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); }return 0 ;
@@ -244,20 +252,20 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *pmsg;int i;int ret =0 ; -struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap); +struct wmt_i2c *i2c =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c_dev); + ret =wmt_i2c_wait_bus_not_busy (i2c);if (ret <0 )return ret; }if (pmsg->flags &I2C_M_RD ) - ret =wmt_i2c_read (i2c_dev, pmsg); + ret =wmt_i2c_read (i2c, pmsg);else - ret =wmt_i2c_write (i2c_dev, pmsg, (i +1 ) == num); + ret =wmt_i2c_write (i2c, pmsg, (i +1 ) == num); }return (ret <0 ) ? ret : i;
@@ -275,78 +283,79 @@ static const struct i2c_algorithm wmt_i2c_algo = {static irqreturn_t wmt_i2c_isr (int irq,void *data) { -struct wmt_i2c_dev *i2c_dev = data; +struct wmt_i2c *i2c = data;/* save the status and write-clear it */ - i2c_dev->cmd_status =readw (i2c_dev->base +WMTI2C_REG_ISR ); -writew (i2c_dev->cmd_status, i2c_dev->base +WMTI2C_REG_ISR ); + i2c->cmd_status =readw (i2c->base +WMTI2C_REG_ISR ); +writew (i2c->cmd_status, i2c->base +WMTI2C_REG_ISR ); -complete (&i2c_dev->complete); +complete (&i2c->complete);return IRQ_HANDLED ; } -static int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +static int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c **pi2c) {int err; -struct wmt_i2c_dev *i2c_dev; +struct wmt_i2c *i2c;struct device_node *np = pdev->dev.of_node; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) + i2c =devm_kzalloc (&pdev->dev,sizeof (*i2c),GFP_KERNEL ); +if (!i2c)return -ENOMEM ; - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); + i2c->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c->base)) +return PTR_ERR (i2c->base); - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq)return -EINVAL ; - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, -0 , pdev->name, i2c_dev); + err =devm_request_irq (&pdev->dev, i2c->irq, wmt_i2c_isr, +0 , pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err, -"failed to request irq %i\n" , i2c_dev->irq); +"failed to request irq %i\n" , i2c->irq); - i2c_dev->dev = &pdev->dev; -init_completion (&i2c_dev->complete); -platform_set_drvdata (pdev, i2c_dev); + i2c->dev = &pdev->dev; +init_completion (&i2c->complete); +platform_set_drvdata (pdev, i2c); - *pi2c_dev = i2c_dev; + *pi2c = i2c;return 0 ; } -static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) +static int wmt_i2c_reset_hardware (struct wmt_i2c *i2c) {int err; +void __iomem *base = i2c->base; - err =clk_prepare_enable (i2c_dev->clk); + err =clk_prepare_enable (i2c->clk);if (err) { -dev_err (i2c_dev->dev,"failed to enable clock\n" ); +dev_err (i2c->dev,"failed to enable clock\n" );return err; } - err =clk_set_rate (i2c_dev->clk,20000000 ); + err =clk_set_rate (i2c->clk,20000000 );if (err) { -dev_err (i2c_dev->dev,"failed to set clock = 20Mhz\n" ); -clk_disable_unprepare (i2c_dev->clk); +dev_err (i2c->dev,"failed to set clock = 20Mhz\n" ); +clk_disable_unprepare (i2c->clk);return err; } -writew (0 , i2c_dev->base +WMTI2C_REG_CR ); -writew (WMTI2C_MCR_APB_166M , i2c_dev->base +WMTI2C_REG_MCR ); -writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); -writew (WMTI2C_IMR_ENABLE_ALL , i2c_dev->base +WMTI2C_REG_IMR ); -writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); -readw (i2c_dev->base +WMTI2C_REG_CSR );/* read clear */ -writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); +writew (0 , base +WMTI2C_REG_CR ); +writew (WMTI2C_MCR_APB_166M , base +WMTI2C_REG_MCR ); +writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); +writew (WMTI2C_IMR_ENABLE_ALL , base +WMTI2C_REG_IMR ); +writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); +readw (base +WMTI2C_REG_CSR );/* read clear */ +writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); -if (i2c_dev->tcr ==WMTI2C_TCR_FAST_MODE ) -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , i2c_dev->base +WMTI2C_REG_TR ); +if (i2c->tcr ==WMTI2C_TCR_FAST_MODE ) +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , base +WMTI2C_REG_TR );else -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , i2c_dev->base +WMTI2C_REG_TR ); +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , base +WMTI2C_REG_TR );return 0 ; }
@@ -354,34 +363,34 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev)static int wmt_i2c_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node; -struct wmt_i2c_dev *i2c_dev; +struct wmt_i2c *i2c;struct i2c_adapter *adap;int err;u32 clk_rate; - err =wmt_i2c_init (pdev, &i2c_dev); + err =wmt_i2c_init (pdev, &i2c);if (err)return err; - i2c_dev->clk =of_clk_get (np,0 ); -if (IS_ERR (i2c_dev->clk)) { + i2c->clk =of_clk_get (np,0 ); +if (IS_ERR (i2c->clk)) {dev_err (&pdev->dev,"unable to request clock\n" ); -return PTR_ERR (i2c_dev->clk); +return PTR_ERR (i2c->clk); } err =of_property_read_u32 (np,"clock-frequency" , &clk_rate);if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) - i2c_dev->tcr =WMTI2C_TCR_FAST_MODE ; + i2c->tcr =WMTI2C_TCR_FAST_MODE ; - adap = &i2c_dev->adapter; -i2c_set_adapdata (adap, i2c_dev); + adap = &i2c->adapter; +i2c_set_adapdata (adap, i2c);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name)); adap->owner =THIS_MODULE ; adap->algo = &wmt_i2c_algo; adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; - err =wmt_i2c_reset_hardware (i2c_dev); + err =wmt_i2c_reset_hardware (i2c);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );return err;
@@ -392,12 +401,12 @@ static int wmt_i2c_probe(struct platform_device *pdev)static void wmt_i2c_remove (struct platform_device *pdev) { -struct wmt_i2c_dev *i2c_dev =platform_get_drvdata (pdev); +struct wmt_i2c *i2c =platform_get_drvdata (pdev);/* Disable interrupts, clock and delete adapter */ -writew (0 , i2c_dev->base +WMTI2C_REG_IMR ); -clk_disable_unprepare (i2c_dev->clk); -i2c_del_adapter (&i2c_dev->adapter); +writew (0 , i2c->base +WMTI2C_REG_IMR ); +clk_disable_unprepare (i2c->clk); +i2c_del_adapter (&i2c->adapter); }static const struct of_device_id wmt_i2c_dt_ids[] = {
Signature · 1 line
2.34.1
PATCH v5 4/8 i2c: wmt: split out common files
In reply to Hans HuSince the I2C IP of both wmt and zhaoxin come from VIA, the common driver is named as i2c-viai2c-common.c. Old i2c-wmt.c renamed to i2c-wmt-plt.c.
The MAINTAINERS information will added in patch 0008.
--- MAINTAINERS | 2 +- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 234 ++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 66 ++++ drivers/i2c/busses/i2c-wmt-plt.c | 137 ++++++++ drivers/i2c/busses/i2c-wmt.c | 431 ------------------------- 6 files changed, 440 insertions(+), 432 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-wmt-plt.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c
MAINTAINERS +1 -1
@@ -2988,7 +2988,7 @@ S: Orphan F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt F: arch/arm/mach-vt8500/ F: drivers/clocksource/timer-vt8500.c -F: drivers/i2c/busses/i2c-wmt.c +F: drivers/i2c/busses/i2c-wmt-plt.c F: drivers/mmc/host/wmt-sdmmc.c F: drivers/pwm/pwm-vt8500.c F: drivers/rtc/rtc-vt8500.c
drivers/i2c/busses/Makefile +2 -0
@@ -120,7 +120,9 @@ obj-$(CONFIG_I2C_TEGRA_BPMP) += i2c-tegra-bpmp.o obj-$(CONFIG_I2C_UNIPHIER) += i2c-uniphier.o obj-$(CONFIG_I2C_UNIPHIER_F) += i2c-uniphier-f.o obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o +i2c-wmt-objs := i2c-wmt-plt.o i2c-viai2c-common.o obj-$(CONFIG_I2C_WMT) += i2c-wmt.o + i2c-octeon-objs := i2c-octeon-core.o i2c-octeon-platdrv.o obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o i2c-thunderx-objs := i2c-octeon-core.o i2c-thunderx-pcidrv.o
drivers/i2c/busses/i2c-viai2c-common.c new file +234 -0
234 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-common.h new file +66 -0
66 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt-plt.c new file +137 -0
137 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt.c deleted +0 -431
431 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v5 5/8 i2c: wmt: rename with prefix VIAI2C_ and viai2c_
In reply to Hans HuSince the I2C IP of both wmt and zhaoxin come from VIA. So, rename common register, function and variable's name to VIAI2C_ and viai2c_.
--- drivers/i2c/busses/i2c-viai2c-common.c | 118 ++++++++++++------------- drivers/i2c/busses/i2c-viai2c-common.h | 60 ++++++------- drivers/i2c/busses/i2c-wmt-plt.c | 30 ++++--- 3 files changed, 105 insertions(+), 103 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +59 -59
@@ -2,15 +2,15 @@#include <linux/of_irq.h> #include "i2c-viai2c-common.h" -#define WMT_I2C_TIMEOUT (msecs_to_jiffies(1000)) +#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000)) -static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c *i2c) +static int viai2c_wait_bus_ready (struct viai2c *i2c) {unsigned long timeout;void __iomem *base = i2c->base; - timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) { + timeout = jiffies +VIAI2C_TIMEOUT ; +while (!(readw (base +VIAI2C_REG_CSR ) &VIAI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) {dev_warn (i2c->dev,"timeout waiting for bus ready\n" );
@@ -22,7 +22,7 @@ static int wmt_i2c_wait_bus_not_busy(struct wmt_i2c *i2c)return 0 ; } -static int wmt_check_status (struct wmt_i2c *i2c) +static int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ;unsigned long wait_result;
@@ -32,29 +32,29 @@ static int wmt_check_status(struct wmt_i2c *i2c)if (!wait_result)return -ETIMEDOUT ; -if (i2c->cmd_status &WMTI2C_ISR_NACK_ADDR ) +if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) +if (i2c->cmd_status &VIAI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret; } -static irqreturn_t wmt_i2c_isr (int irq,void *data) +static irqreturn_t viai2c_isr (int irq,void *data) { -struct wmt_i2c *i2c = data; +struct viai2c *i2c = data;/* save the status and write-clear it */ - i2c->cmd_status =readw (i2c->base +WMTI2C_REG_ISR ); -writew (i2c->cmd_status, i2c->base +WMTI2C_REG_ISR ); + i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR );complete (&i2c->complete);return IRQ_HANDLED ; } -static int wmt_i2c_write (struct wmt_i2c *i2c,struct i2c_msg *pmsg, +static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,int last) {u16 val, tcr_val = i2c->tcr;
@@ -68,143 +68,143 @@ static int wmt_i2c_write(struct wmt_i2c *i2c, struct i2c_msg *pmsg,* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , base +WMTI2C_REG_CDR ); +writew (0 , base +VIAI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , base +WMTI2C_REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , base +VIAI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (base +WMTI2C_REG_CR ); - val &= ~WMTI2C_CR_TX_END ; - val |=WMTI2C_CR_CPU_RDY ; -writew (val, base +WMTI2C_REG_CR ); + val =readw (base +VIAI2C_REG_CR ); + val &= ~VIAI2C_CR_TX_END ; + val |=VIAI2C_CR_CPU_RDY ; +writew (val, base +VIAI2C_REG_CR ); }reinit_completion (&i2c->complete); - tcr_val |= (WMTI2C_TCR_MASTER_WRITE - | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); + tcr_val |= (VIAI2C_TCR_MASTER_WRITE + | (pmsg->addr &VIAI2C_TCR_SLAVE_ADDR_MASK )); -writew (tcr_val, base +WMTI2C_REG_TCR ); +writew (tcr_val, base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (base +WMTI2C_REG_CR ); - val |=WMTI2C_CR_CPU_RDY ; -writew (val, base +WMTI2C_REG_CR ); + val =readw (base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c); + ret =viai2c_wait_status (i2c);if (ret)return ret; xfer_len++; - val =readw (base +WMTI2C_REG_CSR ); -if (val &WMTI2C_CSR_RCV_NOT_ACK ) { + val =readw (base +VIAI2C_REG_CSR ); +if (val &VIAI2C_CSR_RCV_NOT_ACK ) {dev_dbg (i2c->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY - |WMTI2C_CR_ENABLE ; -writew (val, base +WMTI2C_REG_CR ); + val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY + |VIAI2C_CR_ENABLE ; +writew (val, base +VIAI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); +writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , - base +WMTI2C_REG_CDR ); -writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , - base +WMTI2C_REG_CR ); + base +VIAI2C_REG_CDR ); +writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , + base +VIAI2C_REG_CR ); } }return 0 ; } -static int wmt_i2c_read (struct wmt_i2c *i2c,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) {u16 val, tcr_val = i2c->tcr;int ret;u32 xfer_len =0 ;void __iomem *base = i2c->base; - val =readw (base +WMTI2C_REG_CR ); - val &= ~(WMTI2C_CR_TX_END |WMTI2C_CR_TX_NEXT_NO_ACK ); + val =readw (base +VIAI2C_REG_CR ); + val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END );if (!(pmsg->flags &I2C_M_NOSTART )) - val |=WMTI2C_CR_CPU_RDY ; + val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 ) - val |=WMTI2C_CR_TX_NEXT_NO_ACK ; + val |=VIAI2C_CR_RX_END ; -writew (val, base +WMTI2C_REG_CR ); +writew (val, base +VIAI2C_REG_CR );reinit_completion (&i2c->complete); - tcr_val |=WMTI2C_TCR_MASTER_READ - | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); + tcr_val |=VIAI2C_TCR_MASTER_READ + | (pmsg->addr &VIAI2C_TCR_SLAVE_ADDR_MASK ); -writew (tcr_val, base +WMTI2C_REG_TCR ); +writew (tcr_val, base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (base +WMTI2C_REG_CR ); - val |=WMTI2C_CR_CPU_RDY ; -writew (val, base +WMTI2C_REG_CR ); + val =readw (base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c); + ret =viai2c_wait_status (i2c);if (ret)return ret; - pmsg->buf[xfer_len] =readw (base +WMTI2C_REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (base +VIAI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ; + val =readw (base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) - val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, base +WMTI2C_REG_CR ); + val |=VIAI2C_CR_RX_END ; +writew (val, base +VIAI2C_REG_CR ); }return 0 ; } -int wmt_i2c_xfer (struct i2c_adapter *adap, +int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num) {struct i2c_msg *pmsg;int i;int ret =0 ; -struct wmt_i2c *i2c =i2c_get_adapdata (adap); +struct viai2c *i2c =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c); + ret =viai2c_wait_bus_ready (i2c);if (ret <0 )return ret; }if (pmsg->flags &I2C_M_RD ) - ret =wmt_i2c_read (i2c, pmsg); + ret =viai2c_read (i2c, pmsg);else - ret =wmt_i2c_write (i2c, pmsg, (i +1 ) == num); + ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }return (ret <0 ) ? ret : i; } -int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c **pi2c) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) {int err; -struct wmt_i2c *i2c; +struct viai2c *i2c;struct device_node *np = pdev->dev.of_node; i2c =devm_kzalloc (&pdev->dev,sizeof (*i2c),GFP_KERNEL );
@@ -219,7 +219,7 @@ int wmt_i2c_init(struct platform_device *pdev, struct wmt_i2c **pi2c)if (!i2c->irq)return -EINVAL ; - err =devm_request_irq (&pdev->dev, i2c->irq, wmt_i2c_isr, + err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr,0 , pdev->name, i2c);if (err) return dev_err_probe(&pdev->dev, err,
drivers/i2c/busses/i2c-viai2c-common.h +30 -30
81 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt-plt.c +16 -14
@@ -22,13 +22,15 @@#define WMTI2C_MCR_APB_96M 7#define WMTI2C_MCR_APB_166M 12 +#define wmt_i2c viai2c +static u32 wmt_i2c_func (struct i2c_adapter *adap) {return I2C_FUNC_I2C |I2C_FUNC_SMBUS_EMUL |I2C_FUNC_NOSTART ; }static const struct i2c_algorithm wmt_i2c_algo = { - .master_xfer = wmt_i2c_xfer, + .master_xfer = viai2c_xfer, .functionality = wmt_i2c_func, };
@@ -50,18 +52,18 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c *i2c)return err; } -writew (0 , base +WMTI2C_REG_CR ); -writew (WMTI2C_MCR_APB_166M , base +WMTI2C_REG_MCR ); -writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); -writew (WMTI2C_IMR_ENABLE_ALL , base +WMTI2C_REG_IMR ); -writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); -readw (base +WMTI2C_REG_CSR );/* read clear */ -writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); +writew (0 , base +VIAI2C_REG_CR ); +writew (WMTI2C_MCR_APB_166M , base +VIAI2C_REG_MCR ); +writew (VIAI2C_ISR_MASK_ALL , base +VIAI2C_REG_ISR ); +writew (VIAI2C_IMR_ENABLE_ALL , base +VIAI2C_REG_IMR ); +writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); +readw (base +VIAI2C_REG_CSR );/* read clear */ +writew (VIAI2C_ISR_MASK_ALL , base +VIAI2C_REG_ISR ); -if (i2c->tcr ==WMTI2C_TCR_FAST_MODE ) -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , base +WMTI2C_REG_TR ); +if (i2c->tcr ==VIAI2C_TCR_FAST ) +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , base +VIAI2C_REG_TR );else -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , base +WMTI2C_REG_TR ); +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , base +VIAI2C_REG_TR );return 0 ; }
@@ -74,7 +76,7 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - err =wmt_i2c_init (pdev, &i2c); + err =viai2c_init (pdev, &i2c);if (err)return err;
@@ -86,7 +88,7 @@ static int wmt_i2c_probe(struct platform_device *pdev) err =of_property_read_u32 (np,"clock-frequency" , &clk_rate);if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) - i2c->tcr =WMTI2C_TCR_FAST_MODE ; + i2c->tcr =VIAI2C_TCR_FAST ; adap = &i2c->adapter;i2c_set_adapdata (adap, i2c);
@@ -110,7 +112,7 @@ static void wmt_i2c_remove(struct platform_device *pdev)struct wmt_i2c *i2c =platform_get_drvdata (pdev);/* Disable interrupts, clock and delete adapter */ -writew (0 , i2c->base +WMTI2C_REG_IMR ); +writew (0 , i2c->base +VIAI2C_REG_IMR );clk_disable_unprepare (i2c->clk);i2c_del_adapter (&i2c->adapter); }
Signature · 1 line
2.34.1
PATCH v5 6/8 i2c: wmt: fix a bug when thread blocked
In reply to Hans HuDuring each byte access, the host performs clock stretching. In this case, the thread may be interrupted by preemption, resulting in a long stretching time.
However, some touchpad can only tolerate host clock stretching of no more than 200 ms. We reduce the impact of this through a retransmission mechanism.
--- drivers/i2c/busses/i2c-viai2c-common.c | 37 +++++++++++++++++++++----- drivers/i2c/busses/i2c-viai2c-common.h | 2 ++ 2 files changed, 33 insertions(+), 6 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +31 -6
@@ -2,7 +2,8 @@#include <linux/of_irq.h> #include "i2c-viai2c-common.h" -#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000)) +#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000)) +#define VIAI2C_STRETCHING_TIMEOUT 200static int viai2c_wait_bus_ready (struct viai2c *i2c) {
@@ -25,12 +26,35 @@ static int viai2c_wait_bus_ready(struct viai2c *i2c)static int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ; -unsigned long wait_result; +unsigned long time_left; +unsigned long delta_ms; + + time_left =wait_for_completion_timeout (&i2c->complete, +VIAI2C_TIMEOUT ); +if (!time_left) { +dev_err (i2c->dev,"bus transfer timeout\n" ); +return -EIO ; + } - wait_result =wait_for_completion_timeout (&i2c->complete, -msecs_to_jiffies (500 )); -if (!wait_result) -return -ETIMEDOUT ; +/* +* During each byte access, the host performs clock stretching. +* In this case, the thread may be interrupted by preemption, +* resulting in a long stretching time. +* However, some touchpad can only tolerate host clock stretching +* of no more than 200 ms. We reduce the impact of this through +* a retransmission mechanism. +*/ +local_irq_disable (); + i2c->to =ktime_get (); + delta_ms =ktime_to_ms (ktime_sub (i2c->to, i2c->ti)); +if (delta_ms >VIAI2C_STRETCHING_TIMEOUT ) { +local_irq_enable (); +dev_warn (i2c->dev,"thread blocked more than %ldms\n" , + delta_ms); +return -EAGAIN ; + } + i2c->ti = i2c->to; +local_irq_enable ();if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ;
@@ -184,6 +208,7 @@ int viai2c_xfer(struct i2c_adapter *adap,int ret =0 ;struct viai2c *i2c =i2c_get_adapdata (adap); + i2c->to = i2c->ti =ktime_get ();for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) {
drivers/i2c/busses/i2c-viai2c-common.h +2 -0
@@ -58,6 +58,8 @@ struct viai2c {u16 tcr;int irq;u16 cmd_status; +ktime_t ti; +ktime_t to; };int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num);
Signature · 1 line
2.34.1
PATCH v5 7/8 i2c: wmt: add platform type VIAI2C_PLAT_WMT
In reply to Hans HuEnumeration variables are added to differentiate between different platforms.
--- drivers/i2c/busses/i2c-viai2c-common.c | 34 ++++++++++++++++---------- drivers/i2c/busses/i2c-viai2c-common.h | 7 +++++- drivers/i2c/busses/i2c-wmt-plt.c | 2 +- 3 files changed, 28 insertions(+), 15 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +21 -13
@@ -78,8 +78,7 @@ static irqreturn_t viai2c_isr(int irq, void *data)return IRQ_HANDLED ; } -static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg, -int last) +static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,bool last) {u16 val, tcr_val = i2c->tcr;int ret;
@@ -97,7 +96,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg,writew (pmsg->buf[0 ] &0xFF , base +VIAI2C_REG_CDR ); } -if (!(pmsg->flags &I2C_M_NOSTART )) { +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) { val =readw (base +VIAI2C_REG_CR ); val &= ~VIAI2C_CR_TX_END ; val |=VIAI2C_CR_CPU_RDY ;
@@ -111,7 +110,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg,writew (tcr_val, base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && pmsg->flags &I2C_M_NOSTART ) { val =readw (base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, base +VIAI2C_REG_CR );
@@ -138,7 +137,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, }if (xfer_len == pmsg->len) { -if (last !=1 ) +if (i2c->platform ==VIAI2C_PLAT_WMT && !last)writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); }else { writew(pmsg->buf[xfer_len] & 0xFF,
@@ -161,7 +160,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg) val =readw (base +VIAI2C_REG_CR ); val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END ); -if (!(pmsg->flags &I2C_M_NOSTART )) +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 )
@@ -176,7 +175,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) { val =readw (base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, base +VIAI2C_REG_CR );
@@ -211,7 +210,8 @@ int viai2c_xfer(struct i2c_adapter *adap, i2c->to = i2c->ti =ktime_get ();for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i]; -if (!(pmsg->flags &I2C_M_NOSTART )) { +if ((i2c->platform ==VIAI2C_PLAT_WMT ) + && !(pmsg->flags &I2C_M_NOSTART )) { ret =viai2c_wait_bus_ready (i2c);if (ret <0 )return ret;
@@ -226,9 +226,10 @@ int viai2c_xfer(struct i2c_adapter *adap,return (ret <0 ) ? ret : i; } -int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat) {int err; +int irq_flags;struct viai2c *i2c;struct device_node *np = pdev->dev.of_node;
@@ -240,12 +241,19 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c)if (IS_ERR (i2c->base))return PTR_ERR (i2c->base); - i2c->irq =irq_of_parse_and_map (np,0 ); -if (!i2c->irq) -return -EINVAL ; +if (plat ==VIAI2C_PLAT_WMT ) { + irq_flags =0 ; + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq) +return -EINVAL ; + }else +return dev_err_probe (&pdev->dev, -EINVAL , +"wrong platform type\n" ); + + i2c->platform = plat; err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr, -0 , pdev->name, i2c); + irq_flags, pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err,"failed to request irq %i\n" , i2c->irq);
drivers/i2c/busses/i2c-viai2c-common.h +6 -1
@@ -49,6 +49,10 @@#define VIAI2C_REG_TR 0x0C#define VIAI2C_REG_MCR 0x0E +enum { +VIAI2C_PLAT_WMT =1 , +}; +struct viai2c {struct i2c_adapter adapter;struct completion complete;
@@ -60,9 +64,10 @@ struct viai2c {u16 cmd_status;ktime_t ti;ktime_t to; + int platform; };int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num); -int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c); +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat);#endif
drivers/i2c/busses/i2c-wmt-plt.c +1 -1
@@ -76,7 +76,7 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - err =viai2c_init (pdev, &i2c); + err =viai2c_init (pdev, &i2c,VIAI2C_PLAT_WMT );if (err)return err;
Signature · 1 line
2.34.1
PATCH v5 8/8 i2c: add zhaoxin i2c controller driver
In reply to Hans HuAdd Zhaoxin I2C controller driver. It provides the access to the i2c busses, which connects to the touchpad, eeprom, I2S, etc.
Zhaoxin I2C controller has two separate busses, so may accommodate up to two I2C adapters. Those adapters are listed in the ACPI namespace with the "IIC1D17" HID, and probed by a platform driver.
The driver works with IRQ mode, and supports basic I2C features. Flags I2C_AQ_NO_ZERO_LEN and I2C_AQ_COMB_WRITE_THEN_READ are used to limit the unsupported access.
--- MAINTAINERS | 8 + drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 21 +- drivers/i2c/busses/i2c-viai2c-common.h | 6 + drivers/i2c/busses/i2c-zhaoxin-plt.c | 298 +++++++++++++++++++++++++ 6 files changed, 340 insertions(+), 5 deletions(-) create mode 100644 drivers/i2c/busses/i2c-zhaoxin-plt.c
MAINTAINERS +8 -0
@@ -10023,6 +10023,14 @@ L: [email protected] F: Documentation/i2c/busses/i2c-ismt.rst F: drivers/i2c/busses/i2c-ismt.c +I2C/SMBUS ZHAOXIN DRIVER +M: Hans Hu <[email protected]> +L: [email protected] +S: Maintained +W: https://www.zhaoxin.com +F: drivers/i2c/busses/i2c-viai2c-common.c +F: drivers/i2c/busses/i2c-zhaoxin.c + I2C/SMBUS STUB DRIVER M: Jean Delvare <[email protected]> L: [email protected]
drivers/i2c/busses/Kconfig +10 -0
@@ -336,6 +336,16 @@ config I2C_VIAPRO if ACPI +config I2C_ZHAOXIN + tristate "Zhaoxin I2C Interface" + depends on PCI || COMPILE_TEST + help + If you say yes to this option, support will be included for the + ZHAOXIN I2C interface + + This driver can also be built as a module. If so, the module + will be called i2c-zhaoxin. + comment "ACPI drivers" config I2C_SCMI
drivers/i2c/busses/Makefile +2 -0
@@ -29,6 +29,8 @@ obj-$(CONFIG_I2C_SIS630) += i2c-sis630.o obj-$(CONFIG_I2C_SIS96X) += i2c-sis96x.o obj-$(CONFIG_I2C_VIA) += i2c-via.o obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o +i2c-zhaoxin-objs := i2c-zhaoxin-plt.o i2c-viai2c-common.o +obj-$(CONFIG_I2C_ZHAOXIN) += i2c-zhaoxin.o # Mac SMBus host controller drivers obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o
drivers/i2c/busses/i2c-viai2c-common.c +16 -5
@@ -5,7 +5,7 @@#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000))#define VIAI2C_STRETCHING_TIMEOUT 200 -static int viai2c_wait_bus_ready (struct viai2c *i2c) +int viai2c_wait_bus_ready (struct viai2c *i2c) {unsigned long timeout;void __iomem *base = i2c->base;
@@ -23,7 +23,7 @@ static int viai2c_wait_bus_ready(struct viai2c *i2c)return 0 ; } -static int viai2c_wait_status (struct viai2c *i2c) +int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ;unsigned long time_left;
@@ -71,6 +71,9 @@ static irqreturn_t viai2c_isr(int irq, void *data)/* save the status and write-clear it */ i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +if (!i2c->cmd_status) +return IRQ_NONE ; +writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR );complete (&i2c->complete);
@@ -139,6 +142,8 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, bool last)if (xfer_len == pmsg->len) {if (i2c->platform ==VIAI2C_PLAT_WMT && !last)writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); +else if (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && last) +writeb (VIAI2C_CR_TX_END , base +VIAI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , base +VIAI2C_REG_CDR );
@@ -150,7 +155,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, bool last)return 0 ; } -static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg,bool first) {u16 val, tcr_val = i2c->tcr;int ret;
@@ -175,7 +180,8 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, base +VIAI2C_REG_TCR ); -if (i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) { +if ((i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) + || (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && !first)) { val =readw (base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, base +VIAI2C_REG_CR );
@@ -218,7 +224,7 @@ int viai2c_xfer(struct i2c_adapter *adap, }if (pmsg->flags &I2C_M_RD ) - ret =viai2c_read (i2c, pmsg); + ret =viai2c_read (i2c, pmsg, i ==0 );else ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }
@@ -246,6 +252,11 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c, int plat) i2c->irq =irq_of_parse_and_map (np,0 );if (!i2c->irq)return -EINVAL ; + }else if (plat ==VIAI2C_PLAT_ZHAOXIN ) { + irq_flags =IRQF_SHARED ; + i2c->irq =platform_get_irq (pdev,0 ); +if (i2c->irq <0 ) +return i2c->irq; }else return dev_err_probe (&pdev->dev, -EINVAL ,"wrong platform type\n" );
drivers/i2c/busses/i2c-viai2c-common.h +6 -0
@@ -51,6 +51,7 @@enum {VIAI2C_PLAT_WMT =1 , +VIAI2C_PLAT_ZHAOXIN };struct viai2c {
@@ -65,8 +66,13 @@ struct viai2c {ktime_t ti;ktime_t to;int platform; +u8 hrv; +u16 tr; +u16 mcr; }; +int viai2c_wait_status (struct viai2c *i2c); +int viai2c_wait_bus_ready (struct viai2c *i2c);int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num);int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat);
drivers/i2c/busses/i2c-zhaoxin-plt.c new file +298 -0
298 lines not on this page · raw message
Signature · 1 line
2.34.1
kernel test robot
build botkernel test robot noticed the following build warnings:
Hi Hans,
kernel test robot noticed the following build warnings:
[auto build test WARNING on wsa/i2c/for-next]
[cannot apply to linus/master v6.7-rc7 next-20231220]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Hans-Hu/i2c-wmt-create-wmt_i2c_init-for-general-init/20231228-112208 base: https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/for-next patch link: https://lore.kernel.org/r/efbdee3ccae776a8f45d3ea5e28fdee334a3c07b.1703733126.git.hanshu-oc%40zhaoxin.com patch subject: [PATCH v5 8/8] i2c: add zhaoxin i2c controller driver config: loongarch-randconfig-r081-20231229 (https://download.01.org/0day-ci/archive/20231229/[email protected]/config) compiler: loongarch64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231229/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> drivers/i2c/busses/i2c-zhaoxin-plt.c:265:12: warning: 'zxi2c_resume' defined but not used [-Wunused-function]
265 | static int zxi2c_resume(struct device *dev)
| ^~~~~~~~~~~~
vim +/zxi2c_resume +265 drivers/i2c/busses/i2c-zhaoxin-plt.c
264
> 265 static int zxi2c_resume(struct device *dev)
266 {
267 struct zxi2c *i2c = dev_get_drvdata(dev);
268
269 iowrite8(ZXI2C_CR_MST_RST, i2c->base + VIAI2C_REG_CR);
270 zxi2c_set_bus_speed(i2c);
271
272 return 0;
273 }
274
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
v6 cover i2c: add zhaoxin i2c controller driver
In reply to Hans Huv5->v6:
fix build warnning reported by kernel test robotv4->v5:
fix some build errors.
In version v4, the patch consists of 8 files. This version is based on the latest for-next branch, with some adjustments as suggested by Wolfram.
Hans Hu (8):
i2c: wmt: create wmt_i2c_init for general init
i2c: wmt: rename marcos with prefix WMTI2C_
i2c: wmt: adjust line length to meet style
i2c: wmt: split out common files
i2c: wmt: rename with prefix VIAI2C_ and viai2c_
i2c: wmt: fix a bug when thread blocked
i2c: wmt: add platform type VIAI2C_PLAT_WMT
i2c: add zhaoxin i2c controller driver
MAINTAINERS | 10 +- drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 4 + drivers/i2c/busses/i2c-viai2c-common.c | 278 +++++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 79 +++++ drivers/i2c/busses/i2c-wmt-plt.c | 139 +++++++++ drivers/i2c/busses/i2c-wmt.c | 417 ------------------------- drivers/i2c/busses/i2c-zhaoxin-plt.c | 298 ++++++++++++++++++ 8 files changed, 817 insertions(+), 418 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-wmt-plt.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c create mode 100644 drivers/i2c/busses/i2c-zhaoxin-plt.c
Signature · 1 line
2.34.1
PATCH v6 1/8 i2c: wmt: create wmt_i2c_init for general init
v4->v5:
add previous prototype 'static' for wmt_i2c_init().
Some common initialization actions are put in the function wmt_i2c_init(), which is convenient to share with zhaoxin.
--- drivers/i2c/busses/i2c-wmt.c | 67 +++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 31 deletions(-)
drivers/i2c/busses/i2c-wmt.c +36 -31
@@ -286,6 +286,38 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)return IRQ_HANDLED ; } +static int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +{ +int err; +struct wmt_i2c_dev *i2c_dev; +struct device_node *np = pdev->dev.of_node; + + i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); +if (!i2c_dev) +return -ENOMEM ; + + i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c_dev->base)) +return PTR_ERR (i2c_dev->base); + + i2c_dev->irq =irq_of_parse_and_map (np,0 ); +if (!i2c_dev->irq) +return -EINVAL ; + + err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, +0 , pdev->name, i2c_dev); +if (err) +return dev_err_probe (&pdev->dev, err, +"failed to request irq %i\n" , i2c_dev->irq); + + i2c_dev->dev = &pdev->dev; +init_completion (&i2c_dev->complete); +platform_set_drvdata (pdev, i2c_dev); + + *pi2c_dev = i2c_dev; +return 0 ; +} +static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) {int err;
@@ -327,19 +359,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) -return -ENOMEM ; - - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); - - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) { -dev_err (&pdev->dev,"irq missing or invalid\n" ); -return -EINVAL ; - } + err =wmt_i2c_init (pdev, &i2c_dev); +if (err) +return err; i2c_dev->clk =of_clk_get (np,0 );if (IS_ERR (i2c_dev->clk)) {
@@ -351,15 +373,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) i2c_dev->tcr =TCR_FAST_MODE ; - i2c_dev->dev = &pdev->dev; - - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr,0 , -"i2c" , i2c_dev); -if (err) { -dev_err (&pdev->dev,"failed to request irq %i\n" , i2c_dev->irq); -return err; - } - adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name));
@@ -368,21 +381,13 @@ static int wmt_i2c_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; -init_completion (&i2c_dev->complete); - err =wmt_i2c_reset_hardware (i2c_dev);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );return err; } - err =i2c_add_adapter (adap); -if (err) -return err; - -platform_set_drvdata (pdev, i2c_dev); - -return 0 ; +return i2c_add_adapter (adap); }static void wmt_i2c_remove (struct platform_device *pdev)
Signature · 1 line
2.34.1
Re: [PATCH v6 1/8] i2c: wmt: create wmt_i2c_init for general init
Hi Hans,
Quoted 16 lines · Hans Hu
v4->v5:
add previous prototype 'static' forwmt_i2c_init().Some common initialization actions are put in the function
wmt_i2c_init(), which is convenient to share with zhaoxin.Signed-off-by Hans Hu <[email protected]>--- drivers/i2c/busses/i2c-wmt.c | 67 +++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 31 deletions(-)drivers/i2c/busses/i2c-wmt.c +0
-0
drivers/i2c/busses/i2c-wmt.c static irqreturn_t wmt_i2c_isr(int irq, void *data) · line 289
Quoted 4 lines
drivers/i2c/busses/i2c-wmt.c +1
-0@@ -286,6 +286,38 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)return IRQ_HANDLED ; } +static int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev)
looks good, I would rather make this a
static struct wmt_i2c_dev *wmt_i2c_init(struct platform_device *pdev)
{
struct wmt_i2c_dev *i2c_dev;
...
return i2c_dev;}
kind of function and call it as:
i2c_dev = wmt_i2c_init(...); if (IS_ERR(i2c_dev)) return ERR_PTR(i2c_dev);
Not a binding comment. It just looks nicer; in that case I would call the function wmt_i2c_dev_alloc().
In any case:
Andi
Quoted 99 lines
drivers/i2c/busses/i2c-wmt.c +35
-31+{ +int err; +struct wmt_i2c_dev *i2c_dev; +struct device_node *np = pdev->dev.of_node; + + i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); +if (!i2c_dev) +return -ENOMEM ; + + i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c_dev->base)) +return PTR_ERR (i2c_dev->base); + + i2c_dev->irq =irq_of_parse_and_map (np,0 ); +if (!i2c_dev->irq) +return -EINVAL ; + + err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, +0 , pdev->name, i2c_dev); +if (err) +return dev_err_probe (&pdev->dev, err, +"failed to request irq %i\n" , i2c_dev->irq); + + i2c_dev->dev = &pdev->dev; +init_completion (&i2c_dev->complete); +platform_set_drvdata (pdev, i2c_dev); + + *pi2c_dev = i2c_dev; +return 0 ; +} +static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) {int err;@@ -327,19 +359,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) -return -ENOMEM ; - - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); - - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) { -dev_err (&pdev->dev,"irq missing or invalid\n" ); -return -EINVAL ; - } + err =wmt_i2c_init (pdev, &i2c_dev); +if (err) +return err; i2c_dev->clk =of_clk_get (np,0 );if (IS_ERR (i2c_dev->clk)) {@@ -351,15 +373,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) i2c_dev->tcr =TCR_FAST_MODE ; - i2c_dev->dev = &pdev->dev; - - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr,0 , -"i2c" , i2c_dev); -if (err) { -dev_err (&pdev->dev,"failed to request irq %i\n" , i2c_dev->irq); -return err; - } - adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name));@@ -368,21 +381,13 @@ static int wmt_i2c_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; -init_completion (&i2c_dev->complete); - err =wmt_i2c_reset_hardware (i2c_dev);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );return err; } - err =i2c_add_adapter (adap); -if (err) -return err; - -platform_set_drvdata (pdev, i2c_dev); - -return 0 ; +return i2c_add_adapter (adap); }static void wmt_i2c_remove (struct platform_device *pdev)Signature · 1 line
2.34.1
Re: [PATCH v6 1/8] i2c: wmt: create wmt_i2c_init for general init
Quoted 32 lines · Andi Shyti
Hi Hans,
Quoted 16 lines · Hans Hu
v4->v5:
add previous prototype 'static' forwmt_i2c_init().Some common initialization actions are put in the function
wmt_i2c_init(), which is convenient to share with zhaoxin.Signed-off-by Hans Hu <[email protected]>--- drivers/i2c/busses/i2c-wmt.c | 67 +++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 31 deletions(-)drivers/i2c/busses/i2c-wmt.c +0
-0drivers/i2c/busses/i2c-wmt.c static irqreturn_t wmt_i2c_isr(int irq, void *data) · line 289
Quoted 4 lines
drivers/i2c/busses/i2c-wmt.c +1
-0@@ -286,6 +286,38 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)return IRQ_HANDLED ; } +static int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev)looks good, I would rather make this a
static struct wmt_i2c_dev *wmt_i2c_init(struct platform_device *pdev) { struct wmt_i2c_dev *i2c_dev; ... return i2c_dev; }
Quoted 8 lines
kind of function and call it as:
i2c_dev = wmt_i2c_init(...); if (IS_ERR(i2c_dev)) return ERR_PTR(i2c_dev);Not a binding comment. It just looks nicer; in that case I would call the function
wmt_i2c_dev_alloc().
OK, will change it.
Quoted 6 lines
In any case:
Reviewed-by Andi Shyti <[email protected]>Andi
PATCH v6 2/8 i2c: wmt: rename marcos with prefix WMTI2C_
In reply to Hans HuTweaked a few formatting things: rename marcos with prefix WMTI2C_
--- drivers/i2c/busses/i2c-wmt.c | 176 +++++++++++++++++------------------ 1 file changed, 88 insertions(+), 88 deletions(-)
drivers/i2c/busses/i2c-wmt.c +88 -88
@@ -20,59 +20,59 @@#include <linux/of_irq.h> #include <linux/platform_device.h> -#define REG_CR 0x00 -#define REG_TCR 0x02 -#define REG_CSR 0x04 -#define REG_ISR 0x06 -#define REG_IMR 0x08 -#define REG_CDR 0x0A -#define REG_TR 0x0C -#define REG_MCR 0x0E -#define REG_SLAVE_CR 0x10 -#define REG_SLAVE_SR 0x12 -#define REG_SLAVE_ISR 0x14 -#define REG_SLAVE_IMR 0x16 -#define REG_SLAVE_DR 0x18 -#define REG_SLAVE_TR 0x1A +#define WMTI2C_REG_CR 0x00 +#define WMTI2C_REG_TCR 0x02 +#define WMTI2C_REG_CSR 0x04 +#define WMTI2C_REG_ISR 0x06 +#define WMTI2C_REG_IMR 0x08 +#define WMTI2C_REG_CDR 0x0A +#define WMTI2C_REG_TR 0x0C +#define WMTI2C_REG_MCR 0x0E +#define WMTI2C_REG_SLAVE_CR 0x10 +#define WMTI2C_REG_SLAVE_SR 0x12 +#define WMTI2C_REG_SLAVE_ISR 0x14 +#define WMTI2C_REG_SLAVE_IMR 0x16 +#define WMTI2C_REG_SLAVE_DR 0x18 +#define WMTI2C_REG_SLAVE_TR 0x1A/* REG_CR Bit fields */ -#define CR_TX_NEXT_ACK 0x0000 -#define CR_ENABLE 0x0001 -#define CR_TX_NEXT_NO_ACK 0x0002 -#define CR_TX_END 0x0004 -#define CR_CPU_RDY 0x0008 -#define SLAV_MODE_SEL 0x8000 +#define WMTI2C_CR_TX_NEXT_ACK 0x0000 +#define WMTI2C_CR_ENABLE 0x0001 +#define WMTI2C_CR_TX_NEXT_NO_ACK 0x0002 +#define WMTI2C_CR_TX_END 0x0004 +#define WMTI2C_CR_CPU_RDY 0x0008 +#define WMTI2C_SLAV_MODE_SEL 0x8000/* REG_TCR Bit fields */ -#define TCR_STANDARD_MODE 0x0000 -#define TCR_MASTER_WRITE 0x0000 -#define TCR_HS_MODE 0x2000 -#define TCR_MASTER_READ 0x4000 -#define TCR_FAST_MODE 0x8000 -#define TCR_SLAVE_ADDR_MASK 0x007F +#define WMTI2C_TCR_STANDARD_MODE 0x0000 +#define WMTI2C_TCR_MASTER_WRITE 0x0000 +#define WMTI2C_TCR_HS_MODE 0x2000 +#define WMTI2C_TCR_MASTER_READ 0x4000 +#define WMTI2C_TCR_FAST_MODE 0x8000 +#define WMTI2C_TCR_SLAVE_ADDR_MASK 0x007F/* REG_ISR Bit fields */ -#define ISR_NACK_ADDR 0x0001 -#define ISR_BYTE_END 0x0002 -#define ISR_SCL_TIMEOUT 0x0004 -#define ISR_WRITE_ALL 0x0007 +#define WMTI2C_ISR_NACK_ADDR 0x0001 +#define WMTI2C_ISR_BYTE_END 0x0002 +#define WMTI2C_ISR_SCL_TIMEOUT 0x0004 +#define WMTI2C_ISR_WRITE_ALL 0x0007/* REG_IMR Bit fields */ -#define IMR_ENABLE_ALL 0x0007 +#define WMTI2C_IMR_ENABLE_ALL 0x0007/* REG_CSR Bit fields */ -#define CSR_RCV_NOT_ACK 0x0001 -#define CSR_RCV_ACK_MASK 0x0001 -#define CSR_READY_MASK 0x0002 +#define WMTI2C_CSR_RCV_NOT_ACK 0x0001 +#define WMTI2C_CSR_RCV_ACK_MASK 0x0001 +#define WMTI2C_CSR_READY_MASK 0x0002/* REG_TR */ -#define SCL_TIMEOUT (x) (((x) & 0xFF) << 8) -#define TR_STD 0x0064 -#define TR_HS 0x0019 +#define WMTI2C_SCL_TIMEOUT (x) (((x) & 0xFF) << 8) +#define WMTI2C_TR_STD 0x0064 +#define WMTI2C_TR_HS 0x0019/* REG_MCR */ -#define MCR_APB_96M 7 -#define MCR_APB_166M 12 +#define WMTI2C_MCR_APB_96M 7 +#define WMTI2C_MCR_APB_166M 12#define WMT_I2C_TIMEOUT (msecs_to_jiffies(1000))
@@ -92,7 +92,7 @@ static int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)unsigned long timeout; timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +REG_CSR ) &CSR_READY_MASK )) { +while (!(readw (i2c_dev->base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) {dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" );return -EBUSY ;
@@ -113,10 +113,10 @@ static int wmt_check_status(struct wmt_i2c_dev *i2c_dev)if (!wait_result)return -ETIMEDOUT ; -if (i2c_dev->cmd_status &ISR_NACK_ADDR ) +if (i2c_dev->cmd_status &WMTI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c_dev->cmd_status &ISR_SCL_TIMEOUT ) +if (i2c_dev->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret;
@@ -135,28 +135,28 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg,* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , i2c_dev->base +REG_CDR ); +writew (0 , i2c_dev->base +WMTI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +WMTI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +REG_CR ); - val &= ~CR_TX_END ; - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val &= ~WMTI2C_CR_TX_END ; + val |=WMTI2C_CR_CPU_RDY ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }reinit_completion (&i2c_dev->complete); - tcr_val |= (TCR_MASTER_WRITE | (pmsg->addr &TCR_SLAVE_ADDR_MASK )); + tcr_val |= (WMTI2C_TCR_MASTER_WRITE | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val |=WMTI2C_CR_CPU_RDY ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) {
@@ -166,25 +166,25 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg, xfer_len++; - val =readw (i2c_dev->base +REG_CSR ); -if ((val &CSR_RCV_ACK_MASK ) ==CSR_RCV_NOT_ACK ) { + val =readw (i2c_dev->base +WMTI2C_REG_CSR ); +if ((val &WMTI2C_CSR_RCV_ACK_MASK ) ==WMTI2C_CSR_RCV_NOT_ACK ) {dev_dbg (i2c_dev->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =CR_TX_END |CR_CPU_RDY |CR_ENABLE ; -writew (val, i2c_dev->base +REG_CR ); + val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE ; +writew (val, i2c_dev->base +WMTI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (CR_ENABLE , i2c_dev->base +REG_CR ); +writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , i2c_dev->base + -REG_CDR ); -writew (CR_CPU_RDY |CR_ENABLE , i2c_dev->base +REG_CR ); +WMTI2C_REG_CDR ); +writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); } }
@@ -197,27 +197,27 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)int ret;u32 xfer_len =0 ; - val =readw (i2c_dev->base +REG_CR ); - val &= ~(CR_TX_END |CR_TX_NEXT_NO_ACK ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val &= ~(WMTI2C_CR_TX_END |WMTI2C_CR_TX_NEXT_NO_ACK );if (!(pmsg->flags &I2C_M_NOSTART )) - val |=CR_CPU_RDY ; + val |=WMTI2C_CR_CPU_RDY ;if (pmsg->len ==1 ) - val |=CR_TX_NEXT_NO_ACK ; + val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); +writew (val, i2c_dev->base +WMTI2C_REG_CR );reinit_completion (&i2c_dev->complete); - tcr_val |=TCR_MASTER_READ | (pmsg->addr &TCR_SLAVE_ADDR_MASK ); + tcr_val |=WMTI2C_TCR_MASTER_READ | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val |=WMTI2C_CR_CPU_RDY ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) {
@@ -225,13 +225,13 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)if (ret)return ret; - pmsg->buf[xfer_len] =readw (i2c_dev->base +REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (i2c_dev->base +WMTI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (i2c_dev->base +REG_CR ) |CR_CPU_RDY ; + val =readw (i2c_dev->base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) - val |=CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); + val |=WMTI2C_CR_TX_NEXT_NO_ACK ; +writew (val, i2c_dev->base +WMTI2C_REG_CR ); }return 0 ;
@@ -278,8 +278,8 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)struct wmt_i2c_dev *i2c_dev = data;/* save the status and write-clear it */ - i2c_dev->cmd_status =readw (i2c_dev->base +REG_ISR ); -writew (i2c_dev->cmd_status, i2c_dev->base +REG_ISR ); + i2c_dev->cmd_status =readw (i2c_dev->base +WMTI2C_REG_ISR ); +writew (i2c_dev->cmd_status, i2c_dev->base +WMTI2C_REG_ISR );complete (&i2c_dev->complete);
@@ -335,18 +335,18 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev)return err; } -writew (0 , i2c_dev->base +REG_CR ); -writew (MCR_APB_166M , i2c_dev->base +REG_MCR ); -writew (ISR_WRITE_ALL , i2c_dev->base +REG_ISR ); -writew (IMR_ENABLE_ALL , i2c_dev->base +REG_IMR ); -writew (CR_ENABLE , i2c_dev->base +REG_CR ); -readw (i2c_dev->base +REG_CSR );/* read clear */ -writew (ISR_WRITE_ALL , i2c_dev->base +REG_ISR ); +writew (0 , i2c_dev->base +WMTI2C_REG_CR ); +writew (WMTI2C_MCR_APB_166M , i2c_dev->base +WMTI2C_REG_MCR ); +writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); +writew (WMTI2C_IMR_ENABLE_ALL , i2c_dev->base +WMTI2C_REG_IMR ); +writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); +readw (i2c_dev->base +WMTI2C_REG_CSR );/* read clear */ +writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); -if (i2c_dev->tcr ==TCR_FAST_MODE ) -writew (SCL_TIMEOUT (128 ) |TR_HS , i2c_dev->base +REG_TR ); +if (i2c_dev->tcr ==WMTI2C_TCR_FAST_MODE ) +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , i2c_dev->base +WMTI2C_REG_TR );else -writew (SCL_TIMEOUT (128 ) |TR_STD , i2c_dev->base +REG_TR ); +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , i2c_dev->base +WMTI2C_REG_TR );return 0 ; }
@@ -371,7 +371,7 @@ static int wmt_i2c_probe(struct platform_device *pdev) err =of_property_read_u32 (np,"clock-frequency" , &clk_rate);if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) - i2c_dev->tcr =TCR_FAST_MODE ; + i2c_dev->tcr =WMTI2C_TCR_FAST_MODE ; adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);
@@ -395,7 +395,7 @@ static void wmt_i2c_remove(struct platform_device *pdev)struct wmt_i2c_dev *i2c_dev =platform_get_drvdata (pdev);/* Disable interrupts, clock and delete adapter */ -writew (0 , i2c_dev->base +REG_IMR ); +writew (0 , i2c_dev->base +WMTI2C_REG_IMR );clk_disable_unprepare (i2c_dev->clk);i2c_del_adapter (&i2c_dev->adapter); }
Signature · 1 line
2.34.1
Re: [PATCH v6 2/8] i2c: wmt: rename marcos with prefix WMTI2C_
Hi Hans,
Quoted 1 line · Hans Hu
Tweaked a few formatting things: rename marcos with prefix
WMTI2C_
You say "a few" but then list only one.
Quoted 1 line
Signed-off-by Hans Hu <[email protected]>
looks correct, though:
Andi
PATCH v6 3/8 i2c: wmt: adjust line length to meet style
In reply to Hans Huv4->v5:
add previous prototype 'static' for wmt_i2c_init().
Tweaked a few formatting things:
rename wmt_i2c_dev to wmt_i2c, i2c_dev to i2c, etc.
--- drivers/i2c/busses/i2c-wmt.c | 199 ++++++++++++++++++----------------- 1 file changed, 104 insertions(+), 95 deletions(-)
drivers/i2c/busses/i2c-wmt.c +104 -95
@@ -76,7 +76,7 @@#define WMT_I2C_TIMEOUT (msecs_to_jiffies(1000)) -struct wmt_i2c_dev { +struct wmt_i2c {struct i2c_adapter adapter;struct completion complete;struct device *dev;
@@ -87,14 +87,16 @@ struct wmt_i2c_dev {u16 cmd_status; }; -static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c_dev *i2c_dev) +static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c *i2c) {unsigned long timeout; +void __iomem *base = i2c->base; timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) { +while (!(readw (base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) { -dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" ); +dev_warn (i2c->dev, +"timeout waiting for bus ready\n" );return -EBUSY ; }msleep (20 );
@@ -103,31 +105,32 @@ static int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)return 0 ; } -static int wmt_check_status (struct wmt_i2c_dev *i2c_dev) +static int wmt_check_status (struct wmt_i2c *i2c) {int ret =0 ;unsigned long wait_result; - wait_result =wait_for_completion_timeout (&i2c_dev->complete, + wait_result =wait_for_completion_timeout (&i2c->complete,msecs_to_jiffies (500 ));if (!wait_result)return -ETIMEDOUT ; -if (i2c_dev->cmd_status &WMTI2C_ISR_NACK_ADDR ) +if (i2c->cmd_status &WMTI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c_dev->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) +if (i2c->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret; } -static int wmt_i2c_write (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg, +static int wmt_i2c_write (struct wmt_i2c *i2c,struct i2c_msg *pmsg,int last) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;int xfer_len =0 ; +void __iomem *base = i2c->base;if (pmsg->len ==0 ) {/*
@@ -135,69 +138,73 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg,* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , i2c_dev->base +WMTI2C_REG_CDR ); +writew (0 , base +WMTI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +WMTI2C_REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , base +WMTI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val &= ~WMTI2C_CR_TX_END ; val |=WMTI2C_CR_CPU_RDY ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); } -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |= (WMTI2C_TCR_MASTER_WRITE | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); + tcr_val |= (WMTI2C_TCR_MASTER_WRITE + | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); -writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR ); +writew (tcr_val, base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val |=WMTI2C_CR_CPU_RDY ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =wmt_check_status (i2c);if (ret)return ret; xfer_len++; - val =readw (i2c_dev->base +WMTI2C_REG_CSR ); -if ((val &WMTI2C_CSR_RCV_ACK_MASK ) ==WMTI2C_CSR_RCV_NOT_ACK ) { -dev_dbg (i2c_dev->dev,"write RCV NACK error\n" ); + val =readw (base +WMTI2C_REG_CSR ); +if (val &WMTI2C_CSR_RCV_NOT_ACK ) { +dev_dbg (i2c->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); + val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY + |WMTI2C_CR_ENABLE ; +writew (val, base +WMTI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); +writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); }else { -writew (pmsg->buf[xfer_len] &0xFF , i2c_dev->base + -WMTI2C_REG_CDR ); -writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); +writew (pmsg->buf[xfer_len] &0xFF , + base +WMTI2C_REG_CDR ); +writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , + base +WMTI2C_REG_CR ); } }return 0 ; } -static int wmt_i2c_read (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg) +static int wmt_i2c_read (struct wmt_i2c *i2c,struct i2c_msg *pmsg) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;u32 xfer_len =0 ; +void __iomem *base = i2c->base; - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val &= ~(WMTI2C_CR_TX_END |WMTI2C_CR_TX_NEXT_NO_ACK );if (!(pmsg->flags &I2C_M_NOSTART ))
@@ -206,32 +213,33 @@ static int wmt_i2c_read(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg)if (pmsg->len ==1 ) val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |=WMTI2C_TCR_MASTER_READ | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); + tcr_val |=WMTI2C_TCR_MASTER_READ + | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); -writew (tcr_val, i2c_dev->base +WMTI2C_REG_TCR ); +writew (tcr_val, base +WMTI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +WMTI2C_REG_CR ); + val =readw (base +WMTI2C_REG_CR ); val |=WMTI2C_CR_CPU_RDY ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =wmt_check_status (i2c);if (ret)return ret; - pmsg->buf[xfer_len] =readw (i2c_dev->base +WMTI2C_REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (base +WMTI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (i2c_dev->base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ; + val =readw (base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +WMTI2C_REG_CR ); +writew (val, base +WMTI2C_REG_CR ); }return 0 ;
@@ -244,20 +252,20 @@ static int wmt_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *pmsg;int i;int ret =0 ; -struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap); +struct wmt_i2c *i2c =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c_dev); + ret =wmt_i2c_wait_bus_not_busy (i2c);if (ret <0 )return ret; }if (pmsg->flags &I2C_M_RD ) - ret =wmt_i2c_read (i2c_dev, pmsg); + ret =wmt_i2c_read (i2c, pmsg);else - ret =wmt_i2c_write (i2c_dev, pmsg, (i +1 ) == num); + ret =wmt_i2c_write (i2c, pmsg, (i +1 ) == num); }return (ret <0 ) ? ret : i;
@@ -275,78 +283,79 @@ static const struct i2c_algorithm wmt_i2c_algo = {static irqreturn_t wmt_i2c_isr (int irq,void *data) { -struct wmt_i2c_dev *i2c_dev = data; +struct wmt_i2c *i2c = data;/* save the status and write-clear it */ - i2c_dev->cmd_status =readw (i2c_dev->base +WMTI2C_REG_ISR ); -writew (i2c_dev->cmd_status, i2c_dev->base +WMTI2C_REG_ISR ); + i2c->cmd_status =readw (i2c->base +WMTI2C_REG_ISR ); +writew (i2c->cmd_status, i2c->base +WMTI2C_REG_ISR ); -complete (&i2c_dev->complete); +complete (&i2c->complete);return IRQ_HANDLED ; } -static int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +static int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c **pi2c) {int err; -struct wmt_i2c_dev *i2c_dev; +struct wmt_i2c *i2c;struct device_node *np = pdev->dev.of_node; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) + i2c =devm_kzalloc (&pdev->dev,sizeof (*i2c),GFP_KERNEL ); +if (!i2c)return -ENOMEM ; - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); + i2c->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c->base)) +return PTR_ERR (i2c->base); - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq)return -EINVAL ; - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, -0 , pdev->name, i2c_dev); + err =devm_request_irq (&pdev->dev, i2c->irq, wmt_i2c_isr, +0 , pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err, -"failed to request irq %i\n" , i2c_dev->irq); +"failed to request irq %i\n" , i2c->irq); - i2c_dev->dev = &pdev->dev; -init_completion (&i2c_dev->complete); -platform_set_drvdata (pdev, i2c_dev); + i2c->dev = &pdev->dev; +init_completion (&i2c->complete); +platform_set_drvdata (pdev, i2c); - *pi2c_dev = i2c_dev; + *pi2c = i2c;return 0 ; } -static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) +static int wmt_i2c_reset_hardware (struct wmt_i2c *i2c) {int err; +void __iomem *base = i2c->base; - err =clk_prepare_enable (i2c_dev->clk); + err =clk_prepare_enable (i2c->clk);if (err) { -dev_err (i2c_dev->dev,"failed to enable clock\n" ); +dev_err (i2c->dev,"failed to enable clock\n" );return err; } - err =clk_set_rate (i2c_dev->clk,20000000 ); + err =clk_set_rate (i2c->clk,20000000 );if (err) { -dev_err (i2c_dev->dev,"failed to set clock = 20Mhz\n" ); -clk_disable_unprepare (i2c_dev->clk); +dev_err (i2c->dev,"failed to set clock = 20Mhz\n" ); +clk_disable_unprepare (i2c->clk);return err; } -writew (0 , i2c_dev->base +WMTI2C_REG_CR ); -writew (WMTI2C_MCR_APB_166M , i2c_dev->base +WMTI2C_REG_MCR ); -writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); -writew (WMTI2C_IMR_ENABLE_ALL , i2c_dev->base +WMTI2C_REG_IMR ); -writew (WMTI2C_CR_ENABLE , i2c_dev->base +WMTI2C_REG_CR ); -readw (i2c_dev->base +WMTI2C_REG_CSR );/* read clear */ -writew (WMTI2C_ISR_WRITE_ALL , i2c_dev->base +WMTI2C_REG_ISR ); +writew (0 , base +WMTI2C_REG_CR ); +writew (WMTI2C_MCR_APB_166M , base +WMTI2C_REG_MCR ); +writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); +writew (WMTI2C_IMR_ENABLE_ALL , base +WMTI2C_REG_IMR ); +writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); +readw (base +WMTI2C_REG_CSR );/* read clear */ +writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); -if (i2c_dev->tcr ==WMTI2C_TCR_FAST_MODE ) -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , i2c_dev->base +WMTI2C_REG_TR ); +if (i2c->tcr ==WMTI2C_TCR_FAST_MODE ) +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , base +WMTI2C_REG_TR );else -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , i2c_dev->base +WMTI2C_REG_TR ); +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , base +WMTI2C_REG_TR );return 0 ; }
@@ -354,34 +363,34 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c_dev *i2c_dev)static int wmt_i2c_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node; -struct wmt_i2c_dev *i2c_dev; +struct wmt_i2c *i2c;struct i2c_adapter *adap;int err;u32 clk_rate; - err =wmt_i2c_init (pdev, &i2c_dev); + err =wmt_i2c_init (pdev, &i2c);if (err)return err; - i2c_dev->clk =of_clk_get (np,0 ); -if (IS_ERR (i2c_dev->clk)) { + i2c->clk =of_clk_get (np,0 ); +if (IS_ERR (i2c->clk)) {dev_err (&pdev->dev,"unable to request clock\n" ); -return PTR_ERR (i2c_dev->clk); +return PTR_ERR (i2c->clk); } err =of_property_read_u32 (np,"clock-frequency" , &clk_rate);if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) - i2c_dev->tcr =WMTI2C_TCR_FAST_MODE ; + i2c->tcr =WMTI2C_TCR_FAST_MODE ; - adap = &i2c_dev->adapter; -i2c_set_adapdata (adap, i2c_dev); + adap = &i2c->adapter; +i2c_set_adapdata (adap, i2c);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name)); adap->owner =THIS_MODULE ; adap->algo = &wmt_i2c_algo; adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; - err =wmt_i2c_reset_hardware (i2c_dev); + err =wmt_i2c_reset_hardware (i2c);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );return err;
@@ -392,12 +401,12 @@ static int wmt_i2c_probe(struct platform_device *pdev)static void wmt_i2c_remove (struct platform_device *pdev) { -struct wmt_i2c_dev *i2c_dev =platform_get_drvdata (pdev); +struct wmt_i2c *i2c =platform_get_drvdata (pdev);/* Disable interrupts, clock and delete adapter */ -writew (0 , i2c_dev->base +WMTI2C_REG_IMR ); -clk_disable_unprepare (i2c_dev->clk); -i2c_del_adapter (&i2c_dev->adapter); +writew (0 , i2c->base +WMTI2C_REG_IMR ); +clk_disable_unprepare (i2c->clk); +i2c_del_adapter (&i2c->adapter); }static const struct of_device_id wmt_i2c_dt_ids[] = {
Signature · 1 line
2.34.1
Andi Shyti
maintainerRe: [PATCH v6 3/8] i2c: wmt: adjust line length to meet style
Hi Hans,
in case you are going to resend this series, you could think about these improvements.
Quoted 2 lines · Hans Hu
v4->v5:
add previous prototype 'static' forwmt_i2c_init().
please, put the changelog at the end of the commit log.
Where is the changelog from v1?
Quoted 2 lines
Tweaked a few formatting things:
renamewmt_i2c_devtowmt_i2c,i2c_devto i2c, etc.
Please just list the renames, you are not doing formatting improvements here.
Quoted 1 line
Signed-off-by Hans Hu <[email protected]>
...
drivers/i2c/busses/i2c-wmt.c struct wmt_i2c_dev { · line 93
Quoted 5 lines
drivers/i2c/busses/i2c-wmt.c +2
-1-static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c_dev *i2c_dev) +static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c *i2c) {unsigned long timeout; +void __iomem *base = i2c->base;
this change and similar below, are not listed in the commit log.
drivers/i2c/busses/i2c-wmt.c struct wmt_i2c_dev { · line 99
Quoted 8 lines
drivers/i2c/busses/i2c-wmt.c +3
-2timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) { +while (!(readw (base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) { -dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" ); +dev_warn (i2c->dev, +"timeout waiting for bus ready\n" );
with /i2c_dev/i2c/ you don't need to break the line anymore (BTW, now 100 character lines are allowed, however not encouraged).
Quoted 3 lines
drivers/i2c/busses/i2c-wmt.c +0
-0return -EBUSY ; }msleep (20 );
...
drivers/i2c/busses/i2c-wmt.c static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg, · line 156
Quoted 3 lines
drivers/i2c/busses/i2c-wmt.c +2
-1- tcr_val |= (WMTI2C_TCR_MASTER_WRITE | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); + tcr_val |= (WMTI2C_TCR_MASTER_WRITE + | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ));
this change is not listed in the commit log and please, remember, the new 100 characters rule which makes these changes unnecessary).
Andi
Re: [PATCH v6 3/8] i2c: wmt: adjust line length to meet style
Quoted 4 lines · Andi Shyti
Hi Hans,
in case you are going to resend this series, you could think about these improvements.
Ok, will think about all of these
Hans
Quoted 46 lines · Hans Hu
Quoted 2 lines
v4->v5:
add previous prototype 'static' forwmt_i2c_init().please, put the changelog at the end of the commit log.
Where is the changelog from v1?
Quoted 2 lines
Tweaked a few formatting things:
renamewmt_i2c_devtowmt_i2c,i2c_devto i2c, etc.Please just list the renames, you are not doing formatting improvements here.
Quoted 1 line
Signed-off-by Hans Hu <[email protected]>...
drivers/i2c/busses/i2c-wmt.c struct wmt_i2c_dev { · line 93
Quoted 5 lines
drivers/i2c/busses/i2c-wmt.c +2
-1-static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c_dev *i2c_dev) +static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c *i2c) {unsigned long timeout; +void __iomem *base = i2c->base;this change and similar below, are not listed in the commit log.
drivers/i2c/busses/i2c-wmt.c struct wmt_i2c_dev { · line 99
Quoted 8 lines
timeout = jiffies + WMT_I2C_TIMEOUT;drivers/i2c/busses/i2c-wmt.c +3
-2-while (!(readw (i2c_dev->base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) { +while (!(readw (base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) { -dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" ); +dev_warn (i2c->dev, +"timeout waiting for bus ready\n" );with /i2c_dev/i2c/ you don't need to break the line anymore (BTW, now 100 character lines are allowed, however not encouraged).
Quoted 3 lines
return -EBUSY; } msleep(20);...
drivers/i2c/busses/i2c-wmt.c static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg, · line 156
Quoted 3 lines
drivers/i2c/busses/i2c-wmt.c +2
-1- tcr_val |= (WMTI2C_TCR_MASTER_WRITE | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); + tcr_val |= (WMTI2C_TCR_MASTER_WRITE + | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ));this change is not listed in the commit log and please, remember, the new 100 characters rule which makes these changes unnecessary).
Andi
PATCH v6 4/8 i2c: wmt: split out common files
In reply to Hans HuSince the I2C IP of both wmt and zhaoxin come from VIA, the common driver is named as i2c-viai2c-common.c. Old i2c-wmt.c renamed to i2c-wmt-plt.c.
The MAINTAINERS information will added in patch 0008.
--- MAINTAINERS | 2 +- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 234 ++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 66 ++++ drivers/i2c/busses/i2c-wmt-plt.c | 137 ++++++++ drivers/i2c/busses/i2c-wmt.c | 431 ------------------------- 6 files changed, 440 insertions(+), 432 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-wmt-plt.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c
MAINTAINERS +1 -1
@@ -2988,7 +2988,7 @@ S: Orphan F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt F: arch/arm/mach-vt8500/ F: drivers/clocksource/timer-vt8500.c -F: drivers/i2c/busses/i2c-wmt.c +F: drivers/i2c/busses/i2c-wmt-plt.c F: drivers/mmc/host/wmt-sdmmc.c F: drivers/pwm/pwm-vt8500.c F: drivers/rtc/rtc-vt8500.c
drivers/i2c/busses/Makefile +2 -0
@@ -120,7 +120,9 @@ obj-$(CONFIG_I2C_TEGRA_BPMP) += i2c-tegra-bpmp.o obj-$(CONFIG_I2C_UNIPHIER) += i2c-uniphier.o obj-$(CONFIG_I2C_UNIPHIER_F) += i2c-uniphier-f.o obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o +i2c-wmt-objs := i2c-wmt-plt.o i2c-viai2c-common.o obj-$(CONFIG_I2C_WMT) += i2c-wmt.o + i2c-octeon-objs := i2c-octeon-core.o i2c-octeon-platdrv.o obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o i2c-thunderx-objs := i2c-octeon-core.o i2c-thunderx-pcidrv.o
drivers/i2c/busses/i2c-viai2c-common.c new file +234 -0
234 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-common.h new file +66 -0
66 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt-plt.c new file +137 -0
137 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt.c deleted +0 -431
431 lines not on this page · raw message
Signature · 1 line
2.34.1
Andi Shyti
maintainerRe: [PATCH v6 4/8] i2c: wmt: split out common files
Hi Hans,
Quoted 1 line · Hans Hu
Since the I2C IP of both wmt and zhaoxin come from VIA,
/come/comes/
Quoted 4 lines
the common driver is named as
i2c-viai2c-common.c. Oldi2c-wmt.crenamed toi2c-wmt-plt.c.The
MAINTAINERSinformation will added in patch 0008.
when the patch is applied there is no knowledge anymore of the patch sequence, please put these comments after the '---' section or make it generic: "The MAINTAINERS file will be updated accordingly in upcoming commits"
Quoted 8 lines
Signed-off-by Hans Hu <[email protected]>--- MAINTAINERS | 2 +- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 234 ++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 66 ++++ drivers/i2c/busses/i2c-wmt-plt.c | 137 ++++++++
'plt' stands for?
Everything else looks correct.
Andi
Re: [PATCH v6 4/8] i2c: wmt: split out common files
Quoted 6 lines · Andi Shyti
Hi Hans,
Quoted 1 line · Hans Hu
Since the I2C IP of both wmt and zhaoxin come from VIA,
/come/comes/
Quoted 8 lines
Quoted 4 lines
the common driver is named as
i2c-viai2c-common.c. Oldi2c-wmt.crenamed toi2c-wmt-plt.c.The
MAINTAINERSinformation will added in patch 0008.when the patch is applied there is no knowledge anymore of the patch sequence, please put these comments after the '---' section or make it generic: "The
MAINTAINERSfile will be updated accordingly in upcoming commits"
ok, will change this.
Quoted 8 lines
Quoted 7 lines
Signed-off-by Hans Hu <[email protected]>--- MAINTAINERS | 2 +- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 234 ++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 66 ++++ drivers/i2c/busses/i2c-wmt-plt.c | 137 ++++++++'plt' stands for?
'plt' is short for 'platform', since it is not suitable,
do you think it is better to change it to 'i2c-wmt-platform.c' or 'i2c-viai2c-wmt.c' ?
Hans
Quoted 4 lines
Everything else looks correct.
Andi
Andi Shyti
maintainerRe: [PATCH v6 4/8] i2c: wmt: split out common files
Hi Hans,
Quoted 9 lines
Quoted 6 lines
Quoted 5 lines
MAINTAINERS | 2 +- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 234 ++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 66 ++++ drivers/i2c/busses/i2c-wmt-plt.c | 137 ++++++++'plt' stands for?
'plt' is short for 'platform', since it is not suitable,
it's suitable, sure... but not immediately understandable. Your choice if you want to change it.
Quoted 2 lines
do you think it is better to change it to '
i2c-wmt-platform.c' or 'i2c-viai2c-wmt.c' ?
I would rename things to:
i2c-via-wmt.ci2c-via-common.ci2c-via-zhaoxin.c
But of course it's not binding.
Andi
Re: [PATCH v6 4/8] i2c: wmt: split out common files
Hi Andi,
Quoted 15 lines · Andi Shyti
Hi Hans,
Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
MAINTAINERS | 2 +- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 234 ++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 66 ++++ drivers/i2c/busses/i2c-wmt-plt.c | 137 ++++++++'plt' stands for?
'plt' is short for 'platform', since it is not suitable,
it's suitable, sure... but not immediately understandable. Your choice if you want to change it.
Quoted 2 lines
do you think it is better to change it to '
i2c-wmt-platform.c' or 'i2c-viai2c-wmt.c' ?
Quoted 7 lines
I would rename things to:
i2c-via-wmt.ci2c-via-common.ci2c-via-zhaoxin.cBut of course it's not binding.
if so, I choose to 'i2c-viai2c-*.c', because there's already a driver called 'i2c-via.c'.
Hans,
Quoted 1 line
Andi
Andi Shyti
maintainerRe: [PATCH v6 4/8] i2c: wmt: split out common files
Hi Hans,
Quoted 19 lines
Quoted 19 lines
Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
MAINTAINERS | 2 +- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 234 ++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 66 ++++ drivers/i2c/busses/i2c-wmt-plt.c | 137 ++++++++'plt' stands for?
'plt' is short for 'platform', since it is not suitable,
it's suitable, sure... but not immediately understandable. Your choice if you want to change it.
Quoted 2 lines
do you think it is better to change it to '
i2c-wmt-platform.c' or 'i2c-viai2c-wmt.c' ?I would rename things to:
i2c-via-wmt.ci2c-via-common.ci2c-via-zhaoxin.c
Quoted 5 lines
Quoted 1 line
But of course it's not binding.
if so, I choose to 'i2c-viai2c-*.c', because there's already a driver called '
i2c-via.c'.
ack!
Andi
PATCH v6 5/8 i2c: wmt: rename with prefix VIAI2C_ and viai2c_
In reply to Hans HuSince the I2C IP of both wmt and zhaoxin come from VIA. So, rename common register, function and variable's name to VIAI2C_ and viai2c_.
--- drivers/i2c/busses/i2c-viai2c-common.c | 118 ++++++++++++------------- drivers/i2c/busses/i2c-viai2c-common.h | 60 ++++++------- drivers/i2c/busses/i2c-wmt-plt.c | 30 ++++--- 3 files changed, 105 insertions(+), 103 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +59 -59
@@ -2,15 +2,15 @@#include <linux/of_irq.h> #include "i2c-viai2c-common.h" -#define WMT_I2C_TIMEOUT (msecs_to_jiffies(1000)) +#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000)) -static int wmt_i2c_wait_bus_not_busy (struct wmt_i2c *i2c) +static int viai2c_wait_bus_ready (struct viai2c *i2c) {unsigned long timeout;void __iomem *base = i2c->base; - timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (base +WMTI2C_REG_CSR ) &WMTI2C_CSR_READY_MASK )) { + timeout = jiffies +VIAI2C_TIMEOUT ; +while (!(readw (base +VIAI2C_REG_CSR ) &VIAI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) {dev_warn (i2c->dev,"timeout waiting for bus ready\n" );
@@ -22,7 +22,7 @@ static int wmt_i2c_wait_bus_not_busy(struct wmt_i2c *i2c)return 0 ; } -static int wmt_check_status (struct wmt_i2c *i2c) +static int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ;unsigned long wait_result;
@@ -32,29 +32,29 @@ static int wmt_check_status(struct wmt_i2c *i2c)if (!wait_result)return -ETIMEDOUT ; -if (i2c->cmd_status &WMTI2C_ISR_NACK_ADDR ) +if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c->cmd_status &WMTI2C_ISR_SCL_TIMEOUT ) +if (i2c->cmd_status &VIAI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret; } -static irqreturn_t wmt_i2c_isr (int irq,void *data) +static irqreturn_t viai2c_isr (int irq,void *data) { -struct wmt_i2c *i2c = data; +struct viai2c *i2c = data;/* save the status and write-clear it */ - i2c->cmd_status =readw (i2c->base +WMTI2C_REG_ISR ); -writew (i2c->cmd_status, i2c->base +WMTI2C_REG_ISR ); + i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR );complete (&i2c->complete);return IRQ_HANDLED ; } -static int wmt_i2c_write (struct wmt_i2c *i2c,struct i2c_msg *pmsg, +static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,int last) {u16 val, tcr_val = i2c->tcr;
@@ -68,143 +68,143 @@ static int wmt_i2c_write(struct wmt_i2c *i2c, struct i2c_msg *pmsg,* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , base +WMTI2C_REG_CDR ); +writew (0 , base +VIAI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , base +WMTI2C_REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , base +VIAI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (base +WMTI2C_REG_CR ); - val &= ~WMTI2C_CR_TX_END ; - val |=WMTI2C_CR_CPU_RDY ; -writew (val, base +WMTI2C_REG_CR ); + val =readw (base +VIAI2C_REG_CR ); + val &= ~VIAI2C_CR_TX_END ; + val |=VIAI2C_CR_CPU_RDY ; +writew (val, base +VIAI2C_REG_CR ); }reinit_completion (&i2c->complete); - tcr_val |= (WMTI2C_TCR_MASTER_WRITE - | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK )); + tcr_val |= (VIAI2C_TCR_MASTER_WRITE + | (pmsg->addr &VIAI2C_TCR_SLAVE_ADDR_MASK )); -writew (tcr_val, base +WMTI2C_REG_TCR ); +writew (tcr_val, base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (base +WMTI2C_REG_CR ); - val |=WMTI2C_CR_CPU_RDY ; -writew (val, base +WMTI2C_REG_CR ); + val =readw (base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c); + ret =viai2c_wait_status (i2c);if (ret)return ret; xfer_len++; - val =readw (base +WMTI2C_REG_CSR ); -if (val &WMTI2C_CSR_RCV_NOT_ACK ) { + val =readw (base +VIAI2C_REG_CSR ); +if (val &VIAI2C_CSR_RCV_NOT_ACK ) {dev_dbg (i2c->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =WMTI2C_CR_TX_END |WMTI2C_CR_CPU_RDY - |WMTI2C_CR_ENABLE ; -writew (val, base +WMTI2C_REG_CR ); + val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY + |VIAI2C_CR_ENABLE ; +writew (val, base +VIAI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); +writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , - base +WMTI2C_REG_CDR ); -writew (WMTI2C_CR_CPU_RDY |WMTI2C_CR_ENABLE , - base +WMTI2C_REG_CR ); + base +VIAI2C_REG_CDR ); +writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , + base +VIAI2C_REG_CR ); } }return 0 ; } -static int wmt_i2c_read (struct wmt_i2c *i2c,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) {u16 val, tcr_val = i2c->tcr;int ret;u32 xfer_len =0 ;void __iomem *base = i2c->base; - val =readw (base +WMTI2C_REG_CR ); - val &= ~(WMTI2C_CR_TX_END |WMTI2C_CR_TX_NEXT_NO_ACK ); + val =readw (base +VIAI2C_REG_CR ); + val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END );if (!(pmsg->flags &I2C_M_NOSTART )) - val |=WMTI2C_CR_CPU_RDY ; + val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 ) - val |=WMTI2C_CR_TX_NEXT_NO_ACK ; + val |=VIAI2C_CR_RX_END ; -writew (val, base +WMTI2C_REG_CR ); +writew (val, base +VIAI2C_REG_CR );reinit_completion (&i2c->complete); - tcr_val |=WMTI2C_TCR_MASTER_READ - | (pmsg->addr &WMTI2C_TCR_SLAVE_ADDR_MASK ); + tcr_val |=VIAI2C_TCR_MASTER_READ + | (pmsg->addr &VIAI2C_TCR_SLAVE_ADDR_MASK ); -writew (tcr_val, base +WMTI2C_REG_TCR ); +writew (tcr_val, base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (base +WMTI2C_REG_CR ); - val |=WMTI2C_CR_CPU_RDY ; -writew (val, base +WMTI2C_REG_CR ); + val =readw (base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c); + ret =viai2c_wait_status (i2c);if (ret)return ret; - pmsg->buf[xfer_len] =readw (base +WMTI2C_REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (base +VIAI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (base +WMTI2C_REG_CR ) |WMTI2C_CR_CPU_RDY ; + val =readw (base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) - val |=WMTI2C_CR_TX_NEXT_NO_ACK ; -writew (val, base +WMTI2C_REG_CR ); + val |=VIAI2C_CR_RX_END ; +writew (val, base +VIAI2C_REG_CR ); }return 0 ; } -int wmt_i2c_xfer (struct i2c_adapter *adap, +int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num) {struct i2c_msg *pmsg;int i;int ret =0 ; -struct wmt_i2c *i2c =i2c_get_adapdata (adap); +struct viai2c *i2c =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c); + ret =viai2c_wait_bus_ready (i2c);if (ret <0 )return ret; }if (pmsg->flags &I2C_M_RD ) - ret =wmt_i2c_read (i2c, pmsg); + ret =viai2c_read (i2c, pmsg);else - ret =wmt_i2c_write (i2c, pmsg, (i +1 ) == num); + ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }return (ret <0 ) ? ret : i; } -int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c **pi2c) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) {int err; -struct wmt_i2c *i2c; +struct viai2c *i2c;struct device_node *np = pdev->dev.of_node; i2c =devm_kzalloc (&pdev->dev,sizeof (*i2c),GFP_KERNEL );
@@ -219,7 +219,7 @@ int wmt_i2c_init(struct platform_device *pdev, struct wmt_i2c **pi2c)if (!i2c->irq)return -EINVAL ; - err =devm_request_irq (&pdev->dev, i2c->irq, wmt_i2c_isr, + err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr,0 , pdev->name, i2c);if (err) return dev_err_probe(&pdev->dev, err,
drivers/i2c/busses/i2c-viai2c-common.h +30 -30
81 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt-plt.c +16 -14
@@ -22,13 +22,15 @@#define WMTI2C_MCR_APB_96M 7#define WMTI2C_MCR_APB_166M 12 +#define wmt_i2c viai2c +static u32 wmt_i2c_func (struct i2c_adapter *adap) {return I2C_FUNC_I2C |I2C_FUNC_SMBUS_EMUL |I2C_FUNC_NOSTART ; }static const struct i2c_algorithm wmt_i2c_algo = { - .master_xfer = wmt_i2c_xfer, + .master_xfer = viai2c_xfer, .functionality = wmt_i2c_func, };
@@ -50,18 +52,18 @@ static int wmt_i2c_reset_hardware(struct wmt_i2c *i2c)return err; } -writew (0 , base +WMTI2C_REG_CR ); -writew (WMTI2C_MCR_APB_166M , base +WMTI2C_REG_MCR ); -writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); -writew (WMTI2C_IMR_ENABLE_ALL , base +WMTI2C_REG_IMR ); -writew (WMTI2C_CR_ENABLE , base +WMTI2C_REG_CR ); -readw (base +WMTI2C_REG_CSR );/* read clear */ -writew (WMTI2C_ISR_WRITE_ALL , base +WMTI2C_REG_ISR ); +writew (0 , base +VIAI2C_REG_CR ); +writew (WMTI2C_MCR_APB_166M , base +VIAI2C_REG_MCR ); +writew (VIAI2C_ISR_MASK_ALL , base +VIAI2C_REG_ISR ); +writew (VIAI2C_IMR_ENABLE_ALL , base +VIAI2C_REG_IMR ); +writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); +readw (base +VIAI2C_REG_CSR );/* read clear */ +writew (VIAI2C_ISR_MASK_ALL , base +VIAI2C_REG_ISR ); -if (i2c->tcr ==WMTI2C_TCR_FAST_MODE ) -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , base +WMTI2C_REG_TR ); +if (i2c->tcr ==VIAI2C_TCR_FAST ) +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_HS , base +VIAI2C_REG_TR );else -writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , base +WMTI2C_REG_TR ); +writew (WMTI2C_SCL_TIMEOUT (128 ) |WMTI2C_TR_STD , base +VIAI2C_REG_TR );return 0 ; }
@@ -74,7 +76,7 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - err =wmt_i2c_init (pdev, &i2c); + err =viai2c_init (pdev, &i2c);if (err)return err;
@@ -86,7 +88,7 @@ static int wmt_i2c_probe(struct platform_device *pdev) err =of_property_read_u32 (np,"clock-frequency" , &clk_rate);if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) - i2c->tcr =WMTI2C_TCR_FAST_MODE ; + i2c->tcr =VIAI2C_TCR_FAST ; adap = &i2c->adapter;i2c_set_adapdata (adap, i2c);
@@ -110,7 +112,7 @@ static void wmt_i2c_remove(struct platform_device *pdev)struct wmt_i2c *i2c =platform_get_drvdata (pdev);/* Disable interrupts, clock and delete adapter */ -writew (0 , i2c->base +WMTI2C_REG_IMR ); +writew (0 , i2c->base +VIAI2C_REG_IMR );clk_disable_unprepare (i2c->clk);i2c_del_adapter (&i2c->adapter); }
Signature · 1 line
2.34.1
Andi Shyti
maintainerRe: [PATCH v6 5/8] i2c: wmt: rename with prefix VIAI2C_ and viai2c_
Hi Hans,
Quoted 3 lines · Hans Hu
Since the I2C IP of both wmt and zhaoxin come from VIA. So, rename common register, function and variable's name to
VIAI2C_andviai2c_.
this commit is not really clear. Can we write something like:
"The I2C IP for both wmt and zhaoxin originates from VIA. Rename common registers, functions, and variable names to follow the VIAI2C_ and viai2c_ naming conventions for consistency and clarity."
Quoted 1 line
Signed-off-by Hans Hu <[email protected]>
[...]
Quoted 53 lines
drivers/i2c/busses/i2c-viai2c-common.h +21
-24-#define WMTI2C_REG_CR 0x00 -#define WMTI2C_CR_TX_NEXT_ACK 0x0000 -#define WMTI2C_CR_ENABLE 0x0001 -#define WMTI2C_CR_TX_NEXT_NO_ACK 0x0002 -#define WMTI2C_CR_TX_END 0x0004 -#define WMTI2C_CR_CPU_RDY 0x0008 +#define VIAI2C_REG_CR 0x00 +#define VIAI2C_CR_ENABLE BIT(0) +#define VIAI2C_CR_RX_END BIT(1) +#define VIAI2C_CR_TX_END BIT(2) +#define VIAI2C_CR_CPU_RDY BIT(3) +#define VIAI2C_CR_END_MASK GENMASK(2, 1)/* REG_TCR Bit fields */ -#define WMTI2C_REG_TCR 0x02 -#define WMTI2C_TCR_STANDARD_MODE 0x0000 -#define WMTI2C_TCR_MASTER_WRITE 0x0000 -#define WMTI2C_TCR_HS_MODE 0x2000 -#define WMTI2C_TCR_MASTER_READ 0x4000 -#define WMTI2C_TCR_FAST_MODE 0x8000 -#define WMTI2C_TCR_SLAVE_ADDR_MASK 0x007F +#define VIAI2C_REG_TCR 0x02 +#define VIAI2C_TCR_MASTER_WRITE 0x0000 +#define VIAI2C_TCR_HS_MODE BIT(13) +#define VIAI2C_TCR_MASTER_READ BIT(14) +#define VIAI2C_TCR_FAST BIT(15) +#define VIAI2C_TCR_SLAVE_ADDR_MASK GENMASK(6, 0)/* REG_CSR Bit fields */ -#define WMTI2C_REG_CSR 0x04 -#define WMTI2C_CSR_RCV_NOT_ACK 0x0001 -#define WMTI2C_CSR_RCV_ACK_MASK 0x0001 -#define WMTI2C_CSR_READY_MASK 0x0002 +#define VIAI2C_REG_CSR 0x04 +#define VIAI2C_CSR_RCV_NOT_ACK BIT(0) +#define VIAI2C_CSR_RCV_ACK_MASK BIT(0) +#define VIAI2C_CSR_READY_MASK BIT(1)/* REG_ISR Bit fields */ -#define WMTI2C_REG_ISR 0x06 -#define WMTI2C_ISR_NACK_ADDR 0x0001 -#define WMTI2C_ISR_BYTE_END 0x0002 -#define WMTI2C_ISR_SCL_TIMEOUT 0x0004 -#define WMTI2C_ISR_WRITE_ALL 0x0007 +#define VIAI2C_REG_ISR 0x06 +#define VIAI2C_ISR_NACK_ADDR BIT(0) +#define VIAI2C_ISR_BYTE_END BIT(1) +#define VIAI2C_ISR_SCL_TIMEOUT BIT(2) +#define VIAI2C_ISR_MASK_ALL GENMASK(2, 0)/* REG_IMR Bit fields */ -#define WMTI2C_REG_IMR 0x08 -#define WMTI2C_IMR_ENABLE_ALL 0x0007
drivers/i2c/busses/i2c-viai2c-common.h line 50
Quoted 10 lines
drivers/i2c/busses/i2c-viai2c-common.h +6
-3+#define VIAI2C_REG_IMR 0x08 +#define VIAI2C_IMR_BYTE BIT(1) +#define VIAI2C_IMR_ENABLE_ALL GENMASK(2, 0) -#define WMTI2C_REG_CDR 0x0A -#define WMTI2C_REG_TR 0x0C -#define WMTI2C_REG_MCR 0x0E +#define VIAI2C_REG_CDR 0x0A +#define VIAI2C_REG_TR 0x0C +#define VIAI2C_REG_MCR 0x0E
These defines have been changed twice in this series. The patches should be rearranged in order to avoid this.
I Wolfram is not against, I'm OK with letting it slip this time.
Quoted 20 lines
drivers/i2c/busses/i2c-viai2c-common.h +3
-3-struct wmt_i2c { +struct viai2c {struct i2c_adapter adapter;struct completion complete;struct device *dev;@@ -60,7 +60,7 @@ struct wmt_i2c { u16 cmd_status; }; -int wmt_i2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num); -int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c **pi2c); +int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num); +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c);#endif drivers/i2c/busses/i2c-wmt-plt.c +0
-0
drivers/i2c/busses/i2c-wmt-plt.c line 25
Quoted 4 lines
drivers/i2c/busses/i2c-wmt-plt.c +1
-0@@ -22,13 +22,15 @@#define WMTI2C_MCR_APB_96M 7#define WMTI2C_MCR_APB_166M 12 +#define wmt_i2c viai2c
no, please, do not redefine types. Besides This looks a bit dangerous and reckless to me :-)
Andi
Re: [PATCH v6 5/8] i2c: wmt: rename with prefix VIAI2C_ and viai2c_
Quoted 6 lines · Andi Shyti
Hi Hans,
Quoted 3 lines · Hans Hu
Since the I2C IP of both wmt and zhaoxin come from VIA. So, rename common register, function and variable's name to
VIAI2C_andviai2c_.
Quoted 6 lines
this commit is not really clear. Can we write something like:
"The I2C IP for both wmt and zhaoxin originates from VIA. Rename common registers, functions, and variable names to follow the
VIAI2C_andviai2c_naming conventions for consistency and clarity."
ok, will change this.
Quoted 69 lines
Quoted 1 line
Signed-off-by Hans Hu <[email protected]>[...]
Quoted 53 lines
drivers/i2c/busses/i2c-viai2c-common.h +21
-24-#define WMTI2C_REG_CR 0x00 -#define WMTI2C_CR_TX_NEXT_ACK 0x0000 -#define WMTI2C_CR_ENABLE 0x0001 -#define WMTI2C_CR_TX_NEXT_NO_ACK 0x0002 -#define WMTI2C_CR_TX_END 0x0004 -#define WMTI2C_CR_CPU_RDY 0x0008 +#define VIAI2C_REG_CR 0x00 +#define VIAI2C_CR_ENABLE BIT(0) +#define VIAI2C_CR_RX_END BIT(1) +#define VIAI2C_CR_TX_END BIT(2) +#define VIAI2C_CR_CPU_RDY BIT(3) +#define VIAI2C_CR_END_MASK GENMASK(2, 1)/* REG_TCR Bit fields */ -#define WMTI2C_REG_TCR 0x02 -#define WMTI2C_TCR_STANDARD_MODE 0x0000 -#define WMTI2C_TCR_MASTER_WRITE 0x0000 -#define WMTI2C_TCR_HS_MODE 0x2000 -#define WMTI2C_TCR_MASTER_READ 0x4000 -#define WMTI2C_TCR_FAST_MODE 0x8000 -#define WMTI2C_TCR_SLAVE_ADDR_MASK 0x007F +#define VIAI2C_REG_TCR 0x02 +#define VIAI2C_TCR_MASTER_WRITE 0x0000 +#define VIAI2C_TCR_HS_MODE BIT(13) +#define VIAI2C_TCR_MASTER_READ BIT(14) +#define VIAI2C_TCR_FAST BIT(15) +#define VIAI2C_TCR_SLAVE_ADDR_MASK GENMASK(6, 0)/* REG_CSR Bit fields */ -#define WMTI2C_REG_CSR 0x04 -#define WMTI2C_CSR_RCV_NOT_ACK 0x0001 -#define WMTI2C_CSR_RCV_ACK_MASK 0x0001 -#define WMTI2C_CSR_READY_MASK 0x0002 +#define VIAI2C_REG_CSR 0x04 +#define VIAI2C_CSR_RCV_NOT_ACK BIT(0) +#define VIAI2C_CSR_RCV_ACK_MASK BIT(0) +#define VIAI2C_CSR_READY_MASK BIT(1)/* REG_ISR Bit fields */ -#define WMTI2C_REG_ISR 0x06 -#define WMTI2C_ISR_NACK_ADDR 0x0001 -#define WMTI2C_ISR_BYTE_END 0x0002 -#define WMTI2C_ISR_SCL_TIMEOUT 0x0004 -#define WMTI2C_ISR_WRITE_ALL 0x0007 +#define VIAI2C_REG_ISR 0x06 +#define VIAI2C_ISR_NACK_ADDR BIT(0) +#define VIAI2C_ISR_BYTE_END BIT(1) +#define VIAI2C_ISR_SCL_TIMEOUT BIT(2) +#define VIAI2C_ISR_MASK_ALL GENMASK(2, 0)/* REG_IMR Bit fields */ -#define WMTI2C_REG_IMR 0x08 -#define WMTI2C_IMR_ENABLE_ALL 0x0007drivers/i2c/busses/i2c-viai2c-common.h line 50
Quoted 10 lines
drivers/i2c/busses/i2c-viai2c-common.h +6
-3+#define VIAI2C_REG_IMR 0x08 +#define VIAI2C_IMR_BYTE BIT(1) +#define VIAI2C_IMR_ENABLE_ALL GENMASK(2, 0) -#define WMTI2C_REG_CDR 0x0A -#define WMTI2C_REG_TR 0x0C -#define WMTI2C_REG_MCR 0x0E +#define VIAI2C_REG_CDR 0x0A +#define VIAI2C_REG_TR 0x0C +#define VIAI2C_REG_MCR 0x0EThese defines have been changed twice in this series. The patches should be rearranged in order to avoid this.
Quoted 1 line
I Wolfram is not against, I'm OK with letting it slip this time.
I also realize that repetition is not good,
I only did this in the hope that patches would be easier to review.
Quoted 23 lines
Quoted 23 lines
drivers/i2c/busses/i2c-viai2c-common.h +3
-3-struct wmt_i2c { +struct viai2c {struct i2c_adapter adapter;struct completion complete;struct device *dev;@@ -60,7 +60,7 @@ struct wmt_i2c { u16 cmd_status; }; -int wmt_i2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num); -int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c **pi2c); +int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num); +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c);#endif drivers/i2c/busses/i2c-wmt-plt.c +0
-0@@ -22,13 +22,15 @@#define WMTI2C_MCR_APB_96M 7#define WMTI2C_MCR_APB_166M 12
Quoted 3 lines
drivers/i2c/busses/i2c-wmt-plt.c line 25
Quoted 1 line
drivers/i2c/busses/i2c-wmt-plt.c +1
-0+#define wmt_i2c viai2cno, please, do not redefine types. Besides This looks a bit dangerous and reckless to me :-)
ok, will use viai2c directly.
Quoted 2 lines
Andi
PATCH v6 6/8 i2c: wmt: fix a bug when thread blocked
In reply to Hans HuDuring each byte access, the host performs clock stretching. In this case, the thread may be interrupted by preemption, resulting in a long stretching time.
However, some touchpad can only tolerate host clock stretching of no more than 200 ms. We reduce the impact of this through a retransmission mechanism.
--- drivers/i2c/busses/i2c-viai2c-common.c | 37 +++++++++++++++++++++----- drivers/i2c/busses/i2c-viai2c-common.h | 2 ++ 2 files changed, 33 insertions(+), 6 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +31 -6
@@ -2,7 +2,8 @@#include <linux/of_irq.h> #include "i2c-viai2c-common.h" -#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000)) +#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000)) +#define VIAI2C_STRETCHING_TIMEOUT 200static int viai2c_wait_bus_ready (struct viai2c *i2c) {
@@ -25,12 +26,35 @@ static int viai2c_wait_bus_ready(struct viai2c *i2c)static int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ; -unsigned long wait_result; +unsigned long time_left; +unsigned long delta_ms; + + time_left =wait_for_completion_timeout (&i2c->complete, +VIAI2C_TIMEOUT ); +if (!time_left) { +dev_err (i2c->dev,"bus transfer timeout\n" ); +return -EIO ; + } - wait_result =wait_for_completion_timeout (&i2c->complete, -msecs_to_jiffies (500 )); -if (!wait_result) -return -ETIMEDOUT ; +/* +* During each byte access, the host performs clock stretching. +* In this case, the thread may be interrupted by preemption, +* resulting in a long stretching time. +* However, some touchpad can only tolerate host clock stretching +* of no more than 200 ms. We reduce the impact of this through +* a retransmission mechanism. +*/ +local_irq_disable (); + i2c->to =ktime_get (); + delta_ms =ktime_to_ms (ktime_sub (i2c->to, i2c->ti)); +if (delta_ms >VIAI2C_STRETCHING_TIMEOUT ) { +local_irq_enable (); +dev_warn (i2c->dev,"thread blocked more than %ldms\n" , + delta_ms); +return -EAGAIN ; + } + i2c->ti = i2c->to; +local_irq_enable ();if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ;
@@ -184,6 +208,7 @@ int viai2c_xfer(struct i2c_adapter *adap,int ret =0 ;struct viai2c *i2c =i2c_get_adapdata (adap); + i2c->to = i2c->ti =ktime_get ();for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) {
drivers/i2c/busses/i2c-viai2c-common.h +2 -0
@@ -58,6 +58,8 @@ struct viai2c {u16 tcr;int irq;u16 cmd_status; +ktime_t ti; +ktime_t to; };int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num);
Signature · 1 line
2.34.1
Andi Shyti
maintainerRe: [PATCH v6 6/8] i2c: wmt: fix a bug when thread blocked
Hi Hans,
[...]
Quoted 11 lines
static int
viai2c_wait_bus_ready(struct viai2c *i2c){drivers/i2c/busses/i2c-viai2c-common.c +4
-1@@ -25,12 +26,35 @@ static int viai2c_wait_bus_ready(struct viai2c *i2c)static int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ; -unsigned long wait_result; +unsigned long time_left; +unsigned long delta_ms; + + time_left = wait_for_completion_timeout(&i2c->complete,
drivers/i2c/busses/i2c-viai2c-common.c static int viai2c_wait_bus_ready(struct viai2c *i2c) · line 33
Quoted 10 lines
drivers/i2c/busses/i2c-viai2c-common.c +5
-4+ VIAI2C_TIMEOUT); +if (!time_left) { +dev_err (i2c->dev,"bus transfer timeout\n" ); +return -EIO ; + } - wait_result =wait_for_completion_timeout (&i2c->complete, -msecs_to_jiffies (500 )); -if (!wait_result) -return -ETIMEDOUT ;
this change is unrelated. Why are you changing the timeout here from 500 to 1000?
drivers/i2c/busses/i2c-viai2c-common.c static int viai2c_wait_bus_ready(struct viai2c *i2c) · line 46
Quoted 8 lines
drivers/i2c/busses/i2c-viai2c-common.c +8
-0+/* +* During each byte access, the host performs clock stretching. +* In this case, the thread may be interrupted by preemption, +* resulting in a long stretching time. +* However, some touchpad can only tolerate host clock stretching +* of no more than 200 ms. We reduce the impact of this through +* a retransmission mechanism. +*/
is the hardware sending the stretching on its own?
Quoted 27 lines
drivers/i2c/busses/i2c-viai2c-common.c +12
-0+local_irq_disable (); + i2c->to =ktime_get (); + delta_ms =ktime_to_ms (ktime_sub (i2c->to, i2c->ti)); +if (delta_ms >VIAI2C_STRETCHING_TIMEOUT ) { +local_irq_enable (); +dev_warn (i2c->dev,"thread blocked more than %ldms\n" , + delta_ms); +return -EAGAIN ; + } + i2c->ti = i2c->to; +local_irq_enable ();if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ;@@ -184,6 +208,7 @@ int viai2c_xfer(struct i2c_adapter *adap,int ret =0 ;struct viai2c *i2c =i2c_get_adapdata (adap); + i2c->to = i2c->ti =ktime_get ();for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) {drivers/i2c/busses/i2c-viai2c-common.h +0
-0
drivers/i2c/busses/i2c-viai2c-common.h struct viai2c { · line 62
Quoted 5 lines
drivers/i2c/busses/i2c-viai2c-common.h +2
-0@@ -58,6 +58,8 @@ struct viai2c {u16 tcr;int irq;u16 cmd_status; +ktime_t ti; +ktime_t to;
don't these need some arbitration?
Andi
Re: [PATCH v6 6/8] i2c: wmt: fix a bug when thread blocked
Quoted 21 lines · Andi Shyti
Hi Hans,
[...]
Quoted 17 lines
static int viai2c_wait_bus_ready(struct viai2c *i2c) {drivers/i2c/busses/i2c-viai2c-common.c +9
-1@@ -25,12 +26,35 @@ static int viai2c_wait_bus_ready(struct viai2c *i2c)static int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ; -unsigned long wait_result; +unsigned long time_left; +unsigned long delta_ms; + + time_left =wait_for_completion_timeout (&i2c->complete, +VIAI2C_TIMEOUT ); +if (!time_left) { +dev_err (i2c->dev,"bus transfer timeout\n" ); +return -EIO ; + }
Quoted 6 lines
drivers/i2c/busses/i2c-viai2c-common.c static int viai2c_wait_bus_ready(struct viai2c *i2c) · line 33
Quoted 4 lines
drivers/i2c/busses/i2c-viai2c-common.c +0
-4- wait_result =wait_for_completion_timeout (&i2c->complete, -msecs_to_jiffies (500 )); -if (!wait_result) -return -ETIMEDOUT ;this change is unrelated. Why are you changing the timeout here from 500 to 1000?
it does unrelated, will drop it.
Quoted 10 lines
drivers/i2c/busses/i2c-viai2c-common.c static int viai2c_wait_bus_ready(struct viai2c *i2c) · line 46
Quoted 8 lines
drivers/i2c/busses/i2c-viai2c-common.c +8
-0+/* +* During each byte access, the host performs clock stretching. +* In this case, the thread may be interrupted by preemption, +* resulting in a long stretching time. +* However, some touchpad can only tolerate host clock stretching +* of no more than 200 ms. We reduce the impact of this through +* a retransmission mechanism. +*/ is the hardware sending the stretching on its own?
Yes, controller will handle it.
Quoted 34 lines
Quoted 27 lines
drivers/i2c/busses/i2c-viai2c-common.c +12
-0+local_irq_disable (); + i2c->to =ktime_get (); + delta_ms =ktime_to_ms (ktime_sub (i2c->to, i2c->ti)); +if (delta_ms >VIAI2C_STRETCHING_TIMEOUT ) { +local_irq_enable (); +dev_warn (i2c->dev,"thread blocked more than %ldms\n" , + delta_ms); +return -EAGAIN ; + } + i2c->ti = i2c->to; +local_irq_enable ();if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ;@@ -184,6 +208,7 @@ int viai2c_xfer(struct i2c_adapter *adap,int ret =0 ;struct viai2c *i2c =i2c_get_adapdata (adap); + i2c->to = i2c->ti =ktime_get ();for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) {drivers/i2c/busses/i2c-viai2c-common.h +0
-0drivers/i2c/busses/i2c-viai2c-common.h struct viai2c { · line 62
Quoted 5 lines
drivers/i2c/busses/i2c-viai2c-common.h +2
-0@@ -58,6 +58,8 @@ struct viai2c {u16 tcr;int irq;u16 cmd_status; +ktime_t ti; +ktime_t to;don't these need some arbitration?
Quoted 1 line
Andi
I don't think it needs to be arbitration. the controllers are independent of each other, each access is locked using __i2c_lock_bus_helper(). Am I missing something?
Hans
Andi Shyti
maintainerRe: [PATCH v6 6/8] i2c: wmt: fix a bug when thread blocked
Hi Hans,
...
Quoted 9 lines
Quoted 8 lines
drivers/i2c/busses/i2c-viai2c-common.h struct viai2c { · line 62
Quoted 6 lines
drivers/i2c/busses/i2c-viai2c-common.h +2
-0@@ -58,6 +58,8 @@ struct viai2c {u16 tcr;int irq;u16 cmd_status; +ktime_t ti; +ktime_t to;don't these need some arbitration?
Quoted 4 lines
I don't think it needs to be arbitration. the controllers are independent of each other, each access is locked using
__i2c_lock_bus_helper(). Am I missing something?
no, it's fine, it's me who missed that. Do you mind writing a comment?
Thanks,
Andi
Re: [PATCH v6 6/8] i2c: wmt: fix a bug when thread blocked
Hi Andi,
Quoted 12 lines · Andi Shyti
Hi Hans,
...
Quoted 8 lines
Quoted 8 lines
drivers/i2c/busses/i2c-viai2c-common.h struct viai2c { · line 62
Quoted 6 lines
drivers/i2c/busses/i2c-viai2c-common.h +2
-0@@ -58,6 +58,8 @@ struct viai2c {u16 tcr;int irq;u16 cmd_status; +ktime_t ti; +ktime_t to;don't these need some arbitration?
Quoted 6 lines
Quoted 4 lines
I don't think it needs to be arbitration. the controllers are independent of each other, each access is locked using
__i2c_lock_bus_helper(). Am I missing something?no, it's fine, it's me who missed that. Do you mind writing a comment?
ok, will add a comment like below:
+ /*
+ * During each byte access, the host performs clock stretching. + * In this case, the thread may be interrupted by preemption, + * resulting in a long stretching time.
+ *
+ * However, some touchpad can only tolerate host clock stretching + * of no more than 200 ms. We reduce the impact of this through + * a retransmission mechanism.
+ *
+ * Since __i2c_lock_bus_helper() is used to ensure that the + * current access will not be interrupted by the other access, + * We don't need to worry about arbitration anymore.
+ *
+ */
+ local_irq_disable();
+ i2c->to = ktime_get();
Hans
Andi Shyti
maintainerRe: [PATCH v6 6/8] i2c: wmt: fix a bug when thread blocked
Hi Hans,
Quoted 25 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/i2c/busses/i2c-viai2c-common.h struct viai2c { · line 62
Quoted 6 lines
drivers/i2c/busses/i2c-viai2c-common.h +2
-0@@ -58,6 +58,8 @@ struct viai2c {u16 tcr;int irq;u16 cmd_status; +ktime_t ti; +ktime_t to;don't these need some arbitration?
Quoted 6 lines
Quoted 4 lines
I don't think it needs to be arbitration. the controllers are independent of each other, each access is locked using
__i2c_lock_bus_helper(). Am I missing something?no, it's fine, it's me who missed that. Do you mind writing a comment?
ok, will add a comment like below:
+ /*
+ * During each byte access, the host performs clock stretching. + * In this case, the thread may be interrupted by preemption, + * resulting in a long stretching time.
+ *
+ * However, some touchpad can only tolerate host clock stretching + * of no more than 200 ms. We reduce the impact of this through + * a retransmission mechanism.
Quoted 8 lines
+ *
+ * Since__i2c_lock_bus_helper()is used to ensure that the + * current access will not be interrupted by the other access, + * We don't need to worry about arbitration anymore. + *
+ */
+local_irq_disable();
+i2c->to=ktime_get();
ack!
Andi
PATCH v6 7/8 i2c: wmt: add platform type VIAI2C_PLAT_WMT
In reply to Hans HuEnumeration variables are added to differentiate between different platforms.
--- drivers/i2c/busses/i2c-viai2c-common.c | 34 ++++++++++++++++---------- drivers/i2c/busses/i2c-viai2c-common.h | 7 +++++- drivers/i2c/busses/i2c-wmt-plt.c | 2 +- 3 files changed, 28 insertions(+), 15 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +21 -13
@@ -78,8 +78,7 @@ static irqreturn_t viai2c_isr(int irq, void *data)return IRQ_HANDLED ; } -static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg, -int last) +static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,bool last) {u16 val, tcr_val = i2c->tcr;int ret;
@@ -97,7 +96,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg,writew (pmsg->buf[0 ] &0xFF , base +VIAI2C_REG_CDR ); } -if (!(pmsg->flags &I2C_M_NOSTART )) { +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) { val =readw (base +VIAI2C_REG_CR ); val &= ~VIAI2C_CR_TX_END ; val |=VIAI2C_CR_CPU_RDY ;
@@ -111,7 +110,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg,writew (tcr_val, base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && pmsg->flags &I2C_M_NOSTART ) { val =readw (base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, base +VIAI2C_REG_CR );
@@ -138,7 +137,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, }if (xfer_len == pmsg->len) { -if (last !=1 ) +if (i2c->platform ==VIAI2C_PLAT_WMT && !last)writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); }else { writew(pmsg->buf[xfer_len] & 0xFF,
@@ -161,7 +160,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg) val =readw (base +VIAI2C_REG_CR ); val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END ); -if (!(pmsg->flags &I2C_M_NOSTART )) +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 )
@@ -176,7 +175,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) { val =readw (base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, base +VIAI2C_REG_CR );
@@ -211,7 +210,8 @@ int viai2c_xfer(struct i2c_adapter *adap, i2c->to = i2c->ti =ktime_get ();for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i]; -if (!(pmsg->flags &I2C_M_NOSTART )) { +if ((i2c->platform ==VIAI2C_PLAT_WMT ) + && !(pmsg->flags &I2C_M_NOSTART )) { ret =viai2c_wait_bus_ready (i2c);if (ret <0 )return ret;
@@ -226,9 +226,10 @@ int viai2c_xfer(struct i2c_adapter *adap,return (ret <0 ) ? ret : i; } -int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat) {int err; +int irq_flags;struct viai2c *i2c;struct device_node *np = pdev->dev.of_node;
@@ -240,12 +241,19 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c)if (IS_ERR (i2c->base))return PTR_ERR (i2c->base); - i2c->irq =irq_of_parse_and_map (np,0 ); -if (!i2c->irq) -return -EINVAL ; +if (plat ==VIAI2C_PLAT_WMT ) { + irq_flags =0 ; + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq) +return -EINVAL ; + }else +return dev_err_probe (&pdev->dev, -EINVAL , +"wrong platform type\n" ); + + i2c->platform = plat; err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr, -0 , pdev->name, i2c); + irq_flags, pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err,"failed to request irq %i\n" , i2c->irq);
drivers/i2c/busses/i2c-viai2c-common.h +6 -1
@@ -49,6 +49,10 @@#define VIAI2C_REG_TR 0x0C#define VIAI2C_REG_MCR 0x0E +enum { +VIAI2C_PLAT_WMT =1 , +}; +struct viai2c {struct i2c_adapter adapter;struct completion complete;
@@ -60,9 +64,10 @@ struct viai2c {u16 cmd_status;ktime_t ti;ktime_t to; + int platform; };int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num); -int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c); +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat);#endif
drivers/i2c/busses/i2c-wmt-plt.c +1 -1
@@ -76,7 +76,7 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - err =viai2c_init (pdev, &i2c); + err =viai2c_init (pdev, &i2c,VIAI2C_PLAT_WMT );if (err)return err;
Signature · 1 line
2.34.1
PATCH v6 8/8 i2c: add zhaoxin i2c controller driver
In reply to Hans HuAdd Zhaoxin I2C controller driver. It provides the access to the i2c busses, which connects to the touchpad, eeprom, I2S, etc.
Zhaoxin I2C controller has two separate busses, so may accommodate up to two I2C adapters. Those adapters are listed in the ACPI namespace with the "IIC1D17" HID, and probed by a platform driver.
The driver works with IRQ mode, and supports basic I2C features. Flags I2C_AQ_NO_ZERO_LEN and I2C_AQ_COMB_WRITE_THEN_READ are used to limit the unsupported access.
--- MAINTAINERS | 8 + drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 21 +- drivers/i2c/busses/i2c-viai2c-common.h | 6 + drivers/i2c/busses/i2c-zhaoxin-plt.c | 298 +++++++++++++++++++++++++ 6 files changed, 340 insertions(+), 5 deletions(-) create mode 100644 drivers/i2c/busses/i2c-zhaoxin-plt.c
MAINTAINERS +8 -0
@@ -10023,6 +10023,14 @@ L: [email protected] F: Documentation/i2c/busses/i2c-ismt.rst F: drivers/i2c/busses/i2c-ismt.c +I2C/SMBUS ZHAOXIN DRIVER +M: Hans Hu <[email protected]> +L: [email protected] +S: Maintained +W: https://www.zhaoxin.com +F: drivers/i2c/busses/i2c-viai2c-common.c +F: drivers/i2c/busses/i2c-zhaoxin.c + I2C/SMBUS STUB DRIVER M: Jean Delvare <[email protected]> L: [email protected]
drivers/i2c/busses/Kconfig +10 -0
@@ -336,6 +336,16 @@ config I2C_VIAPRO if ACPI +config I2C_ZHAOXIN + tristate "Zhaoxin I2C Interface" + depends on PCI || COMPILE_TEST + help + If you say yes to this option, support will be included for the + ZHAOXIN I2C interface + + This driver can also be built as a module. If so, the module + will be called i2c-zhaoxin. + comment "ACPI drivers" config I2C_SCMI
drivers/i2c/busses/Makefile +2 -0
@@ -29,6 +29,8 @@ obj-$(CONFIG_I2C_SIS630) += i2c-sis630.o obj-$(CONFIG_I2C_SIS96X) += i2c-sis96x.o obj-$(CONFIG_I2C_VIA) += i2c-via.o obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o +i2c-zhaoxin-objs := i2c-zhaoxin-plt.o i2c-viai2c-common.o +obj-$(CONFIG_I2C_ZHAOXIN) += i2c-zhaoxin.o # Mac SMBus host controller drivers obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o
drivers/i2c/busses/i2c-viai2c-common.c +16 -5
@@ -5,7 +5,7 @@#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000))#define VIAI2C_STRETCHING_TIMEOUT 200 -static int viai2c_wait_bus_ready (struct viai2c *i2c) +int viai2c_wait_bus_ready (struct viai2c *i2c) {unsigned long timeout;void __iomem *base = i2c->base;
@@ -23,7 +23,7 @@ static int viai2c_wait_bus_ready(struct viai2c *i2c)return 0 ; } -static int viai2c_wait_status (struct viai2c *i2c) +int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ;unsigned long time_left;
@@ -71,6 +71,9 @@ static irqreturn_t viai2c_isr(int irq, void *data)/* save the status and write-clear it */ i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +if (!i2c->cmd_status) +return IRQ_NONE ; +writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR );complete (&i2c->complete);
@@ -139,6 +142,8 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, bool last)if (xfer_len == pmsg->len) {if (i2c->platform ==VIAI2C_PLAT_WMT && !last)writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); +else if (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && last) +writeb (VIAI2C_CR_TX_END , base +VIAI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , base +VIAI2C_REG_CDR );
@@ -150,7 +155,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, bool last)return 0 ; } -static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg,bool first) {u16 val, tcr_val = i2c->tcr;int ret;
@@ -175,7 +180,8 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, base +VIAI2C_REG_TCR ); -if (i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) { +if ((i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) + || (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && !first)) { val =readw (base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, base +VIAI2C_REG_CR );
@@ -218,7 +224,7 @@ int viai2c_xfer(struct i2c_adapter *adap, }if (pmsg->flags &I2C_M_RD ) - ret =viai2c_read (i2c, pmsg); + ret =viai2c_read (i2c, pmsg, i ==0 );else ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }
@@ -246,6 +252,11 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c, int plat) i2c->irq =irq_of_parse_and_map (np,0 );if (!i2c->irq)return -EINVAL ; + }else if (plat ==VIAI2C_PLAT_ZHAOXIN ) { + irq_flags =IRQF_SHARED ; + i2c->irq =platform_get_irq (pdev,0 ); +if (i2c->irq <0 ) +return i2c->irq; }else return dev_err_probe (&pdev->dev, -EINVAL ,"wrong platform type\n" );
drivers/i2c/busses/i2c-viai2c-common.h +6 -0
@@ -51,6 +51,7 @@enum {VIAI2C_PLAT_WMT =1 , +VIAI2C_PLAT_ZHAOXIN };struct viai2c {
@@ -65,8 +66,13 @@ struct viai2c {ktime_t ti;ktime_t to;int platform; +u8 hrv; +u16 tr; +u16 mcr; }; +int viai2c_wait_status (struct viai2c *i2c); +int viai2c_wait_bus_ready (struct viai2c *i2c);int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num);int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat);
drivers/i2c/busses/i2c-zhaoxin-plt.c new file +298 -0
298 lines not on this page · raw message
Signature · 1 line
2.34.1
Andi Shyti
maintainerHi Hans,
[...]
drivers/i2c/busses/i2c-viai2c-common.c line 8
Quoted 8 lines
drivers/i2c/busses/i2c-viai2c-common.c +1
-1@@ -5,7 +5,7 @@#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000))#define VIAI2C_STRETCHING_TIMEOUT 200 -static int viai2c_wait_bus_ready (struct viai2c *i2c) +int viai2c_wait_bus_ready (struct viai2c *i2c)
no, please, choose the rigth prototype at the beginning, don't double change things in the same series.
Quoted 13 lines
drivers/i2c/busses/i2c-viai2c-common.c +1
-1{unsigned long timeout;void __iomem *base = i2c->base;@@ -23,7 +23,7 @@ static int viai2c_wait_bus_ready(struct viai2c *i2c)return 0 ; } -static int viai2c_wait_status (struct viai2c *i2c) +int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ;unsigned long time_left;
drivers/i2c/busses/i2c-viai2c-common.c static irqreturn_t viai2c_isr(int irq, void *data) · line 76
Quoted 6 lines
drivers/i2c/busses/i2c-viai2c-common.c +3
-0@@ -71,6 +71,9 @@ static irqreturn_t viai2c_isr(int irq, void *data)/* save the status and write-clear it */ i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +if (!i2c->cmd_status) +return IRQ_NONE ; +
is this change related to this patch? can you put this at the beginning?
Andi
Quoted 10 lines · Andi Shyti
Hi Hans,
[...]
Quoted 6 lines
drivers/i2c/busses/i2c-viai2c-common.c +0
-0@@ -5,7 +5,7 @@#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000))#define VIAI2C_STRETCHING_TIMEOUT 200
Quoted 4 lines
drivers/i2c/busses/i2c-viai2c-common.c line 8
Quoted 2 lines
drivers/i2c/busses/i2c-viai2c-common.c +1
-1-static int viai2c_wait_bus_ready (struct viai2c *i2c) +int viai2c_wait_bus_ready (struct viai2c *i2c)no, please, choose the rigth prototype at the beginning, don't double change things in the same series.
ok, I will review my patch more carefully.
Quoted 22 lines
Quoted 13 lines
drivers/i2c/busses/i2c-viai2c-common.c +1
-1{unsigned long timeout;void __iomem *base = i2c->base;@@ -23,7 +23,7 @@ static int viai2c_wait_bus_ready(struct viai2c *i2c)return 0 ; } -static int viai2c_wait_status (struct viai2c *i2c) +int viai2c_wait_status (struct viai2c *i2c) {int ret =0 ;unsigned long time_left;drivers/i2c/busses/i2c-viai2c-common.c static irqreturn_t viai2c_isr(int irq, void *data) · line 76
Quoted 6 lines
drivers/i2c/busses/i2c-viai2c-common.c +3
-0@@ -71,6 +71,9 @@ static irqreturn_t viai2c_isr(int irq, void *data)/* save the status and write-clear it */ i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +if (!i2c->cmd_status) +return IRQ_NONE ; +is this change related to this patch? can you put this at the beginning?
Quoted 1 line
Andi
The original wmt driver does not have this, maybe I should use 'if (i2c->platform == VIAI2C_PLAT_ZHAOXIN &&! i2c->cmd_status)' instead?
Hans
Andi Shyti
maintainerHi Hans,
Quoted 4 lines · Hans Hu
v5->v6:
fix build warnning reported by kernel test robotv4->v5:
fix some build errors.
Where is the full log?
Andi
v7 cover i2c: add zhaoxin i2c controller driver
In reply to Hans Huv6->v7:
* adjust the patch sequence
* put those renaming related patches in 1 patch file
* rename i2c-*-plt.c to i2c-viai2c-*.c
* Some other adjustments suggested by Andi For more details, see the comment in each patch please.
v5->v6:
* fix build warnning reported by kernel test robot. Link: https://lore.kernel.org/all/[email protected]/ Link: https://lore.kernel.org/all/[email protected]/
v4->v5:
* fix 1 build error. Link: https://lore.kernel.org/all/ZYx0VPVmyQhtG+B9@shikoro/1-a.txt Link: https://lore.kernel.org/all/[email protected]/
v3->v4:
* Some adjustments as suggested by Wolfram.
* rebase patch on top of for-next branch.
v2->v3:
* Split the number of patches from 2 to 12. Make it easier to review. Link: https://lore.kernel.org/all/[email protected]/
v1->v2:
* Fixed some bugs I found myself. Link: https://lore.kernel.org/all/[email protected]/
Old version:
This patch has already gone through a round of reviews. Compared with the first round, the main difference of this round of patch is the use of i2c-wmt driver.
Hans Hu (6):
i2c: wmt: create wmt_i2c_init for general init
i2c: wmt: split out common files
i2c: wmt: rename something
i2c: wmt: fix a bug when thread blocked
i2c: wmt: add platform type VIAI2C_PLAT_WMT
i2c: add zhaoxin i2c controller driver
MAINTAINERS | 10 +- drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 3 + drivers/i2c/busses/i2c-viai2c-common.c | 267 +++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 81 +++++ drivers/i2c/busses/i2c-viai2c-wmt.c | 143 ++++++++ drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 282 ++++++++++++++++ drivers/i2c/busses/i2c-wmt.c | 417 ------------------------ 8 files changed, 795 insertions(+), 418 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-viai2c-wmt.c create mode 100644 drivers/i2c/busses/i2c-viai2c-zhaoxin.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c
Signature · 1 line
2.34.1
PATCH v7 1/6 i2c: wmt: create wmt_i2c_init for general init
v5->v7:
nothing changed.v4->v5:
add previous prototype 'static' for wmt_i2c_init().
Some common initialization actions are put in the function wmt_i2c_init(), which is convenient to share with zhaoxin.
--- drivers/i2c/busses/i2c-wmt.c | 67 +++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 31 deletions(-)
drivers/i2c/busses/i2c-wmt.c +36 -31
@@ -286,6 +286,38 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)return IRQ_HANDLED ; } +static int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +{ +int err; +struct wmt_i2c_dev *i2c_dev; +struct device_node *np = pdev->dev.of_node; + + i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); +if (!i2c_dev) +return -ENOMEM ; + + i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c_dev->base)) +return PTR_ERR (i2c_dev->base); + + i2c_dev->irq =irq_of_parse_and_map (np,0 ); +if (!i2c_dev->irq) +return -EINVAL ; + + err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, +0 , pdev->name, i2c_dev); +if (err) +return dev_err_probe (&pdev->dev, err, +"failed to request irq %i\n" , i2c_dev->irq); + + i2c_dev->dev = &pdev->dev; +init_completion (&i2c_dev->complete); +platform_set_drvdata (pdev, i2c_dev); + + *pi2c_dev = i2c_dev; +return 0 ; +} +static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) {int err;
@@ -327,19 +359,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) -return -ENOMEM ; - - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); - - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) { -dev_err (&pdev->dev,"irq missing or invalid\n" ); -return -EINVAL ; - } + err =wmt_i2c_init (pdev, &i2c_dev); +if (err) +return err; i2c_dev->clk =of_clk_get (np,0 );if (IS_ERR (i2c_dev->clk)) {
@@ -351,15 +373,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) i2c_dev->tcr =TCR_FAST_MODE ; - i2c_dev->dev = &pdev->dev; - - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr,0 , -"i2c" , i2c_dev); -if (err) { -dev_err (&pdev->dev,"failed to request irq %i\n" , i2c_dev->irq); -return err; - } - adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name));
@@ -368,21 +381,13 @@ static int wmt_i2c_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; -init_completion (&i2c_dev->complete); - err =wmt_i2c_reset_hardware (i2c_dev);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );return err; } - err =i2c_add_adapter (adap); -if (err) -return err; - -platform_set_drvdata (pdev, i2c_dev); - -return 0 ; +return i2c_add_adapter (adap); }static void wmt_i2c_remove (struct platform_device *pdev)
Signature · 1 line
2.34.1
Krzysztof Kozlowski
maintainerRe: [PATCH v7 1/6] i2c: wmt: create wmt_i2c_init for general init
Quoted 5 lines · Hans Hu
v5->v7:
nothing changed.v4->v5:
add previous prototype 'static' forwmt_i2c_init().
Why there is only changelog and no commit msg? Changelog goes usually under ---, especially if it is quite non-informative...
Best regards,
Krzysztof
Re: [PATCH v7 1/6] i2c: wmt: create wmt_i2c_init for general init
Hi Krzysztof,
Quoted 9 lines · Krzysztof Kozlowski
Quoted 5 lines · Hans Hu
v5->v7:
nothing changed.v4->v5:
add previous prototype 'static' forwmt_i2c_init().Why there is only changelog and no commit msg? Changelog goes usually under ---, especially if it is quite non-informative...
Commit msg comes after changelog. Yes, I should have put commit msg at the beginning. Other patches also have this problem. Adjustments will be made at the next submission.
Hans,
Thank you
Andi Shyti
maintainerRe: [PATCH v7 1/6] i2c: wmt: create wmt_i2c_init for general init
Hi Hans,
Quoted 6 lines
Quoted 6 lines · Hans Hu
Quoted 5 lines
v5->v7:
nothing changed.v4->v5:
add previous prototype 'static' forwmt_i2c_init().
Quoted 6 lines
Quoted 2 lines
Why there is only changelog and no commit msg? Changelog goes usually under ---, especially if it is quite non-informative...
Commit msg comes after changelog. Yes, I should have put commit msg at the beginning. Other patches also have this problem. Adjustments will be made at the next submission.
While it can be convenient to include the changelog in each patch from the reviewers perspective, having it all in patch 0 is sufficient.
Personally, I'm not in favour of adding the changelog to the commit log, even though it's a practice common in many communities. However, I'm open to whatever approach you select, provided there is consistency.
If you decide to keep the changelog, consider placing it at the end of the commit message, right before the tag section.
Andi
Re: [PATCH v7 1/6] i2c: wmt: create wmt_i2c_init for general init
In reply to Hans HuQuoted 11 lines · Hans Hu
v5->v7:
nothing changed.v4->v5:
add previous prototype 'static' forwmt_i2c_init().Some common initialization actions are put in the function
wmt_i2c_init(), which is convenient to share with zhaoxin.Reviewed-by Andi Shyti <[email protected]>Signed-off-by Hans Hu <[email protected]>
PATCH v7 2/6 i2c: wmt: split out common files
In reply to Hans Huv6->v7:
1. adjust the patch sequence: move the split file patch to the front
2. rename i2c-wmt-plt.c to i2c-viai2c-wmt.c
3. remove '#define wmt_i2c viai2c', use viai2c directly
Since the I2C IP of both wmt and zhaoxin originates from VIA, it is better to separate the common code first.
The common driver is named as i2c-viai2c-common.c. Old i2c-wmt.c renamed to i2c-viai2c-wmt.c.
The MAINTAINERS file will be updated accordingly in upcoming commits.
--- MAINTAINERS | 2 +- drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-viai2c-common.c | 221 +++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 71 +++++ drivers/i2c/busses/i2c-viai2c-wmt.c | 143 +++++++++ drivers/i2c/busses/i2c-wmt.c | 422 ------------------------- 6 files changed, 437 insertions(+), 423 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-viai2c-wmt.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c
MAINTAINERS +1 -1
@@ -2988,7 +2988,7 @@ S: Orphan F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt F: arch/arm/mach-vt8500/ F: drivers/clocksource/timer-vt8500.c -F: drivers/i2c/busses/i2c-wmt.c +F: drivers/i2c/busses/i2c-viai2c-wmt.c F: drivers/mmc/host/wmt-sdmmc.c F: drivers/pwm/pwm-vt8500.c F: drivers/rtc/rtc-vt8500.c
drivers/i2c/busses/Makefile +1 -0
@@ -120,6 +120,7 @@ obj-$(CONFIG_I2C_TEGRA_BPMP) += i2c-tegra-bpmp.o obj-$(CONFIG_I2C_UNIPHIER) += i2c-uniphier.o obj-$(CONFIG_I2C_UNIPHIER_F) += i2c-uniphier-f.o obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o +i2c-wmt-objs := i2c-viai2c-wmt.o i2c-viai2c-common.o obj-$(CONFIG_I2C_WMT) += i2c-wmt.o i2c-octeon-objs := i2c-octeon-core.o i2c-octeon-platdrv.o obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o
drivers/i2c/busses/i2c-viai2c-common.c new file +221 -0
221 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-common.h new file +71 -0
71 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-wmt.c new file +143 -0
143 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt.c deleted +0 -422
422 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v7 2/6] i2c: wmt: split out common files
Quoted 6 lines · Hans Hu
v6->v7:
1. adjust the patch sequence: move the split file patch to the front
2. renamei2c-wmt-plt.ctoi2c-viai2c-wmt.c
3. remove '#definewmt_i2cviai2c', use viai2c directly
Quoted 8 lines
Since the I2C IP of both wmt and zhaoxin originates from VIA, it is better to separate the common code first.
The common driver is named asi2c-viai2c-common.c. Oldi2c-wmt.crenamed toi2c-viai2c-wmt.c.The
MAINTAINERSfile will be updated accordingly in upcoming commits.Signed-off-by Hans Hu <[email protected]>
Looks good from a high level point of view plus some detail checks:
PATCH v7 3/6 i2c: wmt: rename something
In reply to Hans Huv6->v7:
Put those renaming related patches in 1 patch file. Link: https://lore.kernel.org/all/75978a2c47f17bf6871b92803e9c075e52aed1b6.1703830854.git.hanshu-oc@zhaoxin.com/ Link: https://lore.kernel.org/all/c417d693bbdb3a4b804c1c3ba03e57bf4e8c33e1.1703830854.git.hanshu-oc@zhaoxin.com/ Link: https://lore.kernel.org/all/65b930cefd380ce45e0e1b3967bc7f51737b0948.1703830854.git.hanshu-oc@zhaoxin.com/
1. The I2C IP for both wmt and zhaoxin originates from VIA. Rename common registers, functions, and variable names to follow the VIAI2C_ and viai2c_ naming conventions for consistency and clarity.
2. rename i2c_dev to i2c, to shorten the length of a line.
3. rename wait_result to time_left, make it better to reflect the meaning of the value returned by wait_for_completion_timeout().
4. remove TCR_MASTER_WRITE, its value is 0.
--- drivers/i2c/busses/i2c-viai2c-common.c | 156 ++++++++++++------------- drivers/i2c/busses/i2c-viai2c-common.h | 70 ++++++----- drivers/i2c/busses/i2c-viai2c-wmt.c | 60 +++++----- 3 files changed, 142 insertions(+), 144 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +78 -78
@@ -2,14 +2,14 @@#include <linux/of_irq.h> #include "i2c-viai2c-common.h" -int wmt_i2c_wait_bus_not_busy (struct wmt_i2c_dev *i2c_dev) +int viai2c_wait_bus_not_busy (struct viai2c *i2c) {unsigned long timeout; - timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +REG_CSR ) &CSR_READY_MASK )) { + timeout = jiffies +VIAI2C_TIMEOUT ; +while (!(readw (i2c->base +VIAI2C_REG_CSR ) &VIAI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) { -dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" ); +dev_warn (i2c->dev,"timeout waiting for bus ready\n" );return -EBUSY ; }msleep (20 );
@@ -18,28 +18,28 @@ int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)return 0 ; } -int wmt_check_status (struct wmt_i2c_dev *i2c_dev) +int viai2c_check_status (struct viai2c *i2c) {int ret =0 ; -unsigned long wait_result; +unsigned long time_left; - wait_result =wait_for_completion_timeout (&i2c_dev->complete, + time_left =wait_for_completion_timeout (&i2c->complete,msecs_to_jiffies (500 )); -if (!wait_result) +if (!time_left)return -ETIMEDOUT ; -if (i2c_dev->cmd_status &ISR_NACK_ADDR ) +if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c_dev->cmd_status &ISR_SCL_TIMEOUT ) +if (i2c->cmd_status &VIAI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret; } -static int wmt_i2c_write (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg,int last) +static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,int last) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;int xfer_len =0 ;
@@ -49,173 +49,173 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg, int* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , i2c_dev->base +REG_CDR ); +writew (0 , i2c->base +VIAI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , i2c->base +VIAI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +REG_CR ); - val &= ~CR_TX_END ; - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val &= ~VIAI2C_CR_TX_END ; + val |=VIAI2C_CR_CPU_RDY ; +writew (val, i2c->base +VIAI2C_REG_CR ); } -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |= (TCR_MASTER_WRITE | (pmsg->addr &TCR_SLAVE_ADDR_MASK )); + tcr_val |= pmsg->addr &VIAI2C_TCR_ADDR_MASK ; -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c->base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, i2c->base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =viai2c_check_status (i2c);if (ret)return ret; xfer_len++; - val =readw (i2c_dev->base +REG_CSR ); -if ((val &CSR_RCV_ACK_MASK ) ==CSR_RCV_NOT_ACK ) { -dev_dbg (i2c_dev->dev,"write RCV NACK error\n" ); + val =readw (i2c->base +VIAI2C_REG_CSR ); +if (val &VIAI2C_CSR_RCV_NOT_ACK ) { +dev_dbg (i2c->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =CR_TX_END |CR_CPU_RDY |CR_ENABLE ; -writew (val, i2c_dev->base +REG_CR ); + val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE ; +writew (val, i2c->base +VIAI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (CR_ENABLE , i2c_dev->base +REG_CR ); +writew (VIAI2C_CR_ENABLE , i2c->base +VIAI2C_REG_CR ); }else { -writew (pmsg->buf[xfer_len] &0xFF , i2c_dev->base + -REG_CDR ); -writew (CR_CPU_RDY |CR_ENABLE , i2c_dev->base +REG_CR ); +writew (pmsg->buf[xfer_len] &0xFF , i2c->base +VIAI2C_REG_CDR ); +writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , + i2c->base +VIAI2C_REG_CR ); } }return 0 ; } -static int wmt_i2c_read (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;u32 xfer_len =0 ; - val =readw (i2c_dev->base +REG_CR ); - val &= ~(CR_TX_END |CR_TX_NEXT_NO_ACK ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END );if (!(pmsg->flags &I2C_M_NOSTART )) - val |=CR_CPU_RDY ; + val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 ) - val |=CR_TX_NEXT_NO_ACK ; + val |=VIAI2C_CR_RX_END ; -writew (val, i2c_dev->base +REG_CR ); +writew (val, i2c->base +VIAI2C_REG_CR ); -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |=TCR_MASTER_READ | (pmsg->addr &TCR_SLAVE_ADDR_MASK ); + tcr_val |=VIAI2C_TCR_READ | (pmsg->addr &VIAI2C_TCR_ADDR_MASK ); -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c->base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, i2c->base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =viai2c_check_status (i2c);if (ret)return ret; - pmsg->buf[xfer_len] =readw (i2c_dev->base +REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (i2c->base +VIAI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (i2c_dev->base +REG_CR ) |CR_CPU_RDY ; + val =readw (i2c->base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) - val |=CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); + val |=VIAI2C_CR_RX_END ; +writew (val, i2c->base +VIAI2C_REG_CR ); }return 0 ; } -int wmt_i2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num) +int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num) {struct i2c_msg *pmsg;int i;int ret =0 ; -struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap); +struct viai2c *i2c =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c_dev); + ret =viai2c_wait_bus_not_busy (i2c);if (ret <0 )return ret; }if (pmsg->flags &I2C_M_RD ) - ret =wmt_i2c_read (i2c_dev, pmsg); + ret =viai2c_read (i2c, pmsg);else - ret =wmt_i2c_write (i2c_dev, pmsg, (i +1 ) == num); + ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }return (ret <0 ) ? ret : i; } -static irqreturn_t wmt_i2c_isr (int irq,void *data) +static irqreturn_t viai2c_isr (int irq,void *data) { -struct wmt_i2c_dev *i2c_dev = data; +struct viai2c *i2c = data;/* save the status and write-clear it */ - i2c_dev->cmd_status =readw (i2c_dev->base +REG_ISR ); -writew (i2c_dev->cmd_status, i2c_dev->base +REG_ISR ); + i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR ); -complete (&i2c_dev->complete); +complete (&i2c->complete);return IRQ_HANDLED ; } -int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) {int err; -struct wmt_i2c_dev *i2c_dev; +struct viai2c *i2c;struct device_node *np = pdev->dev.of_node; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) + i2c =devm_kzalloc (&pdev->dev,sizeof (*i2c),GFP_KERNEL ); +if (!i2c)return -ENOMEM ; - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); + i2c->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c->base)) +return PTR_ERR (i2c->base); - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq)return -EINVAL ; - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, -0 , pdev->name, i2c_dev); + err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr, +0 , pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err, -"failed to request irq %i\n" , i2c_dev->irq); +"failed to request irq %i\n" , i2c->irq); - i2c_dev->dev = &pdev->dev; -init_completion (&i2c_dev->complete); -platform_set_drvdata (pdev, i2c_dev); + i2c->dev = &pdev->dev; +init_completion (&i2c->complete); +platform_set_drvdata (pdev, i2c); - *pi2c_dev = i2c_dev; + *pi2c = i2c;return 0 ; }
drivers/i2c/busses/i2c-viai2c-common.h +34 -36
91 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-wmt.c +30 -30
115 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH v7 3/6] i2c: wmt: rename something
Quoted 14 lines · Hans Hu
v6->v7:Put those renaming related patches in 1 patch file. Link: https://lore.kernel.org/all/75978a2c47f17bf6871b92803e9c075e52aed1b6.1703830854.git.hanshu-oc@zhaoxin.com/ Link: https://lore.kernel.org/all/c417d693bbdb3a4b804c1c3ba03e57bf4e8c33e1.1703830854.git.hanshu-oc@zhaoxin.com/ Link: https://lore.kernel.org/all/65b930cefd380ce45e0e1b3967bc7f51737b0948.1703830854.git.hanshu-oc@zhaoxin.com/1. The I2C IP for both wmt and zhaoxin originates from VIA. Rename common registers, functions, and variable names to follow the
VIAI2C_andviai2c_naming conventions for consistency and clarity.
2. renamei2c_devto i2c, to shorten the length of a line.
3. renamewait_resulttotime_left, make it better to reflect the meaning of the value returned bywait_for_completion_timeout().
4. removeTCR_MASTER_WRITE, its value is 0.
Quoted 1 line
Signed-off-by Hans Hu <[email protected]>
Maybe not super necessary, but OK:
PATCH v7 4/6 i2c: wmt: fix a bug when thread blocked
In reply to Hans Huv6->v7:
1. some dirty patches were removed
2. rename structure member 'to/ti' to 't1/t2' to make it easier to understand.
3. add a comment about arbitration.
During each byte access, the host performs clock stretching. In this case, the thread may be interrupted by preemption, resulting in a long stretching time.
However, some touchpad can only tolerate host clock stretching of no more than 200 ms. We reduce the impact of this through a retransmission mechanism.
Since __i2c_lock_bus_helper() is used to ensure that the current access will not be interrupted by the other access, We don't need to worry about arbitration anymore.
--- drivers/i2c/busses/i2c-viai2c-common.c | 26 ++++++++++++++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 3 +++ 2 files changed, 29 insertions(+)
drivers/i2c/busses/i2c-viai2c-common.c +26 -0
@@ -22,12 +22,37 @@ int viai2c_check_status(struct viai2c *i2c) {int ret =0 ;unsigned long time_left; +unsigned long delta_ms; time_left =wait_for_completion_timeout (&i2c->complete,msecs_to_jiffies (500 ));if (!time_left)return -ETIMEDOUT ; +/* +* During each byte access, the host performs clock stretching. +* In this case, the thread may be interrupted by preemption, +* resulting in a long stretching time. +* +* However, some touchpad can only tolerate host clock stretching +* of no more than 200 ms. We reduce the impact of this through +* a retransmission mechanism. +* +* Since __i2c_lock_bus_helper() is used to ensure that the +* current access will not be interrupted by the other access, +* We don't need to worry about arbitration anymore. +*/ +local_irq_disable (); + i2c->t2 =ktime_get (); + delta_ms =ktime_to_ms (ktime_sub (i2c->t2, i2c->t1)); +if (delta_ms >VIAI2C_STRETCHING_TIMEOUT ) { +local_irq_enable (); +dev_warn (i2c->dev,"thread blocked more than %ldms\n" , delta_ms); +return -EAGAIN ; + } + i2c->t1 = i2c->t2; +local_irq_enable (); +if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ;
@@ -158,6 +183,7 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)int ret =0 ;struct viai2c *i2c =i2c_get_adapdata (adap); + i2c->t2 = i2c->t1 =ktime_get ();for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) {
drivers/i2c/busses/i2c-viai2c-common.h +3 -0
@@ -49,6 +49,7 @@#define VIAI2C_REG_MCR 0x0E#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000)) +#define VIAI2C_STRETCHING_TIMEOUT 200struct viai2c {struct i2c_adapter adapter;
@@ -59,6 +60,8 @@ struct viai2c {u16 tcr;int irq;u16 cmd_status; +ktime_t t1; +ktime_t t2; };int viai2c_wait_bus_not_busy (struct viai2c *i2c);
Signature · 1 line
2.34.1
Re: [PATCH v7 4/6] i2c: wmt: fix a bug when thread blocked
Hi,
Quoted 15 lines · Hans Hu
v6->v7:
1. some dirty patches were removed
2. rename structure member 'to/ti' to 't1/t2' to make it easier to understand.
3. add a comment about arbitration.During each byte access, the host performs clock stretching. In this case, the thread may be interrupted by preemption, resulting in a long stretching time.
However, some touchpad can only tolerate host clock stretching of no more than 200 ms. We reduce the impact of this through a retransmission mechanism.
Quoted 6 lines
Since
__i2c_lock_bus_helper()is used to ensure that the current access will not be interrupted by the other access, We don't need to worry about arbitration anymore.Reviewed-by Andi Shyti <[email protected]>Signed-off-by Hans Hu <[email protected]>
Uh oh, NACK. We shouldn't limit clock stretching because some touchpad controllers can't handle it.
The first thing I suggest is to move more handling to the interrupt context, like filling the next byte after the previous has been processed. Then, you are not interruptible anymore.
If this all fails, we need to determine a bus specific property, but I am quite sure the above conversion will be enough.
Maybe it is an idea to first get the driver converted to support your platform, and afterwards the conversion to more handling in interrupt.
Kind regards,
Wolfram
Re: [PATCH v7 4/6] i2c: wmt: fix a bug when thread blocked
Hi Wolfram,
Quoted 34 lines · Wolfram Sang
Hi,
Quoted 15 lines · Hans Hu
v6->v7:
1. some dirty patches were removed
2. rename structure member 'to/ti' to 't1/t2' to make it easier to understand.
3. add a comment about arbitration.During each byte access, the host performs clock stretching. In this case, the thread may be interrupted by preemption, resulting in a long stretching time.
However, some touchpad can only tolerate host clock stretching of no more than 200 ms. We reduce the impact of this through a retransmission mechanism.
Quoted 6 lines
Since
__i2c_lock_bus_helper()is used to ensure that the current access will not be interrupted by the other access, We don't need to worry about arbitration anymore.Reviewed-by Andi Shyti <[email protected]>Signed-off-by Hans Hu <[email protected]>Uh oh, NACK. We shouldn't limit clock stretching because some touchpad controllers can't handle it.
The first thing I suggest is to move more handling to the interrupt context, like filling the next byte after the previous has been processed. Then, you are not interruptible anymore.
If this all fails, we need to determine a bus specific property, but I am quite sure the above conversion will be enough.
Quoted 7 lines
Maybe it is an idea to first get the driver converted to support your platform, and afterwards the conversion to more handling in interrupt.
Kind regards,
Wolfram
Thanks for your suggestion, the purpose of this approach is to reduce the clock stretching caused by the system. Therefore, I try to put almost all of the processing in the interrupt context.
Hans,
Thank you
Re: [PATCH v7 4/6] i2c: wmt: fix a bug when thread blocked
Quoted 4 lines
Thanks for your suggestion, the purpose of this approach is to reduce the clock stretching caused by the system. Therefore, I try to put almost all of the processing in the interrupt context.
Well, I think per-msg handling in interrupt context is enough. The transfer (consisting of multiple messages) handling is usually best left in process context.
Re: [PATCH v7 4/6] i2c: wmt: fix a bug when thread blocked
Quoted 8 lines
Quoted 4 lines
Thanks for your suggestion, the purpose of this approach is to reduce the clock stretching caused by the system. Therefore, I try to put almost all of the processing in the interrupt context.
Well, I think per-msg handling in interrupt context is enough. The transfer (consisting of multiple messages) handling is usually best left in process context.
OK, I understand now.
Hans,
Thank you
Re: [PATCH v7 4/6] i2c: wmt: fix a bug when thread blocked
Quoted 10 lines · Hans Hu
Quoted 8 lines
Quoted 4 lines
Thanks for your suggestion, the purpose of this approach is to reduce the clock stretching caused by the system. Therefore, I try to put almost all of the processing in the interrupt context.
Well, I think per-msg handling in interrupt context is enough. The transfer (consisting of multiple messages) handling is usually best left in process context.
OK, I understand now.
If you need inspiration, check i2c-digicolor.c for a simple driver implementing it.
PATCH v7 5/6 i2c: wmt: add platform type VIAI2C_PLAT_WMT
In reply to Hans HuEnumeration variables are added to differentiate
between different platforms.
--- drivers/i2c/busses/i2c-viai2c-common.c | 31 +++++++++++++++++--------- drivers/i2c/busses/i2c-viai2c-common.h | 7 +++++- drivers/i2c/busses/i2c-viai2c-wmt.c | 2 +- 3 files changed, 27 insertions(+), 13 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +20 -11
@@ -79,7 +79,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)writew (pmsg->buf[0 ] &0xFF , i2c->base +VIAI2C_REG_CDR ); } -if (!(pmsg->flags &I2C_M_NOSTART )) { +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) { val =readw (i2c->base +VIAI2C_REG_CR ); val &= ~VIAI2C_CR_TX_END ; val |=VIAI2C_CR_CPU_RDY ;
@@ -92,7 +92,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)writew (tcr_val, i2c->base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && pmsg->flags &I2C_M_NOSTART ) { val =readw (i2c->base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, i2c->base +VIAI2C_REG_CR );
@@ -118,7 +118,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last) }if (xfer_len == pmsg->len) { -if (last !=1 ) +if (i2c->platform ==VIAI2C_PLAT_WMT && !last)writew (VIAI2C_CR_ENABLE , i2c->base +VIAI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , i2c->base +VIAI2C_REG_CDR );
@@ -139,7 +139,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg) val =readw (i2c->base +VIAI2C_REG_CR ); val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END ); -if (!(pmsg->flags &I2C_M_NOSTART )) +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 )
@@ -153,7 +153,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, i2c->base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) { val =readw (i2c->base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, i2c->base +VIAI2C_REG_CR );
@@ -186,7 +186,8 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) i2c->t2 = i2c->t1 =ktime_get ();for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i]; -if (!(pmsg->flags &I2C_M_NOSTART )) { +if ((i2c->platform ==VIAI2C_PLAT_WMT ) + && !(pmsg->flags &I2C_M_NOSTART )) { ret =viai2c_wait_bus_not_busy (i2c);if (ret <0 )return ret;
@@ -214,9 +215,10 @@ static irqreturn_t viai2c_isr(int irq, void *data)return IRQ_HANDLED ; } -int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat) {int err; +int irq_flags;struct viai2c *i2c;struct device_node *np = pdev->dev.of_node;
@@ -228,12 +230,19 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c)if (IS_ERR (i2c->base))return PTR_ERR (i2c->base); - i2c->irq =irq_of_parse_and_map (np,0 ); -if (!i2c->irq) -return -EINVAL ; +if (plat ==VIAI2C_PLAT_WMT ) { + irq_flags =0 ; + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq) +return -EINVAL ; + }else { +return dev_err_probe (&pdev->dev, -EINVAL ,"wrong platform type\n" ); + } + + i2c->platform = plat; err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr, -0 , pdev->name, i2c); + irq_flags, pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err,"failed to request irq %i\n" , i2c->irq);
drivers/i2c/busses/i2c-viai2c-common.h +6 -1
@@ -51,6 +51,10 @@#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000))#define VIAI2C_STRETCHING_TIMEOUT 200 +enum { +VIAI2C_PLAT_WMT =1 , +}; +struct viai2c {struct i2c_adapter adapter;struct completion complete;
@@ -62,11 +66,12 @@ struct viai2c {u16 cmd_status;ktime_t t1;ktime_t t2; + int platform; };int viai2c_wait_bus_not_busy (struct viai2c *i2c);int viai2c_check_status (struct viai2c *i2c);int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num); -int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c); +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat);#endif
drivers/i2c/busses/i2c-viai2c-wmt.c +1 -1
@@ -80,7 +80,7 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - err =viai2c_init (pdev, &i2c); + err =viai2c_init (pdev, &i2c,VIAI2C_PLAT_WMT );if (err)return err;
Signature · 1 line
2.34.1
Re: [PATCH v7 5/6] i2c: wmt: add platform type VIAI2C_PLAT_WMT
drivers/i2c/busses/i2c-viai2c-common.h line 56
Quoted 4 lines
drivers/i2c/busses/i2c-viai2c-common.h +3
-0+enum { +VIAI2C_PLAT_WMT =1 , +};
Minor, but why not starting at 0?
drivers/i2c/busses/i2c-viai2c-common.h struct viai2c { · line 69
Quoted 8 lines
struct viai2c {
drivers/i2c/busses/i2c-viai2c-common.h +1
-0struct i2c_adapter adapter;struct completion complete;@@ -62,11 +66,12 @@ struct viai2c {u16 cmd_status;ktime_t t1;ktime_t t2; +int platform;
unsigned int?
Re: [PATCH v7 5/6] i2c: wmt: add platform type VIAI2C_PLAT_WMT
Hi Wolfram,
Quoted 5 lines
drivers/i2c/busses/i2c-viai2c-common.h line 56
Quoted 3 lines
drivers/i2c/busses/i2c-viai2c-common.h +3
-0+enum { +VIAI2C_PLAT_WMT =1 , +};Minor, but why not starting at 0?
Quoted 10 lines
drivers/i2c/busses/i2c-viai2c-common.h struct viai2c { · line 69
Quoted 8 lines
struct viai2c { struct i2c_adapter adapter; struct completion complete;drivers/i2c/busses/i2c-viai2c-common.h +1
-0@@ -62,11 +66,12 @@ struct viai2c {u16 cmd_status;ktime_t t1;ktime_t t2; +int platform;unsigned int?
will change it.
Hans,
Thank you
PATCH v7 6/6 i2c: add zhaoxin i2c controller driver
In reply to Hans Huv6->v7:
1. rename 'i2c-zhaoxin-plt.c' to 'i2c-viai2c-zhaoxin.c'
2. remove '#define zxi2c viai2c', use viai2c directly
Add Zhaoxin I2C controller driver. It provides the access to the i2c busses, which connects to the touchpad, eeprom, I2S, etc.
Zhaoxin I2C controller has two separate busses, so may accommodate up to two I2C adapters. Those adapters are listed in the ACPI namespace with the "IIC1D17" HID, and probed by a platform driver.
The driver works with IRQ mode, and supports basic I2C features. Flags I2C_AQ_NO_ZERO_LEN and I2C_AQ_COMB_WRITE_THEN_READ are used to limit the unsupported access.
--- MAINTAINERS | 8 + drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 17 +- drivers/i2c/busses/i2c-viai2c-common.h | 4 + drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 282 ++++++++++++++++++++++++ 6 files changed, 320 insertions(+), 3 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-zhaoxin.c
MAINTAINERS +8 -0
@@ -10023,6 +10023,14 @@ L: [email protected] F: Documentation/i2c/busses/i2c-ismt.rst F: drivers/i2c/busses/i2c-ismt.c +I2C/SMBUS ZHAOXIN DRIVER +M: Hans Hu <[email protected]> +L: [email protected] +S: Maintained +W: https://www.zhaoxin.com +F: drivers/i2c/busses/i2c-viai2c-common.c +F: drivers/i2c/busses/i2c-viai2c-zhaoxin.c + I2C/SMBUS STUB DRIVER M: Jean Delvare <[email protected]> L: [email protected]
drivers/i2c/busses/Kconfig +10 -0
@@ -336,6 +336,16 @@ config I2C_VIAPRO if ACPI +config I2C_ZHAOXIN + tristate "Zhaoxin I2C Interface" + depends on PCI || COMPILE_TEST + help + If you say yes to this option, support will be included for the + ZHAOXIN I2C interface + + This driver can also be built as a module. If so, the module + will be called i2c-zhaoxin. + comment "ACPI drivers" config I2C_SCMI
drivers/i2c/busses/Makefile +2 -0
@@ -29,6 +29,8 @@ obj-$(CONFIG_I2C_SIS630) += i2c-sis630.o obj-$(CONFIG_I2C_SIS96X) += i2c-sis96x.o obj-$(CONFIG_I2C_VIA) += i2c-via.o obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o +i2c-zhaoxin-objs := i2c-viai2c-zhaoxin.o i2c-viai2c-common.o +obj-$(CONFIG_I2C_ZHAOXIN) += i2c-zhaoxin.o # Mac SMBus host controller drivers obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o
drivers/i2c/busses/i2c-viai2c-common.c +14 -3
@@ -120,6 +120,8 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)if (xfer_len == pmsg->len) {if (i2c->platform ==VIAI2C_PLAT_WMT && !last)writew (VIAI2C_CR_ENABLE , i2c->base +VIAI2C_REG_CR ); +else if (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && last) +writeb (VIAI2C_CR_TX_END , i2c->base +VIAI2C_REG_CR ); }else {writew (pmsg->buf[xfer_len] &0xFF , i2c->base +VIAI2C_REG_CDR ); writew(VIAI2C_CR_CPU_RDY | VIAI2C_CR_ENABLE,
@@ -130,7 +132,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)return 0 ; } -static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg,bool first) {u16 val, tcr_val = i2c->tcr;int ret;
@@ -153,7 +155,8 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, i2c->base +VIAI2C_REG_TCR ); -if (i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) { +if ((i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) + || (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && !first)) { val =readw (i2c->base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, i2c->base +VIAI2C_REG_CR );
@@ -194,7 +197,7 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) }if (pmsg->flags &I2C_M_RD ) - ret =viai2c_read (i2c, pmsg); + ret =viai2c_read (i2c, pmsg, i ==0 );else ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }
@@ -208,6 +211,9 @@ static irqreturn_t viai2c_isr(int irq, void *data)/* save the status and write-clear it */ i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +if (!i2c->cmd_status && i2c->platform ==VIAI2C_PLAT_ZHAOXIN ) +return IRQ_NONE ; +writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR );complete (&i2c->complete);
@@ -235,6 +241,11 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c, int plat) i2c->irq =irq_of_parse_and_map (np,0 );if (!i2c->irq)return -EINVAL ; + }else if (plat ==VIAI2C_PLAT_ZHAOXIN ) { + irq_flags =IRQF_SHARED ; + i2c->irq =platform_get_irq (pdev,0 ); +if (i2c->irq <0 ) +return i2c->irq; }else {return dev_err_probe (&pdev->dev, -EINVAL ,"wrong platform type\n" ); }
drivers/i2c/busses/i2c-viai2c-common.h +4 -0
@@ -53,6 +53,7 @@enum {VIAI2C_PLAT_WMT =1 , +VIAI2C_PLAT_ZHAOXIN };struct viai2c {
@@ -67,6 +68,9 @@ struct viai2c {ktime_t t1;ktime_t t2;int platform; +u8 hrv; +u16 tr; +u16 mcr; };int viai2c_wait_bus_not_busy (struct viai2c *i2c);
drivers/i2c/busses/i2c-viai2c-zhaoxin.c new file +282 -0
282 lines not on this page · raw message
Signature · 1 line
2.34.1
drivers/i2c/busses/i2c-viai2c-common.h struct viai2c { · line 73
Quoted 8 lines
drivers/i2c/busses/i2c-viai2c-common.h +3
-0@@ -67,6 +68,9 @@ struct viai2c {ktime_t t1;ktime_t t2;int platform; +u8 hrv; +u16 tr; +u16 mcr;
Hmm, since this is zhaoxin specific, what about adding
void *pltfm_priv;
and put 'hrv', 'tr', and 'mcr' to a struct 'viai2c_zhaoxin' local to i2c-viai2c-zhaoxin.c and populate pltfm_priv with it?
Rest looks good so far...
Hi Wolfram,
Quoted 9 lines
drivers/i2c/busses/i2c-viai2c-common.h struct viai2c { · line 73
Quoted 7 lines
drivers/i2c/busses/i2c-viai2c-common.h +3
-0@@ -67,6 +68,9 @@ struct viai2c {ktime_t t1;ktime_t t2;int platform; +u8 hrv; +u16 tr; +u16 mcr;Hmm, since this is zhaoxin specific, what about adding
Quoted 7 lines
void *pltfm_priv;and put 'hrv', 'tr', and 'mcr' to a struct '
viai2c_zhaoxin' local toi2c-viai2c-zhaoxin.cand populatepltfm_privwith it?Rest looks good so far...
will add it.
Hans,
Thank you
v8 cover i2c: add zhaoxin i2c controller driver
In reply to Hans Huv7->v8:
* move per-msg handling to interrupt context
* add private struct viai2c_zhaoxin to handle zhaoxin specific things
* fixed some other formatting issues
v6->v7:
* adjust the patch sequence
* put those renaming related patches in 1 patch file
* rename i2c-*-plt.c to i2c-viai2c-*.c
* Some other adjustments suggested by Andi For more details, see the comment in each patch please.
v5->v6:
* fix build warnning reported by kernel test robot. Link: https://lore.kernel.org/all/[email protected]/ Link: https://lore.kernel.org/all/[email protected]/
v4->v5:
* fix 1 build error. Link: https://lore.kernel.org/all/ZYx0VPVmyQhtG+B9@shikoro/1-a.txt Link: https://lore.kernel.org/all/[email protected]/
v3->v4:
* Some adjustments as suggested by Wolfram.
* rebase patch on top of for-next branch.
v2->v3:
* Split the number of patches from 2 to 12. Make it easier to review. Link: https://lore.kernel.org/all/[email protected]/
v1->v2:
* Fixed some bugs I found myself. Link: https://lore.kernel.org/all/[email protected]/
Old version:
This patch has already gone through a round of reviews. Compared with the first round, the main difference of this round of patch is the use of i2c-wmt driver.
Hans Hu (6):
i2c: wmt: create wmt_i2c_init for general init
i2c: wmt: split out common files
i2c: wmt: rename something
i2c: wmt: fix a bug when thread blocked
i2c: wmt: add platform type VIAI2C_PLAT_WMT
i2c: add zhaoxin i2c controller driver
MAINTAINERS | 10 +- drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 3 + drivers/i2c/busses/i2c-viai2c-common.c | 250 ++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 85 +++++ drivers/i2c/busses/i2c-viai2c-wmt.c | 143 ++++++++ drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 299 +++++++++++++++++ drivers/i2c/busses/i2c-wmt.c | 417 ------------------------ 8 files changed, 799 insertions(+), 418 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-viai2c-wmt.c create mode 100644 drivers/i2c/busses/i2c-viai2c-zhaoxin.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c
Signature · 1 line
2.34.1
PATCH v8 1/6 i2c: wmt: create wmt_i2c_init for general init
Some common initialization actions are put in the function wmt_i2c_init(), which is convenient to share with zhaoxin.
--- drivers/i2c/busses/i2c-wmt.c | 67 +++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 31 deletions(-)
drivers/i2c/busses/i2c-wmt.c +36 -31
@@ -286,6 +286,38 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)return IRQ_HANDLED ; } +static int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +{ +int err; +struct wmt_i2c_dev *i2c_dev; +struct device_node *np = pdev->dev.of_node; + + i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); +if (!i2c_dev) +return -ENOMEM ; + + i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c_dev->base)) +return PTR_ERR (i2c_dev->base); + + i2c_dev->irq =irq_of_parse_and_map (np,0 ); +if (!i2c_dev->irq) +return -EINVAL ; + + err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, +0 , pdev->name, i2c_dev); +if (err) +return dev_err_probe (&pdev->dev, err, +"failed to request irq %i\n" , i2c_dev->irq); + + i2c_dev->dev = &pdev->dev; +init_completion (&i2c_dev->complete); +platform_set_drvdata (pdev, i2c_dev); + + *pi2c_dev = i2c_dev; +return 0 ; +} +static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) {int err;
@@ -327,19 +359,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) -return -ENOMEM ; - - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); - - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) { -dev_err (&pdev->dev,"irq missing or invalid\n" ); -return -EINVAL ; - } + err =wmt_i2c_init (pdev, &i2c_dev); +if (err) +return err; i2c_dev->clk =of_clk_get (np,0 );if (IS_ERR (i2c_dev->clk)) {
@@ -351,15 +373,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) i2c_dev->tcr =TCR_FAST_MODE ; - i2c_dev->dev = &pdev->dev; - - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr,0 , -"i2c" , i2c_dev); -if (err) { -dev_err (&pdev->dev,"failed to request irq %i\n" , i2c_dev->irq); -return err; - } - adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name));
@@ -368,21 +381,13 @@ static int wmt_i2c_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; -init_completion (&i2c_dev->complete); - err =wmt_i2c_reset_hardware (i2c_dev);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );return err; } - err =i2c_add_adapter (adap); -if (err) -return err; - -platform_set_drvdata (pdev, i2c_dev); - -return 0 ; +return i2c_add_adapter (adap); }static void wmt_i2c_remove (struct platform_device *pdev)
Signature · 1 line
2.34.1
PATCH v8 2/6 i2c: wmt: split out common files
In reply to Hans HuSince the I2C IP of both wmt and zhaoxin originates from VIA, it is better to separate the common code first.
The common driver is named as i2c-viai2c-common.c. Old i2c-wmt.c renamed to i2c-viai2c-wmt.c.
The MAINTAINERS file will be updated accordingly in upcoming commits.
--- MAINTAINERS | 2 +- drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-viai2c-common.c | 221 +++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 71 +++++ drivers/i2c/busses/i2c-viai2c-wmt.c | 143 +++++++++ drivers/i2c/busses/i2c-wmt.c | 422 ------------------------- 6 files changed, 437 insertions(+), 423 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-viai2c-wmt.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c
MAINTAINERS +1 -1
@@ -2988,7 +2988,7 @@ S: Orphan F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt F: arch/arm/mach-vt8500/ F: drivers/clocksource/timer-vt8500.c -F: drivers/i2c/busses/i2c-wmt.c +F: drivers/i2c/busses/i2c-viai2c-wmt.c F: drivers/mmc/host/wmt-sdmmc.c F: drivers/pwm/pwm-vt8500.c F: drivers/rtc/rtc-vt8500.c
drivers/i2c/busses/Makefile +1 -0
@@ -120,6 +120,7 @@ obj-$(CONFIG_I2C_TEGRA_BPMP) += i2c-tegra-bpmp.o obj-$(CONFIG_I2C_UNIPHIER) += i2c-uniphier.o obj-$(CONFIG_I2C_UNIPHIER_F) += i2c-uniphier-f.o obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o +i2c-wmt-objs := i2c-viai2c-wmt.o i2c-viai2c-common.o obj-$(CONFIG_I2C_WMT) += i2c-wmt.o i2c-octeon-objs := i2c-octeon-core.o i2c-octeon-platdrv.o obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o
drivers/i2c/busses/i2c-viai2c-common.c new file +221 -0
221 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-common.h new file +71 -0
71 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-wmt.c new file +143 -0
143 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt.c deleted +0 -422
422 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v8 3/6 i2c: wmt: rename something
In reply to Hans Hu1. The I2C IP for both wmt and zhaoxin originates from VIA. Rename common registers, functions, and variable names to follow the VIAI2C_ and viai2c_ naming conventions for consistency and clarity.
2. rename i2c_dev to i2c, to shorten the length of a line.
3. rename wait_result to time_left, make it better to reflect the meaning of the value returned by wait_for_completion_timeout().
4. remove TCR_MASTER_WRITE, its value is 0.
--- drivers/i2c/busses/i2c-viai2c-common.c | 156 ++++++++++++------------- drivers/i2c/busses/i2c-viai2c-common.h | 70 ++++++----- drivers/i2c/busses/i2c-viai2c-wmt.c | 60 +++++----- 3 files changed, 142 insertions(+), 144 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +78 -78
@@ -2,14 +2,14 @@#include <linux/of_irq.h> #include "i2c-viai2c-common.h" -int wmt_i2c_wait_bus_not_busy (struct wmt_i2c_dev *i2c_dev) +int viai2c_wait_bus_not_busy (struct viai2c *i2c) {unsigned long timeout; - timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +REG_CSR ) &CSR_READY_MASK )) { + timeout = jiffies +VIAI2C_TIMEOUT ; +while (!(readw (i2c->base +VIAI2C_REG_CSR ) &VIAI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) { -dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" ); +dev_warn (i2c->dev,"timeout waiting for bus ready\n" );return -EBUSY ; }msleep (20 );
@@ -18,28 +18,28 @@ int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)return 0 ; } -int wmt_check_status (struct wmt_i2c_dev *i2c_dev) +int viai2c_check_status (struct viai2c *i2c) {int ret =0 ; -unsigned long wait_result; +unsigned long time_left; - wait_result =wait_for_completion_timeout (&i2c_dev->complete, + time_left =wait_for_completion_timeout (&i2c->complete,msecs_to_jiffies (500 )); -if (!wait_result) +if (!time_left)return -ETIMEDOUT ; -if (i2c_dev->cmd_status &ISR_NACK_ADDR ) +if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c_dev->cmd_status &ISR_SCL_TIMEOUT ) +if (i2c->cmd_status &VIAI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret; } -static int wmt_i2c_write (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg,int last) +static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,int last) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;int xfer_len =0 ;
@@ -49,173 +49,173 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg, int* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , i2c_dev->base +REG_CDR ); +writew (0 , i2c->base +VIAI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , i2c->base +VIAI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +REG_CR ); - val &= ~CR_TX_END ; - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val &= ~VIAI2C_CR_TX_END ; + val |=VIAI2C_CR_CPU_RDY ; +writew (val, i2c->base +VIAI2C_REG_CR ); } -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |= (TCR_MASTER_WRITE | (pmsg->addr &TCR_SLAVE_ADDR_MASK )); + tcr_val |= pmsg->addr &VIAI2C_TCR_ADDR_MASK ; -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c->base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, i2c->base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =viai2c_check_status (i2c);if (ret)return ret; xfer_len++; - val =readw (i2c_dev->base +REG_CSR ); -if ((val &CSR_RCV_ACK_MASK ) ==CSR_RCV_NOT_ACK ) { -dev_dbg (i2c_dev->dev,"write RCV NACK error\n" ); + val =readw (i2c->base +VIAI2C_REG_CSR ); +if (val &VIAI2C_CSR_RCV_NOT_ACK ) { +dev_dbg (i2c->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =CR_TX_END |CR_CPU_RDY |CR_ENABLE ; -writew (val, i2c_dev->base +REG_CR ); + val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE ; +writew (val, i2c->base +VIAI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (CR_ENABLE , i2c_dev->base +REG_CR ); +writew (VIAI2C_CR_ENABLE , i2c->base +VIAI2C_REG_CR ); }else { -writew (pmsg->buf[xfer_len] &0xFF , i2c_dev->base + -REG_CDR ); -writew (CR_CPU_RDY |CR_ENABLE , i2c_dev->base +REG_CR ); +writew (pmsg->buf[xfer_len] &0xFF , i2c->base +VIAI2C_REG_CDR ); +writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , + i2c->base +VIAI2C_REG_CR ); } }return 0 ; } -static int wmt_i2c_read (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;u32 xfer_len =0 ; - val =readw (i2c_dev->base +REG_CR ); - val &= ~(CR_TX_END |CR_TX_NEXT_NO_ACK ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END );if (!(pmsg->flags &I2C_M_NOSTART )) - val |=CR_CPU_RDY ; + val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 ) - val |=CR_TX_NEXT_NO_ACK ; + val |=VIAI2C_CR_RX_END ; -writew (val, i2c_dev->base +REG_CR ); +writew (val, i2c->base +VIAI2C_REG_CR ); -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |=TCR_MASTER_READ | (pmsg->addr &TCR_SLAVE_ADDR_MASK ); + tcr_val |=VIAI2C_TCR_READ | (pmsg->addr &VIAI2C_TCR_ADDR_MASK ); -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c->base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, i2c->base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =viai2c_check_status (i2c);if (ret)return ret; - pmsg->buf[xfer_len] =readw (i2c_dev->base +REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (i2c->base +VIAI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (i2c_dev->base +REG_CR ) |CR_CPU_RDY ; + val =readw (i2c->base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) - val |=CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); + val |=VIAI2C_CR_RX_END ; +writew (val, i2c->base +VIAI2C_REG_CR ); }return 0 ; } -int wmt_i2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num) +int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num) {struct i2c_msg *pmsg;int i;int ret =0 ; -struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap); +struct viai2c *i2c =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c_dev); + ret =viai2c_wait_bus_not_busy (i2c);if (ret <0 )return ret; }if (pmsg->flags &I2C_M_RD ) - ret =wmt_i2c_read (i2c_dev, pmsg); + ret =viai2c_read (i2c, pmsg);else - ret =wmt_i2c_write (i2c_dev, pmsg, (i +1 ) == num); + ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }return (ret <0 ) ? ret : i; } -static irqreturn_t wmt_i2c_isr (int irq,void *data) +static irqreturn_t viai2c_isr (int irq,void *data) { -struct wmt_i2c_dev *i2c_dev = data; +struct viai2c *i2c = data;/* save the status and write-clear it */ - i2c_dev->cmd_status =readw (i2c_dev->base +REG_ISR ); -writew (i2c_dev->cmd_status, i2c_dev->base +REG_ISR ); + i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR ); -complete (&i2c_dev->complete); +complete (&i2c->complete);return IRQ_HANDLED ; } -int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) {int err; -struct wmt_i2c_dev *i2c_dev; +struct viai2c *i2c;struct device_node *np = pdev->dev.of_node; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) + i2c =devm_kzalloc (&pdev->dev,sizeof (*i2c),GFP_KERNEL ); +if (!i2c)return -ENOMEM ; - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); + i2c->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c->base)) +return PTR_ERR (i2c->base); - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq)return -EINVAL ; - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, -0 , pdev->name, i2c_dev); + err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr, +0 , pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err, -"failed to request irq %i\n" , i2c_dev->irq); +"failed to request irq %i\n" , i2c->irq); - i2c_dev->dev = &pdev->dev; -init_completion (&i2c_dev->complete); -platform_set_drvdata (pdev, i2c_dev); + i2c->dev = &pdev->dev; +init_completion (&i2c->complete); +platform_set_drvdata (pdev, i2c); - *pi2c_dev = i2c_dev; + *pi2c = i2c;return 0 ; }
drivers/i2c/busses/i2c-viai2c-common.h +34 -36
91 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-wmt.c +30 -30
115 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v8 4/6 i2c: wmt: fix a bug when thread blocked
In reply to Hans HuDuring each byte access, the host performs clock stretching.
To reduce the host performs clock stretching, move most of the per-msg processing to the interrupt context.
--- drivers/i2c/busses/i2c-viai2c-common.c | 139 ++++++++++++------------- drivers/i2c/busses/i2c-viai2c-common.h | 6 +- 2 files changed, 73 insertions(+), 72 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +69 -70
@@ -18,37 +18,18 @@ int viai2c_wait_bus_not_busy(struct viai2c *i2c)return 0 ; } -int viai2c_check_status (struct viai2c *i2c) -{ -int ret =0 ; -unsigned long time_left; - - time_left =wait_for_completion_timeout (&i2c->complete, -msecs_to_jiffies (500 )); -if (!time_left) -return -ETIMEDOUT ; - -if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) - ret = -EIO ; - -if (i2c->cmd_status &VIAI2C_ISR_SCL_TIMEOUT ) - ret = -ETIMEDOUT ; - -return ret; -} -static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,int last) {u16 val, tcr_val = i2c->tcr; -int ret; -int xfer_len =0 ; + + i2c->last = last;if (pmsg->len ==0 ) {/* * We still need to run through the while (..) once, so * start at -1 and break out early from the loop */ - xfer_len =-1 ; + i2c->xfered_len =-1 ;writew (0 , i2c->base +VIAI2C_REG_CDR ); }else {writew (pmsg->buf[0 ] &0xFF , i2c->base +VIAI2C_REG_CDR );
@@ -73,43 +54,15 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)writew (val, i2c->base +VIAI2C_REG_CR ); } -while (xfer_len < pmsg->len) { - ret =viai2c_check_status (i2c); -if (ret) -return ret; - - xfer_len++; - - val =readw (i2c->base +VIAI2C_REG_CSR ); -if (val &VIAI2C_CSR_RCV_NOT_ACK ) { -dev_dbg (i2c->dev,"write RCV NACK error\n" ); -return -EIO ; - } - -if (pmsg->len ==0 ) { - val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE ; -writew (val, i2c->base +VIAI2C_REG_CR ); -break ; - } - -if (xfer_len == pmsg->len) { -if (last !=1 ) -writew (VIAI2C_CR_ENABLE , i2c->base +VIAI2C_REG_CR ); - }else { -writew (pmsg->buf[xfer_len] &0xFF , i2c->base +VIAI2C_REG_CDR ); -writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , - i2c->base +VIAI2C_REG_CR ); - } - } +if (!wait_for_completion_timeout (&i2c->complete,VIAI2C_TIMEOUT )) +return -ETIMEDOUT ; -return 0 ; +return i2c->ret; }static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) {u16 val, tcr_val = i2c->tcr; -int ret; -u32 xfer_len =0 ; val =readw (i2c->base +VIAI2C_REG_CR ); val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END );
@@ -134,21 +87,10 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (val, i2c->base +VIAI2C_REG_CR ); } -while (xfer_len < pmsg->len) { - ret =viai2c_check_status (i2c); -if (ret) -return ret; - - pmsg->buf[xfer_len] =readw (i2c->base +VIAI2C_REG_CDR ) >>8 ; - xfer_len++; - - val =readw (i2c->base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ; -if (xfer_len == pmsg->len -1 ) - val |=VIAI2C_CR_RX_END ; -writew (val, i2c->base +VIAI2C_REG_CR ); - } +if (!wait_for_completion_timeout (&i2c->complete,VIAI2C_TIMEOUT )) +return -ETIMEDOUT ; -return 0 ; +return i2c->ret; }int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num)
@@ -166,6 +108,9 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)return ret; } + i2c->msg = pmsg; + i2c->xfered_len =0 ; +if (pmsg->flags &I2C_M_RD ) ret =viai2c_read (i2c, pmsg);else
@@ -175,15 +120,69 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)return (ret <0 ) ? ret : i; } +static int viai2c_irq_xfer (struct viai2c *i2c) +{ +u16 val; +struct i2c_msg *msg = i2c->msg; +u8 read = msg->flags &I2C_M_RD ; +void __iomem *base = i2c->base; + +if (read) { + msg->buf[i2c->xfered_len] =readw (base +VIAI2C_REG_CDR ) >>8 ; + + val =readw (base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ; +if (i2c->xfered_len == msg->len -2 ) + val |=VIAI2C_CR_RX_END ; +writew (val, base +VIAI2C_REG_CR ); + }else { + + val =readw (base +VIAI2C_REG_CSR ); +if (val &VIAI2C_CSR_RCV_NOT_ACK ) { +dev_dbg_ratelimited (i2c->dev,"write RCV NACK error\n" ); +return -EIO ; + } + +if (msg->len ==0 ) { + val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE ; +writew (val, base +VIAI2C_REG_CR ); +return 0 ; + } + +if ((i2c->xfered_len +1 ) == msg->len) { +if (!i2c->last) +writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); + }else { +writew (msg->buf[i2c->xfered_len +1 ] &0xFF , base +VIAI2C_REG_CDR ); +writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); + } + } + + i2c->xfered_len++; + +return i2c->xfered_len == msg->len; +} +static irqreturn_t viai2c_isr (int irq,void *data) {struct viai2c *i2c = data; +u8 status;/* save the status and write-clear it */ - i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); -writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR ); + status =readw (i2c->base +VIAI2C_REG_ISR ); +writew (status, i2c->base +VIAI2C_REG_ISR ); + + i2c->ret =0 ; +if (status &VIAI2C_ISR_NACK_ADDR ) + i2c->ret = -EIO ; + +if (status &VIAI2C_ISR_SCL_TIMEOUT ) + i2c->ret = -ETIMEDOUT ; + +if (!i2c->ret) + i2c->ret =viai2c_irq_xfer (i2c); -complete (&i2c->complete); +if (i2c->ret) +complete (&i2c->complete);return IRQ_HANDLED ; }
drivers/i2c/busses/i2c-viai2c-common.h +4 -2
@@ -58,11 +58,13 @@ struct viai2c {struct clk *clk;u16 tcr;int irq; -u16 cmd_status; +u16 xfered_len; +struct i2c_msg *msg; +int ret; +bool last; };int viai2c_wait_bus_not_busy (struct viai2c *i2c); -int viai2c_check_status (struct viai2c *i2c);int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num);int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c);
Signature · 1 line
2.34.1
Re: [PATCH v8 4/6] i2c: wmt: fix a bug when thread blocked
Quoted 6 lines · Hans Hu
During each byte access, the host performs clock stretching.
To reduce the host performs clock stretching, move most of the per-msg processing to the interrupt context.
Signed-off-by Hans Hu <[email protected]>
I don't have the HW, so I can't review on register level. From a high level point of view, it matches my suggestion and looks good (one nit):
drivers/i2c/busses/i2c-viai2c-common.c int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) · line 141
Quoted 3 lines
drivers/i2c/busses/i2c-viai2c-common.c +3
-0+ val =readw (base +VIAI2C_REG_CSR ); +if (val &VIAI2C_CSR_RCV_NOT_ACK ) { +dev_dbg_ratelimited (i2c->dev,"write RCV NACK error\n" );
Even as a debug message, I think this should go. If NACK really is a problem depends on the client, so the error and messaging should not be handled at bus level.
PATCH v8 5/6 i2c: wmt: add platform type VIAI2C_PLAT_WMT
In reply to Hans HuEnumeration variables are added to differentiate
between different platforms.
--- drivers/i2c/busses/i2c-viai2c-common.c | 33 ++++++++++++++++---------- drivers/i2c/busses/i2c-viai2c-common.h | 7 +++++- drivers/i2c/busses/i2c-viai2c-wmt.c | 2 +- 3 files changed, 28 insertions(+), 14 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +21 -12
@@ -35,7 +35,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)writew (pmsg->buf[0 ] &0xFF , i2c->base +VIAI2C_REG_CDR ); } -if (!(pmsg->flags &I2C_M_NOSTART )) { +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) { val =readw (i2c->base +VIAI2C_REG_CR ); val &= ~VIAI2C_CR_TX_END ; val |=VIAI2C_CR_CPU_RDY ;
@@ -48,7 +48,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)writew (tcr_val, i2c->base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && pmsg->flags &I2C_M_NOSTART ) { val =readw (i2c->base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, i2c->base +VIAI2C_REG_CR );
@@ -67,7 +67,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg) val =readw (i2c->base +VIAI2C_REG_CR ); val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END ); -if (!(pmsg->flags &I2C_M_NOSTART )) +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 )
@@ -81,7 +81,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, i2c->base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) { val =readw (i2c->base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, i2c->base +VIAI2C_REG_CR );
@@ -102,7 +102,8 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i]; -if (!(pmsg->flags &I2C_M_NOSTART )) { +if ((i2c->platform ==VIAI2C_PLAT_WMT ) + && !(pmsg->flags &I2C_M_NOSTART )) { ret =viai2c_wait_bus_not_busy (i2c);if (ret <0 )return ret;
@@ -149,7 +150,7 @@ static int viai2c_irq_xfer(struct viai2c *i2c) }if ((i2c->xfered_len +1 ) == msg->len) { -if (!i2c->last) +if (i2c->platform ==VIAI2C_PLAT_WMT && !i2c->last)writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); }else {writew (msg->buf[i2c->xfered_len +1 ] &0xFF , base +VIAI2C_REG_CDR );
@@ -175,7 +176,7 @@ static irqreturn_t viai2c_isr(int irq, void *data)if (status &VIAI2C_ISR_NACK_ADDR ) i2c->ret = -EIO ; -if (status &VIAI2C_ISR_SCL_TIMEOUT ) +if (i2c->platform ==VIAI2C_PLAT_WMT && (status &VIAI2C_ISR_SCL_TIMEOUT )) i2c->ret = -ETIMEDOUT ;if (!i2c->ret)
@@ -187,9 +188,10 @@ static irqreturn_t viai2c_isr(int irq, void *data)return IRQ_HANDLED ; } -int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat) {int err; +int irq_flags;struct viai2c *i2c;struct device_node *np = pdev->dev.of_node;
@@ -201,12 +203,19 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c)if (IS_ERR (i2c->base))return PTR_ERR (i2c->base); - i2c->irq =irq_of_parse_and_map (np,0 ); -if (!i2c->irq) -return -EINVAL ; +if (plat ==VIAI2C_PLAT_WMT ) { + irq_flags =0 ; + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq) +return -EINVAL ; + }else { +return dev_err_probe (&pdev->dev, -EINVAL ,"wrong platform type\n" ); + } + + i2c->platform = plat; err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr, -0 , pdev->name, i2c); + irq_flags, pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err,"failed to request irq %i\n" , i2c->irq);
drivers/i2c/busses/i2c-viai2c-common.h +6 -1
@@ -50,6 +50,10 @@#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000)) +enum { +VIAI2C_PLAT_WMT , +}; +struct viai2c {struct i2c_adapter adapter;struct completion complete;
@@ -62,10 +66,11 @@ struct viai2c {struct i2c_msg *msg;int ret;bool last; + unsigned int platform; };int viai2c_wait_bus_not_busy (struct viai2c *i2c);int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num); -int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c); +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat);#endif
drivers/i2c/busses/i2c-viai2c-wmt.c +1 -1
@@ -80,7 +80,7 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - err =viai2c_init (pdev, &i2c); + err =viai2c_init (pdev, &i2c,VIAI2C_PLAT_WMT );if (err)return err;
Signature · 1 line
2.34.1
Re: [PATCH v8 5/6] i2c: wmt: add platform type VIAI2C_PLAT_WMT
Quoted 4 lines · Hans Hu
Enumeration variables are added to differentiate
between different platforms.Signed-off-by Hans Hu <[email protected]>
Just glimpsed it, looks OK:
PATCH v8 6/6 i2c: add zhaoxin i2c controller driver
In reply to Hans HuAdd Zhaoxin I2C controller driver. It provides the access to the i2c busses, which connects to the touchpad, eeprom, I2S, etc.
Zhaoxin I2C controller has two separate busses, so may accommodate up to two I2C adapters. Those adapters are listed in the ACPI namespace with the "IIC1D17" HID, and probed by a platform driver.
The driver works with IRQ mode, and supports basic I2C features. Flags I2C_AQ_NO_ZERO_LEN and I2C_AQ_COMB_WRITE_THEN_READ are used to limit the unsupported access.
--- MAINTAINERS | 8 + drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 31 ++- drivers/i2c/busses/i2c-viai2c-common.h | 9 + drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 299 ++++++++++++++++++++++++ 6 files changed, 354 insertions(+), 5 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-zhaoxin.c
MAINTAINERS +8 -0
@@ -10023,6 +10023,14 @@ L: [email protected] F: Documentation/i2c/busses/i2c-ismt.rst F: drivers/i2c/busses/i2c-ismt.c +I2C/SMBUS ZHAOXIN DRIVER +M: Hans Hu <[email protected]> +L: [email protected] +S: Maintained +W: https://www.zhaoxin.com +F: drivers/i2c/busses/i2c-viai2c-common.c +F: drivers/i2c/busses/i2c-viai2c-zhaoxin.c + I2C/SMBUS STUB DRIVER M: Jean Delvare <[email protected]> L: [email protected]
drivers/i2c/busses/Kconfig +10 -0
@@ -336,6 +336,16 @@ config I2C_VIAPRO if ACPI +config I2C_ZHAOXIN + tristate "Zhaoxin I2C Interface" + depends on PCI || COMPILE_TEST + help + If you say yes to this option, support will be included for the + ZHAOXIN I2C interface + + This driver can also be built as a module. If so, the module + will be called i2c-zhaoxin. + comment "ACPI drivers" config I2C_SCMI
drivers/i2c/busses/Makefile +2 -0
@@ -29,6 +29,8 @@ obj-$(CONFIG_I2C_SIS630) += i2c-sis630.o obj-$(CONFIG_I2C_SIS96X) += i2c-sis96x.o obj-$(CONFIG_I2C_VIA) += i2c-via.o obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o +i2c-zhaoxin-objs := i2c-viai2c-zhaoxin.o i2c-viai2c-common.o +obj-$(CONFIG_I2C_ZHAOXIN) += i2c-zhaoxin.o # Mac SMBus host controller drivers obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o
drivers/i2c/busses/i2c-viai2c-common.c +26 -5
@@ -60,7 +60,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)return i2c->ret; } -static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg,bool first) {u16 val, tcr_val = i2c->tcr;
@@ -81,7 +81,8 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, i2c->base +VIAI2C_REG_TCR ); -if (i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) { +if ((i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) + || (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && !first)) { val =readw (i2c->base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, i2c->base +VIAI2C_REG_CR );
@@ -100,6 +101,7 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)int ret =0 ;struct viai2c *i2c =i2c_get_adapdata (adap); + i2c->mode =VIAI2C_BYTE_MODE ;for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i]; if ((i2c->platform == VIAI2C_PLAT_WMT)
@@ -113,7 +115,7 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) i2c->xfered_len =0 ;if (pmsg->flags &I2C_M_RD ) - ret =viai2c_read (i2c, pmsg); + ret =viai2c_read (i2c, pmsg, i ==0 );else ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }
@@ -152,6 +154,8 @@ static int viai2c_irq_xfer(struct viai2c *i2c)if ((i2c->xfered_len +1 ) == msg->len) {if (i2c->platform ==VIAI2C_PLAT_WMT && !i2c->last)writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); +else if (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && i2c->last) +writeb (VIAI2C_CR_TX_END , base +VIAI2C_REG_CR ); }else {writew (msg->buf[i2c->xfered_len +1 ] &0xFF , base +VIAI2C_REG_CDR );writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR );
@@ -163,6 +167,11 @@ static int viai2c_irq_xfer(struct viai2c *i2c)return i2c->xfered_len == msg->len; } +int __weak viai2c_fifo_irq_xfer (struct viai2c *i2c,bool irq) +{ +return 0 ; +} +static irqreturn_t viai2c_isr (int irq,void *data) {struct viai2c *i2c = data;
@@ -170,6 +179,9 @@ static irqreturn_t viai2c_isr(int irq, void *data)/* save the status and write-clear it */ status =readw (i2c->base +VIAI2C_REG_ISR ); +if (!status && i2c->platform ==VIAI2C_PLAT_ZHAOXIN ) +return IRQ_NONE ; +writew (status, i2c->base +VIAI2C_REG_ISR ); i2c->ret =0 ;
@@ -179,8 +191,12 @@ static irqreturn_t viai2c_isr(int irq, void *data)if (i2c->platform ==VIAI2C_PLAT_WMT && (status &VIAI2C_ISR_SCL_TIMEOUT )) i2c->ret = -ETIMEDOUT ; -if (!i2c->ret) - i2c->ret =viai2c_irq_xfer (i2c); +if (!i2c->ret) { +if (i2c->mode ==VIAI2C_BYTE_MODE ) + i2c->ret =viai2c_irq_xfer (i2c); +else + i2c->ret =viai2c_fifo_irq_xfer (i2c, true); + }if (i2c->ret)complete (&i2c->complete);
@@ -208,6 +224,11 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c, int plat) i2c->irq =irq_of_parse_and_map (np,0 );if (!i2c->irq)return -EINVAL ; + }else if (plat ==VIAI2C_PLAT_ZHAOXIN ) { + irq_flags =IRQF_SHARED ; + i2c->irq =platform_get_irq (pdev,0 ); +if (i2c->irq <0 ) +return i2c->irq; }else {return dev_err_probe (&pdev->dev, -EINVAL ,"wrong platform type\n" ); }
drivers/i2c/busses/i2c-viai2c-common.h +9 -0
@@ -52,6 +52,12 @@enum {VIAI2C_PLAT_WMT , +VIAI2C_PLAT_ZHAOXIN +}; + +enum { +VIAI2C_BYTE_MODE , +VIAI2C_FIFO_MODE };struct viai2c {
@@ -66,11 +72,14 @@ struct viai2c {struct i2c_msg *msg;int ret;bool last; +unsigned int mode;unsigned int platform; + void *pltfm_priv; };int viai2c_wait_bus_not_busy (struct viai2c *i2c);int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num);int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat); +int viai2c_fifo_irq_xfer (struct viai2c *i2c,bool irq);#endif
drivers/i2c/busses/i2c-viai2c-zhaoxin.c new file +299 -0
299 lines not on this page · raw message
Signature · 1 line
2.34.1
Quoted 7 lines · Hans Hu
Add Zhaoxin I2C controller driver. It provides the access to the i2c busses, which connects to the touchpad, eeprom, I2S, etc.
Zhaoxin I2C controller has two separate busses, so may accommodate up to two I2C adapters. Those adapters are listed in the ACPI namespace with the "IIC1D17" HID, and probed by a platform driver.
Quoted 5 lines
The driver works with IRQ mode, and supports basic I2C features. Flags
I2C_AQ_NO_ZERO_LENandI2C_AQ_COMB_WRITE_THEN_READare used to limit the unsupported access.Signed-off-by Hans Hu <[email protected]>
Can't really say anything about the ACPI handling. Looks mostly good for my eyes.
drivers/i2c/busses/i2c-viai2c-zhaoxin.c line 217
Quoted 6 lines
drivers/i2c/busses/i2c-viai2c-zhaoxin.c new file +6
-0+/* +* if BIOS setting value far from golden value, +* use golden value and warn user +*/ +dev_warn (i2c->dev,"speed:%d, fstp:0x%x, golden:0x%x\n" , + params[0 ], fstp, params[2 ]);
Well, if you want to warn the user, the string should be more descriptive. Maybe "FW settings might cause wrong timings" or whatever these values mean. I don't know.
The issues I mentioned could be resolved incrementally from my point of view. Or with a new series. I don't mind. So, in general:
Andi Shyti
maintainerHi Hans,
...
Quoted 11 lines
drivers/i2c/busses/i2c-viai2c-zhaoxin.c line 217
Quoted 6 lines
drivers/i2c/busses/i2c-viai2c-zhaoxin.c new file +6
-0+/* +* if BIOS setting value far from golden value, +* use golden value and warn user +*/ +dev_warn (i2c->dev,"speed:%d, fstp:0x%x, golden:0x%x\n" , + params[0 ], fstp, params[2 ]);Well, if you want to warn the user, the string should be more descriptive. Maybe "FW settings might cause wrong timings" or whatever these values mean. I don't know.
Quoted 2 lines
The issues I mentioned could be resolved incrementally from my point of view. Or with a new series. I don't mind. So, in general:
Same goes for few minor checkpatch warnings.
I will accept incremental patches to fix them... they are mainly allignment issues.
Thanks,
Andi
Hi Wolfram and Andi,
Quoted 10 lines
Quoted 10 lines
drivers/i2c/busses/i2c-viai2c-zhaoxin.c line 217
Quoted 6 lines
drivers/i2c/busses/i2c-viai2c-zhaoxin.c new file +6
-0+/* +* if BIOS setting value far from golden value, +* use golden value and warn user +*/ +dev_warn (i2c->dev,"speed:%d, fstp:0x%x, golden:0x%x\n" , + params[0 ], fstp, params[2 ]);Well, if you want to warn the user, the string should be more descriptive. Maybe "FW settings might cause wrong timings" or whatever these values mean. I don't know.
Quoted 7 lines
Quoted 2 lines
The issues I mentioned could be resolved incrementally from my point of view. Or with a new series. I don't mind. So, in general:
Same goes for few minor checkpatch warnings.
I will accept incremental patches to fix them... they are mainly allignment issues.
OK, the issues you mentioned will be fixed with a new series. For the current series patch, do I need to push it to the latest for-next branch? Or will you push it?
Thanks,
Hans
Andi Shyti
maintainerHi Hans,
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/i2c/busses/i2c-viai2c-zhaoxin.c line 217
Quoted 6 lines
drivers/i2c/busses/i2c-viai2c-zhaoxin.c new file +6
-0+/* +* if BIOS setting value far from golden value, +* use golden value and warn user +*/ +dev_warn (i2c->dev,"speed:%d, fstp:0x%x, golden:0x%x\n" , + params[0 ], fstp, params[2 ]);Well, if you want to warn the user, the string should be more descriptive. Maybe "FW settings might cause wrong timings" or whatever these values mean. I don't know.
The issues I mentioned could be resolved incrementally from my point of view. Or with a new series. I don't mind. So, in general:
Quoted 7 lines
Quoted 5 lines
Same goes for few minor checkpatch warnings.
I will accept incremental patches to fix them... they are mainly allignment issues.
OK, the issues you mentioned will be fixed with a new series.
Thanks! Looking forward to receiving your new patches.
Quoted 2 lines
For the current series patch, do I need to push it to the latest for-next branch? Or will you push it?
I believe you can't push it :-)
I am taking care of it!
Andi
Hi,
Quoted 1 line
OK, the issues you mentioned will be fixed with a new series.
If you do this new series, please make sure you rebase it on top of Andi's for-next tree. He just applied a fix for wmt, namely:
"[PATCH] i2c: wmt: Fix an error handling path in wmt_i2c_probe()"
Your new series should be on top of this patch to avoid merge conflicts.
Happy hacking,
Wolfram
Andi Shyti
maintainerv9 cover i2c: add zhaoxin i2c controller driver
In reply to Hans HuHi Hans,
no functional change here, just fixed a rebase conflict. Patch 78c1dbed3652 ("i2c: wmt: Fix an error handling path in wmt_i2c_probe()") from Christophe Jaillet is a fix that has created some conflict with your series.
My work here is just to adapt your series to this change.
Check the changelog for more details. The little adaptation are limited to patch 1, 2 and 3. The other patches don't have any change.
The series has been applied in i2c/i2c-host-next[*].
Thanks,
Andi
PS I was almost tempted to fix the checkpatch notes, but we have a deal on that ;-)
PPS I'm keeping your e-mail structure and sending the series as reply to your PATCH 0 of v8.
[*] git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git
v8->v9:
* In Patch 1 in probe() do not return at the i2c_add_adapter(), but call clk_disable_unprepare()
in case of failure.
* In Patch 2 fix the conflict when i2c-wmt.c is removed.
* In Patch 2 in wmt_i2c_probe() function, call clk_disable_unprepare() in case of failure. While at it, add a comment to explain the reason.
* When renaming i2c_dev to i2c, change also the reference in clk_disable_unprepare().v7->v8:
* move per-msg handling to interrupt context
* add private struct viai2c_zhaoxin to handle zhaoxin specific things
* fixed some other formatting issues
v6->v7:
* adjust the patch sequence
* put those renaming related patches in 1 patch file
* rename i2c-*-plt.c to i2c-viai2c-*.c
* Some other adjustments suggested by Andi For more details, see the comment in each patch please.
v5->v6:
* fix build warnning reported by kernel test robot.
Link: https://lore.kernel.org/all/[email protected]/
Link: https://lore.kernel.org/all/[email protected]/v4->v5:
* fix 1 build error.
v3->v4:
* Some adjustments as suggested by Wolfram.
* rebase patch on top of for-next branch.
v2->v3:
* Split the number of patches from 2 to 12. Make it easier to review.
v1->v2:
* Fixed some bugs I found myself.
Old version:
This patch has already gone through a round of reviews. Compared with the first round, the main difference of this round of patch is the use of i2c-wmt driver.
Hans Hu (6):
i2c: wmt: create wmt_i2c_init for general init
i2c: wmt: split out common files
i2c: wmt: rename something
i2c: wmt: fix a bug when thread blocked
i2c: wmt: add platform type VIAI2C_PLAT_WMT
i2c: add zhaoxin i2c controller driver
MAINTAINERS | 10 +- drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 3 + drivers/i2c/busses/i2c-viai2c-common.c | 250 ++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 85 +++++ drivers/i2c/busses/i2c-viai2c-wmt.c | 148 +++++++++ drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 299 +++++++++++++++++ drivers/i2c/busses/i2c-wmt.c | 421 ------------------------ 8 files changed, 804 insertions(+), 422 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-viai2c-wmt.c create mode 100644 drivers/i2c/busses/i2c-viai2c-zhaoxin.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c
Signature · 1 line
2.43.0
Andi Shyti
maintainerPATCH v9 1/6 i2c: wmt: create wmt_i2c_init for general init
From: Hans Hu <[email protected]>
Some common initialization actions are put in the function wmt_i2c_init(), which is convenient to share with zhaoxin.
--- drivers/i2c/busses/i2c-wmt.c | 61 +++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 26 deletions(-)
drivers/i2c/busses/i2c-wmt.c +35 -26
@@ -286,6 +286,38 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)return IRQ_HANDLED ; } +static int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +{ +int err; +struct wmt_i2c_dev *i2c_dev; +struct device_node *np = pdev->dev.of_node; + + i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); +if (!i2c_dev) +return -ENOMEM ; + + i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c_dev->base)) +return PTR_ERR (i2c_dev->base); + + i2c_dev->irq =irq_of_parse_and_map (np,0 ); +if (!i2c_dev->irq) +return -EINVAL ; + + err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, +0 , pdev->name, i2c_dev); +if (err) +return dev_err_probe (&pdev->dev, err, +"failed to request irq %i\n" , i2c_dev->irq); + + i2c_dev->dev = &pdev->dev; +init_completion (&i2c_dev->complete); +platform_set_drvdata (pdev, i2c_dev); + + *pi2c_dev = i2c_dev; +return 0 ; +} +static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) {int err;
@@ -327,19 +359,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) -return -ENOMEM ; - - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); - - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) { -dev_err (&pdev->dev,"irq missing or invalid\n" ); -return -EINVAL ; - } + err =wmt_i2c_init (pdev, &i2c_dev); +if (err) +return err; i2c_dev->clk =of_clk_get (np,0 );if (IS_ERR (i2c_dev->clk)) {
@@ -351,15 +373,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) i2c_dev->tcr =TCR_FAST_MODE ; - i2c_dev->dev = &pdev->dev; - - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr,0 , -"i2c" , i2c_dev); -if (err) { -dev_err (&pdev->dev,"failed to request irq %i\n" , i2c_dev->irq); -return err; - } - adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name));
@@ -368,8 +381,6 @@ static int wmt_i2c_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; -init_completion (&i2c_dev->complete); - err =wmt_i2c_reset_hardware (i2c_dev);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );
@@ -380,8 +391,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)if (err) goto err_disable_clk; -platform_set_drvdata (pdev, i2c_dev); -return 0 ; err_disable_clk:
Signature · 1 line
2.43.0
Andi Shyti
maintainerPATCH v9 2/6 i2c: wmt: split out common files
In reply to Andi ShytiFrom: Hans Hu <[email protected]>
Since the I2C IP of both wmt and zhaoxin originates from VIA, it is better to separate the common code first.
The common driver is named as i2c-viai2c-common.c. Old i2c-wmt.c renamed to i2c-viai2c-wmt.c.
The MAINTAINERS file will be updated accordingly in upcoming commits.
--- MAINTAINERS | 2 +- drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-viai2c-common.c | 221 +++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 71 ++++ drivers/i2c/busses/i2c-viai2c-wmt.c | 148 +++++++++ drivers/i2c/busses/i2c-wmt.c | 430 ------------------------- 6 files changed, 442 insertions(+), 431 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-viai2c-wmt.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c
MAINTAINERS +1 -1
@@ -2993,7 +2993,7 @@ S: Orphan F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt F: arch/arm/mach-vt8500/ F: drivers/clocksource/timer-vt8500.c -F: drivers/i2c/busses/i2c-wmt.c +F: drivers/i2c/busses/i2c-viai2c-wmt.c F: drivers/mmc/host/wmt-sdmmc.c F: drivers/pwm/pwm-vt8500.c F: drivers/rtc/rtc-vt8500.c
drivers/i2c/busses/Makefile +1 -0
@@ -118,6 +118,7 @@ obj-$(CONFIG_I2C_TEGRA_BPMP) += i2c-tegra-bpmp.o obj-$(CONFIG_I2C_UNIPHIER) += i2c-uniphier.o obj-$(CONFIG_I2C_UNIPHIER_F) += i2c-uniphier-f.o obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o +i2c-wmt-objs := i2c-viai2c-wmt.o i2c-viai2c-common.o obj-$(CONFIG_I2C_WMT) += i2c-wmt.o i2c-octeon-objs := i2c-octeon-core.o i2c-octeon-platdrv.o obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o
drivers/i2c/busses/i2c-viai2c-common.c new file +221 -0
221 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-common.h new file +71 -0
71 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-wmt.c new file +148 -0
148 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt.c deleted +0 -430
430 lines not on this page · raw message
Signature · 1 line
2.43.0
Andi Shyti
maintainerPATCH v9 3/6 i2c: wmt: rename something
In reply to Andi ShytiFrom: Hans Hu <[email protected]>
1. The I2C IP for both wmt and zhaoxin originates from VIA. Rename common registers, functions, and variable names to follow the VIAI2C_ and viai2c_ naming conventions for consistency and clarity.
2. rename i2c_dev to i2c, to shorten the length of a line.
3. rename wait_result to time_left, make it better to reflect the meaning of the value returned by wait_for_completion_timeout().
4. remove TCR_MASTER_WRITE, its value is 0.
--- drivers/i2c/busses/i2c-viai2c-common.c | 156 ++++++++++++------------- drivers/i2c/busses/i2c-viai2c-common.h | 70 ++++++----- drivers/i2c/busses/i2c-viai2c-wmt.c | 62 +++++----- 3 files changed, 143 insertions(+), 145 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +78 -78
@@ -2,14 +2,14 @@#include <linux/of_irq.h> #include "i2c-viai2c-common.h" -int wmt_i2c_wait_bus_not_busy (struct wmt_i2c_dev *i2c_dev) +int viai2c_wait_bus_not_busy (struct viai2c *i2c) {unsigned long timeout; - timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +REG_CSR ) &CSR_READY_MASK )) { + timeout = jiffies +VIAI2C_TIMEOUT ; +while (!(readw (i2c->base +VIAI2C_REG_CSR ) &VIAI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) { -dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" ); +dev_warn (i2c->dev,"timeout waiting for bus ready\n" );return -EBUSY ; }msleep (20 );
@@ -18,28 +18,28 @@ int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)return 0 ; } -int wmt_check_status (struct wmt_i2c_dev *i2c_dev) +int viai2c_check_status (struct viai2c *i2c) {int ret =0 ; -unsigned long wait_result; +unsigned long time_left; - wait_result =wait_for_completion_timeout (&i2c_dev->complete, + time_left =wait_for_completion_timeout (&i2c->complete,msecs_to_jiffies (500 )); -if (!wait_result) +if (!time_left)return -ETIMEDOUT ; -if (i2c_dev->cmd_status &ISR_NACK_ADDR ) +if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c_dev->cmd_status &ISR_SCL_TIMEOUT ) +if (i2c->cmd_status &VIAI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret; } -static int wmt_i2c_write (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg,int last) +static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,int last) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;int xfer_len =0 ;
@@ -49,173 +49,173 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg, int* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , i2c_dev->base +REG_CDR ); +writew (0 , i2c->base +VIAI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , i2c->base +VIAI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +REG_CR ); - val &= ~CR_TX_END ; - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val &= ~VIAI2C_CR_TX_END ; + val |=VIAI2C_CR_CPU_RDY ; +writew (val, i2c->base +VIAI2C_REG_CR ); } -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |= (TCR_MASTER_WRITE | (pmsg->addr &TCR_SLAVE_ADDR_MASK )); + tcr_val |= pmsg->addr &VIAI2C_TCR_ADDR_MASK ; -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c->base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, i2c->base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =viai2c_check_status (i2c);if (ret)return ret; xfer_len++; - val =readw (i2c_dev->base +REG_CSR ); -if ((val &CSR_RCV_ACK_MASK ) ==CSR_RCV_NOT_ACK ) { -dev_dbg (i2c_dev->dev,"write RCV NACK error\n" ); + val =readw (i2c->base +VIAI2C_REG_CSR ); +if (val &VIAI2C_CSR_RCV_NOT_ACK ) { +dev_dbg (i2c->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =CR_TX_END |CR_CPU_RDY |CR_ENABLE ; -writew (val, i2c_dev->base +REG_CR ); + val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE ; +writew (val, i2c->base +VIAI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (CR_ENABLE , i2c_dev->base +REG_CR ); +writew (VIAI2C_CR_ENABLE , i2c->base +VIAI2C_REG_CR ); }else { -writew (pmsg->buf[xfer_len] &0xFF , i2c_dev->base + -REG_CDR ); -writew (CR_CPU_RDY |CR_ENABLE , i2c_dev->base +REG_CR ); +writew (pmsg->buf[xfer_len] &0xFF , i2c->base +VIAI2C_REG_CDR ); +writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , + i2c->base +VIAI2C_REG_CR ); } }return 0 ; } -static int wmt_i2c_read (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;u32 xfer_len =0 ; - val =readw (i2c_dev->base +REG_CR ); - val &= ~(CR_TX_END |CR_TX_NEXT_NO_ACK ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END );if (!(pmsg->flags &I2C_M_NOSTART )) - val |=CR_CPU_RDY ; + val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 ) - val |=CR_TX_NEXT_NO_ACK ; + val |=VIAI2C_CR_RX_END ; -writew (val, i2c_dev->base +REG_CR ); +writew (val, i2c->base +VIAI2C_REG_CR ); -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |=TCR_MASTER_READ | (pmsg->addr &TCR_SLAVE_ADDR_MASK ); + tcr_val |=VIAI2C_TCR_READ | (pmsg->addr &VIAI2C_TCR_ADDR_MASK ); -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c->base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, i2c->base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =viai2c_check_status (i2c);if (ret)return ret; - pmsg->buf[xfer_len] =readw (i2c_dev->base +REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (i2c->base +VIAI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (i2c_dev->base +REG_CR ) |CR_CPU_RDY ; + val =readw (i2c->base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) - val |=CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); + val |=VIAI2C_CR_RX_END ; +writew (val, i2c->base +VIAI2C_REG_CR ); }return 0 ; } -int wmt_i2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num) +int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num) {struct i2c_msg *pmsg;int i;int ret =0 ; -struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap); +struct viai2c *i2c =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c_dev); + ret =viai2c_wait_bus_not_busy (i2c);if (ret <0 )return ret; }if (pmsg->flags &I2C_M_RD ) - ret =wmt_i2c_read (i2c_dev, pmsg); + ret =viai2c_read (i2c, pmsg);else - ret =wmt_i2c_write (i2c_dev, pmsg, (i +1 ) == num); + ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }return (ret <0 ) ? ret : i; } -static irqreturn_t wmt_i2c_isr (int irq,void *data) +static irqreturn_t viai2c_isr (int irq,void *data) { -struct wmt_i2c_dev *i2c_dev = data; +struct viai2c *i2c = data;/* save the status and write-clear it */ - i2c_dev->cmd_status =readw (i2c_dev->base +REG_ISR ); -writew (i2c_dev->cmd_status, i2c_dev->base +REG_ISR ); + i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR ); -complete (&i2c_dev->complete); +complete (&i2c->complete);return IRQ_HANDLED ; } -int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) {int err; -struct wmt_i2c_dev *i2c_dev; +struct viai2c *i2c;struct device_node *np = pdev->dev.of_node; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) + i2c =devm_kzalloc (&pdev->dev,sizeof (*i2c),GFP_KERNEL ); +if (!i2c)return -ENOMEM ; - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); + i2c->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c->base)) +return PTR_ERR (i2c->base); - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq)return -EINVAL ; - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, -0 , pdev->name, i2c_dev); + err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr, +0 , pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err, -"failed to request irq %i\n" , i2c_dev->irq); +"failed to request irq %i\n" , i2c->irq); - i2c_dev->dev = &pdev->dev; -init_completion (&i2c_dev->complete); -platform_set_drvdata (pdev, i2c_dev); + i2c->dev = &pdev->dev; +init_completion (&i2c->complete); +platform_set_drvdata (pdev, i2c); - *pi2c_dev = i2c_dev; + *pi2c = i2c;return 0 ; }
drivers/i2c/busses/i2c-viai2c-common.h +34 -36
91 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-wmt.c +31 -31
123 lines not on this page · raw message
Signature · 1 line
2.43.0
Andi Shyti
maintainerPATCH v9 4/6 i2c: wmt: fix a bug when thread blocked
In reply to Andi ShytiFrom: Hans Hu <[email protected]>
During each byte access, the host performs clock stretching.
To reduce the host performs clock stretching, move most of the per-msg processing to the interrupt context.
--- drivers/i2c/busses/i2c-viai2c-common.c | 139 ++++++++++++------------- drivers/i2c/busses/i2c-viai2c-common.h | 6 +- 2 files changed, 73 insertions(+), 72 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +69 -70
@@ -18,37 +18,18 @@ int viai2c_wait_bus_not_busy(struct viai2c *i2c)return 0 ; } -int viai2c_check_status (struct viai2c *i2c) -{ -int ret =0 ; -unsigned long time_left; - - time_left =wait_for_completion_timeout (&i2c->complete, -msecs_to_jiffies (500 )); -if (!time_left) -return -ETIMEDOUT ; - -if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) - ret = -EIO ; - -if (i2c->cmd_status &VIAI2C_ISR_SCL_TIMEOUT ) - ret = -ETIMEDOUT ; - -return ret; -} -static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,int last) {u16 val, tcr_val = i2c->tcr; -int ret; -int xfer_len =0 ; + + i2c->last = last;if (pmsg->len ==0 ) {/* * We still need to run through the while (..) once, so * start at -1 and break out early from the loop */ - xfer_len =-1 ; + i2c->xfered_len =-1 ;writew (0 , i2c->base +VIAI2C_REG_CDR ); }else {writew (pmsg->buf[0 ] &0xFF , i2c->base +VIAI2C_REG_CDR );
@@ -73,43 +54,15 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)writew (val, i2c->base +VIAI2C_REG_CR ); } -while (xfer_len < pmsg->len) { - ret =viai2c_check_status (i2c); -if (ret) -return ret; - - xfer_len++; - - val =readw (i2c->base +VIAI2C_REG_CSR ); -if (val &VIAI2C_CSR_RCV_NOT_ACK ) { -dev_dbg (i2c->dev,"write RCV NACK error\n" ); -return -EIO ; - } - -if (pmsg->len ==0 ) { - val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE ; -writew (val, i2c->base +VIAI2C_REG_CR ); -break ; - } - -if (xfer_len == pmsg->len) { -if (last !=1 ) -writew (VIAI2C_CR_ENABLE , i2c->base +VIAI2C_REG_CR ); - }else { -writew (pmsg->buf[xfer_len] &0xFF , i2c->base +VIAI2C_REG_CDR ); -writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , - i2c->base +VIAI2C_REG_CR ); - } - } +if (!wait_for_completion_timeout (&i2c->complete,VIAI2C_TIMEOUT )) +return -ETIMEDOUT ; -return 0 ; +return i2c->ret; }static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) {u16 val, tcr_val = i2c->tcr; -int ret; -u32 xfer_len =0 ; val =readw (i2c->base +VIAI2C_REG_CR ); val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END );
@@ -134,21 +87,10 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (val, i2c->base +VIAI2C_REG_CR ); } -while (xfer_len < pmsg->len) { - ret =viai2c_check_status (i2c); -if (ret) -return ret; - - pmsg->buf[xfer_len] =readw (i2c->base +VIAI2C_REG_CDR ) >>8 ; - xfer_len++; - - val =readw (i2c->base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ; -if (xfer_len == pmsg->len -1 ) - val |=VIAI2C_CR_RX_END ; -writew (val, i2c->base +VIAI2C_REG_CR ); - } +if (!wait_for_completion_timeout (&i2c->complete,VIAI2C_TIMEOUT )) +return -ETIMEDOUT ; -return 0 ; +return i2c->ret; }int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num)
@@ -166,6 +108,9 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)return ret; } + i2c->msg = pmsg; + i2c->xfered_len =0 ; +if (pmsg->flags &I2C_M_RD ) ret =viai2c_read (i2c, pmsg);else
@@ -175,15 +120,69 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)return (ret <0 ) ? ret : i; } +static int viai2c_irq_xfer (struct viai2c *i2c) +{ +u16 val; +struct i2c_msg *msg = i2c->msg; +u8 read = msg->flags &I2C_M_RD ; +void __iomem *base = i2c->base; + +if (read) { + msg->buf[i2c->xfered_len] =readw (base +VIAI2C_REG_CDR ) >>8 ; + + val =readw (base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ; +if (i2c->xfered_len == msg->len -2 ) + val |=VIAI2C_CR_RX_END ; +writew (val, base +VIAI2C_REG_CR ); + }else { + + val =readw (base +VIAI2C_REG_CSR ); +if (val &VIAI2C_CSR_RCV_NOT_ACK ) { +dev_dbg_ratelimited (i2c->dev,"write RCV NACK error\n" ); +return -EIO ; + } + +if (msg->len ==0 ) { + val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE ; +writew (val, base +VIAI2C_REG_CR ); +return 0 ; + } + +if ((i2c->xfered_len +1 ) == msg->len) { +if (!i2c->last) +writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); + }else { +writew (msg->buf[i2c->xfered_len +1 ] &0xFF , base +VIAI2C_REG_CDR ); +writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); + } + } + + i2c->xfered_len++; + +return i2c->xfered_len == msg->len; +} +static irqreturn_t viai2c_isr (int irq,void *data) {struct viai2c *i2c = data; +u8 status;/* save the status and write-clear it */ - i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); -writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR ); + status =readw (i2c->base +VIAI2C_REG_ISR ); +writew (status, i2c->base +VIAI2C_REG_ISR ); + + i2c->ret =0 ; +if (status &VIAI2C_ISR_NACK_ADDR ) + i2c->ret = -EIO ; + +if (status &VIAI2C_ISR_SCL_TIMEOUT ) + i2c->ret = -ETIMEDOUT ; + +if (!i2c->ret) + i2c->ret =viai2c_irq_xfer (i2c); -complete (&i2c->complete); +if (i2c->ret) +complete (&i2c->complete);return IRQ_HANDLED ; }
drivers/i2c/busses/i2c-viai2c-common.h +4 -2
@@ -58,11 +58,13 @@ struct viai2c {struct clk *clk;u16 tcr;int irq; -u16 cmd_status; +u16 xfered_len; +struct i2c_msg *msg; +int ret; +bool last; };int viai2c_wait_bus_not_busy (struct viai2c *i2c); -int viai2c_check_status (struct viai2c *i2c);int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num);int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c);
Signature · 1 line
2.43.0
Andi Shyti
maintainerPATCH v9 5/6 i2c: wmt: add platform type VIAI2C_PLAT_WMT
In reply to Andi ShytiFrom: Hans Hu <[email protected]>
Enumeration variables are added to differentiate
between different platforms.
--- drivers/i2c/busses/i2c-viai2c-common.c | 33 ++++++++++++++++---------- drivers/i2c/busses/i2c-viai2c-common.h | 7 +++++- drivers/i2c/busses/i2c-viai2c-wmt.c | 2 +- 3 files changed, 28 insertions(+), 14 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +21 -12
@@ -35,7 +35,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)writew (pmsg->buf[0 ] &0xFF , i2c->base +VIAI2C_REG_CDR ); } -if (!(pmsg->flags &I2C_M_NOSTART )) { +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) { val =readw (i2c->base +VIAI2C_REG_CR ); val &= ~VIAI2C_CR_TX_END ; val |=VIAI2C_CR_CPU_RDY ;
@@ -48,7 +48,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)writew (tcr_val, i2c->base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && pmsg->flags &I2C_M_NOSTART ) { val =readw (i2c->base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, i2c->base +VIAI2C_REG_CR );
@@ -67,7 +67,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg) val =readw (i2c->base +VIAI2C_REG_CR ); val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END ); -if (!(pmsg->flags &I2C_M_NOSTART )) +if (i2c->platform ==VIAI2C_PLAT_WMT && !(pmsg->flags &I2C_M_NOSTART )) val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 )
@@ -81,7 +81,7 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, i2c->base +VIAI2C_REG_TCR ); -if (pmsg->flags &I2C_M_NOSTART ) { +if (i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) { val =readw (i2c->base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, i2c->base +VIAI2C_REG_CR );
@@ -102,7 +102,8 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i]; -if (!(pmsg->flags &I2C_M_NOSTART )) { +if ((i2c->platform ==VIAI2C_PLAT_WMT ) + && !(pmsg->flags &I2C_M_NOSTART )) { ret =viai2c_wait_bus_not_busy (i2c);if (ret <0 )return ret;
@@ -149,7 +150,7 @@ static int viai2c_irq_xfer(struct viai2c *i2c) }if ((i2c->xfered_len +1 ) == msg->len) { -if (!i2c->last) +if (i2c->platform ==VIAI2C_PLAT_WMT && !i2c->last)writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); }else {writew (msg->buf[i2c->xfered_len +1 ] &0xFF , base +VIAI2C_REG_CDR );
@@ -175,7 +176,7 @@ static irqreturn_t viai2c_isr(int irq, void *data)if (status &VIAI2C_ISR_NACK_ADDR ) i2c->ret = -EIO ; -if (status &VIAI2C_ISR_SCL_TIMEOUT ) +if (i2c->platform ==VIAI2C_PLAT_WMT && (status &VIAI2C_ISR_SCL_TIMEOUT )) i2c->ret = -ETIMEDOUT ;if (!i2c->ret)
@@ -187,9 +188,10 @@ static irqreturn_t viai2c_isr(int irq, void *data)return IRQ_HANDLED ; } -int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat) {int err; +int irq_flags;struct viai2c *i2c;struct device_node *np = pdev->dev.of_node;
@@ -201,12 +203,19 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c)if (IS_ERR (i2c->base))return PTR_ERR (i2c->base); - i2c->irq =irq_of_parse_and_map (np,0 ); -if (!i2c->irq) -return -EINVAL ; +if (plat ==VIAI2C_PLAT_WMT ) { + irq_flags =0 ; + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq) +return -EINVAL ; + }else { +return dev_err_probe (&pdev->dev, -EINVAL ,"wrong platform type\n" ); + } + + i2c->platform = plat; err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr, -0 , pdev->name, i2c); + irq_flags, pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err,"failed to request irq %i\n" , i2c->irq);
drivers/i2c/busses/i2c-viai2c-common.h +6 -1
@@ -50,6 +50,10 @@#define VIAI2C_TIMEOUT (msecs_to_jiffies(1000)) +enum { +VIAI2C_PLAT_WMT , +}; +struct viai2c {struct i2c_adapter adapter;struct completion complete;
@@ -62,10 +66,11 @@ struct viai2c {struct i2c_msg *msg;int ret;bool last; + unsigned int platform; };int viai2c_wait_bus_not_busy (struct viai2c *i2c);int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num); -int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c); +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat);#endif
drivers/i2c/busses/i2c-viai2c-wmt.c +1 -1
@@ -80,7 +80,7 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - err =viai2c_init (pdev, &i2c); + err =viai2c_init (pdev, &i2c,VIAI2C_PLAT_WMT );if (err)return err;
Signature · 1 line
2.43.0
Andi Shyti
maintainerPATCH v9 6/6 i2c: add zhaoxin i2c controller driver
In reply to Andi ShytiFrom: Hans Hu <[email protected]>
Add Zhaoxin I2C controller driver. It provides the access to the i2c busses, which connects to the touchpad, eeprom, I2S, etc.
Zhaoxin I2C controller has two separate busses, so may accommodate up to two I2C adapters. Those adapters are listed in the ACPI namespace with the "IIC1D17" HID, and probed by a platform driver.
The driver works with IRQ mode, and supports basic I2C features. Flags I2C_AQ_NO_ZERO_LEN and I2C_AQ_COMB_WRITE_THEN_READ are used to limit the unsupported access.
--- MAINTAINERS | 8 + drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-viai2c-common.c | 31 ++- drivers/i2c/busses/i2c-viai2c-common.h | 9 + drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 299 ++++++++++++++++++++++++ 6 files changed, 354 insertions(+), 5 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-zhaoxin.c
MAINTAINERS +8 -0
@@ -10158,6 +10158,14 @@ L: [email protected] F: Documentation/i2c/busses/i2c-ismt.rst F: drivers/i2c/busses/i2c-ismt.c +I2C/SMBUS ZHAOXIN DRIVER +M: Hans Hu <[email protected]> +L: [email protected] +S: Maintained +W: https://www.zhaoxin.com +F: drivers/i2c/busses/i2c-viai2c-common.c +F: drivers/i2c/busses/i2c-viai2c-zhaoxin.c + I2C/SMBUS STUB DRIVER M: Jean Delvare <[email protected]> L: [email protected]
drivers/i2c/busses/Kconfig +10 -0
@@ -336,6 +336,16 @@ config I2C_VIAPRO if ACPI +config I2C_ZHAOXIN + tristate "Zhaoxin I2C Interface" + depends on PCI || COMPILE_TEST + help + If you say yes to this option, support will be included for the + ZHAOXIN I2C interface + + This driver can also be built as a module. If so, the module + will be called i2c-zhaoxin. + comment "ACPI drivers" config I2C_SCMI
drivers/i2c/busses/Makefile +2 -0
@@ -29,6 +29,8 @@ obj-$(CONFIG_I2C_SIS630) += i2c-sis630.o obj-$(CONFIG_I2C_SIS96X) += i2c-sis96x.o obj-$(CONFIG_I2C_VIA) += i2c-via.o obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o +i2c-zhaoxin-objs := i2c-viai2c-zhaoxin.o i2c-viai2c-common.o +obj-$(CONFIG_I2C_ZHAOXIN) += i2c-zhaoxin.o # Mac SMBus host controller drivers obj-$(CONFIG_I2C_HYDRA) += i2c-hydra.o
drivers/i2c/busses/i2c-viai2c-common.c +26 -5
@@ -60,7 +60,7 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)return i2c->ret; } -static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg,bool first) {u16 val, tcr_val = i2c->tcr;
@@ -81,7 +81,8 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (tcr_val, i2c->base +VIAI2C_REG_TCR ); -if (i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) { +if ((i2c->platform ==VIAI2C_PLAT_WMT && (pmsg->flags &I2C_M_NOSTART )) + || (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && !first)) { val =readw (i2c->base +VIAI2C_REG_CR ); val |=VIAI2C_CR_CPU_RDY ;writew (val, i2c->base +VIAI2C_REG_CR );
@@ -100,6 +101,7 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)int ret =0 ;struct viai2c *i2c =i2c_get_adapdata (adap); + i2c->mode =VIAI2C_BYTE_MODE ;for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i]; if ((i2c->platform == VIAI2C_PLAT_WMT)
@@ -113,7 +115,7 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) i2c->xfered_len =0 ;if (pmsg->flags &I2C_M_RD ) - ret =viai2c_read (i2c, pmsg); + ret =viai2c_read (i2c, pmsg, i ==0 );else ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }
@@ -152,6 +154,8 @@ static int viai2c_irq_xfer(struct viai2c *i2c)if ((i2c->xfered_len +1 ) == msg->len) {if (i2c->platform ==VIAI2C_PLAT_WMT && !i2c->last)writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); +else if (i2c->platform ==VIAI2C_PLAT_ZHAOXIN && i2c->last) +writeb (VIAI2C_CR_TX_END , base +VIAI2C_REG_CR ); }else {writew (msg->buf[i2c->xfered_len +1 ] &0xFF , base +VIAI2C_REG_CDR );writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR );
@@ -163,6 +167,11 @@ static int viai2c_irq_xfer(struct viai2c *i2c)return i2c->xfered_len == msg->len; } +int __weak viai2c_fifo_irq_xfer (struct viai2c *i2c,bool irq) +{ +return 0 ; +} +static irqreturn_t viai2c_isr (int irq,void *data) {struct viai2c *i2c = data;
@@ -170,6 +179,9 @@ static irqreturn_t viai2c_isr(int irq, void *data)/* save the status and write-clear it */ status =readw (i2c->base +VIAI2C_REG_ISR ); +if (!status && i2c->platform ==VIAI2C_PLAT_ZHAOXIN ) +return IRQ_NONE ; +writew (status, i2c->base +VIAI2C_REG_ISR ); i2c->ret =0 ;
@@ -179,8 +191,12 @@ static irqreturn_t viai2c_isr(int irq, void *data)if (i2c->platform ==VIAI2C_PLAT_WMT && (status &VIAI2C_ISR_SCL_TIMEOUT )) i2c->ret = -ETIMEDOUT ; -if (!i2c->ret) - i2c->ret =viai2c_irq_xfer (i2c); +if (!i2c->ret) { +if (i2c->mode ==VIAI2C_BYTE_MODE ) + i2c->ret =viai2c_irq_xfer (i2c); +else + i2c->ret =viai2c_fifo_irq_xfer (i2c, true); + }if (i2c->ret)complete (&i2c->complete);
@@ -208,6 +224,11 @@ int viai2c_init(struct platform_device *pdev, struct viai2c **pi2c, int plat) i2c->irq =irq_of_parse_and_map (np,0 );if (!i2c->irq)return -EINVAL ; + }else if (plat ==VIAI2C_PLAT_ZHAOXIN ) { + irq_flags =IRQF_SHARED ; + i2c->irq =platform_get_irq (pdev,0 ); +if (i2c->irq <0 ) +return i2c->irq; }else {return dev_err_probe (&pdev->dev, -EINVAL ,"wrong platform type\n" ); }
drivers/i2c/busses/i2c-viai2c-common.h +9 -0
@@ -52,6 +52,12 @@enum {VIAI2C_PLAT_WMT , +VIAI2C_PLAT_ZHAOXIN +}; + +enum { +VIAI2C_BYTE_MODE , +VIAI2C_FIFO_MODE };struct viai2c {
@@ -66,11 +72,14 @@ struct viai2c {struct i2c_msg *msg;int ret;bool last; +unsigned int mode;unsigned int platform; + void *pltfm_priv; };int viai2c_wait_bus_not_busy (struct viai2c *i2c);int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num);int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c,int plat); +int viai2c_fifo_irq_xfer (struct viai2c *i2c,bool irq);#endif
drivers/i2c/busses/i2c-viai2c-zhaoxin.c new file +299 -0
299 lines not on this page · raw message
Signature · 1 line
2.43.0
Hi Andi,
Quoted 5 lines
Check the changelog for more details. The little adaptation are limited to patch 1, 2 and 3. The other patches don't have any change.
The series has been applied in i2c/i2c-host-next[*].
V9 does not appear to have been applied in i2c/i2c-host-next[*]. So, should I submit a v10 version? which its structure is: * patch 0-6 is consistent with v9. * patch 7 is new to fix issues as you mentioned before Thanks, Hans
Andi Shyti
maintainerHi Hans,
Quoted 9 lines
Quoted 5 lines
Check the changelog for more details. The little adaptation are limited to patch 1, 2 and 3. The other patches don't have any change.
The series has been applied in i2c/i2c-host-next[*].
V9 does not appear to have been applied in i2c/i2c-host-next[*]. So, should I submit a v10 version? which its structure is: * patch 0-6 is consistent with v9. * patch 7 is new to fix issues as you mentioned before Thanks, Hans
I'm sorry, I forgot to push :-(
Please, check now.
Andi
Andi Shyti
maintainerHi Hans,
Quoted 9 lines · Hans Hu
Quoted 5 lines
Check the changelog for more details. The little adaptation are limited to patch 1, 2 and 3. The other patches don't have any change.
The series has been applied in i2c/i2c-host-next[*].
V9 does not appear to have been applied in i2c/i2c-host-next[*]. So, should I submit a v10 version? which its structure is: * patch 0-6 is consistent with v9. * patch 7 is new to fix issues as you mentioned before Thanks, Hans
I just want to make sure that we have an understanding on this series.
Now that the 6.9 merge window is well over, are you planning to resend this series?
Thanks,
Andi
Hi Andi,
Quoted 8 lines
Hi Hans,
Quoted 5 lines · Hans Hu
Quoted 5 lines
Check the changelog for more details. The little adaptation are limited to patch 1, 2 and 3. The other patches don't have any change.
The series has been applied in i2c/i2c-host-next[*].
Quoted 8 lines
Quoted 3 lines
V9 does not appear to have been applied in i2c/i2c-host-next[*]. So, should I submit a v10 version? which its structure is: * patch 0-6 is consistent with v9. * patch 7 is new to fix issues as you mentioned before Thanks, Hans
I just want to make sure that we have an understanding on this series.
Now that the 6.9 merge window is well over, are you planning to resend this series?
Yes, I will submit the v10 patch based on the latest i2c/i2c-host-next[*].
Thanks,
Hans
v10 cover i2c: add zhaoxin i2c controller driver
In reply to Andi Shytiv9->v10:
* fixed style issues that were checked out by checkpatch.pl.
* In Patch 3 in wmt_i2c_write() function, deleted the log when received nack.
* In Patch 4 in viai2c_irq_xfer() function, return 1 for I2C_SMBUS_QUICK access.
* In Patch 6 in zxi2c_get_bus_speed() function, adjusted the log when firmware gives inappropriate parameters.
v8->v9:
* In Patch 1 in probe() do not return at the i2c_add_adapter(), but call clk_disable_unprepare() in case of failure.
* In Patch 2 fix the conflict when i2c-wmt.c is removed.
* In Patch 2 in wmt_i2c_probe() function, call clk_disable_unprepare() in case of failure. While at it, add a comment to explain the reason.
* When renaming i2c_dev to i2c, change also the reference in clk_disable_unprepare().
v7->v8:
* move per-msg handling to interrupt context
* add private struct viai2c_zhaoxin to handle zhaoxin specific things
* fixed some other formatting issues
v6->v7:
* adjust the patch sequence
* put those renaming related patches in 1 patch file
* rename i2c-*-plt.c to i2c-viai2c-*.c
* Some other adjustments suggested by Andi For more details, see the comment in each patch please.
v5->v6:
* fix build warnning reported by kernel test robot. Link: https://lore.kernel.org/all/[email protected]/ Link: https://lore.kernel.org/all/[email protected]/
v4->v5:
* fix 1 build error. Link: https://lore.kernel.org/all/ZYx0VPVmyQhtG+B9@shikoro/1-a.txt Link: https://lore.kernel.org/all/[email protected]/
v3->v4:
* Some adjustments as suggested by Wolfram.
* rebase patch on top of for-next branch.
v2->v3:
* Split the number of patches from 2 to 12. Make it easier to review. Link: https://lore.kernel.org/all/[email protected]/
v1->v2:
* Fixed some bugs I found myself. Link: https://lore.kernel.org/all/[email protected]/
Old version:
This patch has already gone through a round of reviews. The difference from the first round is that it reuses the i2c-wmt driver.
Hans Hu (6):
i2c: wmt: create wmt_i2c_init for general init
i2c: wmt: split out common files
i2c: wmt: rename something
i2c: wmt: fix a bug when thread blocked
i2c: wmt: add platform type VIAI2C_PLAT_WMT
i2c: add zhaoxin i2c controller driver
MAINTAINERS | 10 +- drivers/i2c/busses/Kconfig | 10 + drivers/i2c/busses/Makefile | 3 + drivers/i2c/busses/i2c-viai2c-common.c | 256 ++++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 85 +++++ drivers/i2c/busses/i2c-viai2c-wmt.c | 148 +++++++++ drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 298 +++++++++++++++++ drivers/i2c/busses/i2c-wmt.c | 421 ------------------------ 8 files changed, 809 insertions(+), 422 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-viai2c-wmt.c create mode 100644 drivers/i2c/busses/i2c-viai2c-zhaoxin.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c
Signature · 1 line
2.34.1
PATCH v10 1/6 i2c: wmt: create wmt_i2c_init for general init
Some common initialization actions are put in the function wmt_i2c_init(), which is convenient to share with zhaoxin.
--- drivers/i2c/busses/i2c-wmt.c | 65 ++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 28 deletions(-)
drivers/i2c/busses/i2c-wmt.c +37 -28
@@ -109,7 +109,7 @@ static int wmt_check_status(struct wmt_i2c_dev *i2c_dev)unsigned long wait_result; wait_result =wait_for_completion_timeout (&i2c_dev->complete, -msecs_to_jiffies (500 )); +msecs_to_jiffies (500 ));if (!wait_result)return -ETIMEDOUT ;
@@ -286,6 +286,38 @@ static irqreturn_t wmt_i2c_isr(int irq, void *data)return IRQ_HANDLED ; } +static int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +{ +int err; +struct wmt_i2c_dev *i2c_dev; +struct device_node *np = pdev->dev.of_node; + + i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); +if (!i2c_dev) +return -ENOMEM ; + + i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c_dev->base)) +return PTR_ERR (i2c_dev->base); + + i2c_dev->irq =irq_of_parse_and_map (np,0 ); +if (!i2c_dev->irq) +return -EINVAL ; + + err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, +0 , pdev->name, i2c_dev); +if (err) +return dev_err_probe (&pdev->dev, err, +"failed to request irq %i\n" , i2c_dev->irq); + + i2c_dev->dev = &pdev->dev; +init_completion (&i2c_dev->complete); +platform_set_drvdata (pdev, i2c_dev); + + *pi2c_dev = i2c_dev; +return 0 ; +} +static int wmt_i2c_reset_hardware (struct wmt_i2c_dev *i2c_dev) {int err;
@@ -327,19 +359,9 @@ static int wmt_i2c_probe(struct platform_device *pdev)int err;u32 clk_rate; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) -return -ENOMEM ; - - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); - - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) { -dev_err (&pdev->dev,"irq missing or invalid\n" ); -return -EINVAL ; - } + err =wmt_i2c_init (pdev, &i2c_dev); +if (err) +return err; i2c_dev->clk =of_clk_get (np,0 );if (IS_ERR (i2c_dev->clk)) {
@@ -348,18 +370,9 @@ static int wmt_i2c_probe(struct platform_device *pdev) } err =of_property_read_u32 (np,"clock-frequency" , &clk_rate); -if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) +if (!err && clk_rate ==I2C_MAX_FAST_MODE_FREQ ) i2c_dev->tcr =TCR_FAST_MODE ; - i2c_dev->dev = &pdev->dev; - - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr,0 , -"i2c" , i2c_dev); -if (err) { -dev_err (&pdev->dev,"failed to request irq %i\n" , i2c_dev->irq); -return err; - } - adap = &i2c_dev->adapter;i2c_set_adapdata (adap, i2c_dev);strscpy (adap->name,"WMT I2C adapter" ,sizeof (adap->name));
@@ -368,8 +381,6 @@ static int wmt_i2c_probe(struct platform_device *pdev) adap->dev.parent = &pdev->dev; adap->dev.of_node = pdev->dev.of_node; -init_completion (&i2c_dev->complete); - err =wmt_i2c_reset_hardware (i2c_dev);if (err) {dev_err (&pdev->dev,"error initializing hardware\n" );
@@ -380,8 +391,6 @@ static int wmt_i2c_probe(struct platform_device *pdev)if (err) goto err_disable_clk; -platform_set_drvdata (pdev, i2c_dev); -return 0 ; err_disable_clk:
Signature · 1 line
2.34.1
Andi Shyti
maintainerRe: [PATCH v10 1/6] i2c: wmt: create wmt_i2c_init for general init
Hi Hnas,
...
drivers/i2c/busses/i2c-wmt.c static int wmt_check_status(struct wmt_i2c_dev *i2c_dev) · line 112
Quoted 6 lines
drivers/i2c/busses/i2c-wmt.c +1
-1@@ -109,7 +109,7 @@ static int wmt_check_status(struct wmt_i2c_dev *i2c_dev)unsigned long wait_result; wait_result =wait_for_completion_timeout (&i2c_dev->complete, -msecs_to_jiffies (500 )); +msecs_to_jiffies (500 ));
argh!!! This change is not related to this patch.
Quoted 3 lines
drivers/i2c/busses/i2c-wmt.c +0
-0if (!wait_result)return -ETIMEDOUT ;
...
drivers/i2c/busses/i2c-wmt.c static int wmt_i2c_probe(struct platform_device *pdev) · line 373
Quoted 6 lines
drivers/i2c/busses/i2c-wmt.c +1
-1@@ -348,18 +370,9 @@ static int wmt_i2c_probe(struct platform_device *pdev) } err =of_property_read_u32 (np,"clock-frequency" , &clk_rate); -if (!err && (clk_rate ==I2C_MAX_FAST_MODE_FREQ )) +if (!err && clk_rate ==I2C_MAX_FAST_MODE_FREQ )
This is not related either.
Andi
Quoted 1 line
drivers/i2c/busses/i2c-wmt.c +0
-0i2c_dev->tcr =TCR_FAST_MODE ;
PATCH v10 2/6 i2c: wmt: split out common files
In reply to Hans HuSince the I2C IP of both wmt and zhaoxin originates from VIA, it is better to separate the common code first.
The common driver is named as i2c-viai2c-common.c. Old i2c-wmt.c renamed to i2c-viai2c-wmt.c.
The MAINTAINERS file will be updated accordingly in upcoming commits.
--- MAINTAINERS | 2 +- drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-viai2c-common.c | 221 +++++++++++++ drivers/i2c/busses/i2c-viai2c-common.h | 71 ++++ drivers/i2c/busses/i2c-viai2c-wmt.c | 148 +++++++++ drivers/i2c/busses/i2c-wmt.c | 430 ------------------------- 6 files changed, 442 insertions(+), 431 deletions(-) create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h create mode 100644 drivers/i2c/busses/i2c-viai2c-wmt.c delete mode 100644 drivers/i2c/busses/i2c-wmt.c
MAINTAINERS +1 -1
@@ -3018,7 +3018,7 @@ S: Orphan F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt F: arch/arm/mach-vt8500/ F: drivers/clocksource/timer-vt8500.c -F: drivers/i2c/busses/i2c-wmt.c +F: drivers/i2c/busses/i2c-viai2c-wmt.c F: drivers/mmc/host/wmt-sdmmc.c F: drivers/pwm/pwm-vt8500.c F: drivers/rtc/rtc-vt8500.c
drivers/i2c/busses/Makefile +1 -0
@@ -118,6 +118,7 @@ obj-$(CONFIG_I2C_TEGRA_BPMP) += i2c-tegra-bpmp.o obj-$(CONFIG_I2C_UNIPHIER) += i2c-uniphier.o obj-$(CONFIG_I2C_UNIPHIER_F) += i2c-uniphier-f.o obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o +i2c-wmt-objs := i2c-viai2c-wmt.o i2c-viai2c-common.o obj-$(CONFIG_I2C_WMT) += i2c-wmt.o i2c-octeon-objs := i2c-octeon-core.o i2c-octeon-platdrv.o obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o
drivers/i2c/busses/i2c-viai2c-common.c new file +221 -0
221 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-common.h new file +71 -0
71 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-wmt.c new file +148 -0
148 lines not on this page · raw message
drivers/i2c/busses/i2c-wmt.c deleted +0 -430
430 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v10 3/6 i2c: wmt: rename something
In reply to Hans Hu1. The I2C IP for both wmt and zhaoxin originates from VIA. Rename common registers, functions, and variable names to follow the VIAI2C_ and viai2c_ naming conventions for consistency and clarity.
2. rename i2c_dev to i2c, to shorten the length of a line.
3. rename wait_result to time_left, make it better to reflect the meaning of the value returned by wait_for_completion_timeout().
4. remove TCR_MASTER_WRITE, its value is 0.
--- drivers/i2c/busses/i2c-viai2c-common.c | 157 ++++++++++++------------- drivers/i2c/busses/i2c-viai2c-common.h | 70 ++++++----- drivers/i2c/busses/i2c-viai2c-wmt.c | 62 +++++----- 3 files changed, 143 insertions(+), 146 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +78 -79
@@ -2,14 +2,14 @@#include <linux/of_irq.h> #include "i2c-viai2c-common.h" -int wmt_i2c_wait_bus_not_busy (struct wmt_i2c_dev *i2c_dev) +int viai2c_wait_bus_not_busy (struct viai2c *i2c) {unsigned long timeout; - timeout = jiffies +WMT_I2C_TIMEOUT ; -while (!(readw (i2c_dev->base +REG_CSR ) &CSR_READY_MASK )) { + timeout = jiffies +VIAI2C_TIMEOUT ; +while (!(readw (i2c->base +VIAI2C_REG_CSR ) &VIAI2C_CSR_READY_MASK )) {if (time_after (jiffies, timeout)) { -dev_warn (i2c_dev->dev,"timeout waiting for bus ready\n" ); +dev_warn (i2c->dev,"timeout waiting for bus ready\n" );return -EBUSY ; }msleep (20 );
@@ -18,28 +18,28 @@ int wmt_i2c_wait_bus_not_busy(struct wmt_i2c_dev *i2c_dev)return 0 ; } -int wmt_check_status (struct wmt_i2c_dev *i2c_dev) +int viai2c_check_status (struct viai2c *i2c) {int ret =0 ; -unsigned long wait_result; +unsigned long time_left; - wait_result =wait_for_completion_timeout (&i2c_dev->complete, -msecs_to_jiffies (500 )); -if (!wait_result) + time_left =wait_for_completion_timeout (&i2c->complete, +msecs_to_jiffies (500 )); +if (!time_left)return -ETIMEDOUT ; -if (i2c_dev->cmd_status &ISR_NACK_ADDR ) +if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) ret = -EIO ; -if (i2c_dev->cmd_status &ISR_SCL_TIMEOUT ) +if (i2c->cmd_status &VIAI2C_ISR_SCL_TIMEOUT ) ret = -ETIMEDOUT ;return ret; } -static int wmt_i2c_write (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg,int last) +static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,int last) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;int xfer_len =0 ;
@@ -49,173 +49,172 @@ static int wmt_i2c_write(struct wmt_i2c_dev *i2c_dev, struct i2c_msg *pmsg, int* start at -1 and break out early from the loop */ xfer_len =-1 ; -writew (0 , i2c_dev->base +REG_CDR ); +writew (0 , i2c->base +VIAI2C_REG_CDR ); }else { -writew (pmsg->buf[0 ] &0xFF , i2c_dev->base +REG_CDR ); +writew (pmsg->buf[0 ] &0xFF , i2c->base +VIAI2C_REG_CDR ); }if (!(pmsg->flags &I2C_M_NOSTART )) { - val =readw (i2c_dev->base +REG_CR ); - val &= ~CR_TX_END ; - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val &= ~VIAI2C_CR_TX_END ; + val |=VIAI2C_CR_CPU_RDY ; +writew (val, i2c->base +VIAI2C_REG_CR ); } -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |= (TCR_MASTER_WRITE | (pmsg->addr &TCR_SLAVE_ADDR_MASK )); + tcr_val |= pmsg->addr &VIAI2C_TCR_ADDR_MASK ; -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c->base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, i2c->base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =viai2c_check_status (i2c);if (ret)return ret; xfer_len++; - val =readw (i2c_dev->base +REG_CSR ); -if ((val &CSR_RCV_ACK_MASK ) ==CSR_RCV_NOT_ACK ) { -dev_dbg (i2c_dev->dev,"write RCV NACK error\n" ); + val =readw (i2c->base +VIAI2C_REG_CSR ); +if (val &VIAI2C_CSR_RCV_NOT_ACK ) { +dev_dbg (i2c->dev,"write RCV NACK error\n" );return -EIO ; }if (pmsg->len ==0 ) { - val =CR_TX_END |CR_CPU_RDY |CR_ENABLE ; -writew (val, i2c_dev->base +REG_CR ); + val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE ; +writew (val, i2c->base +VIAI2C_REG_CR );break ; }if (xfer_len == pmsg->len) {if (last !=1 ) -writew (CR_ENABLE , i2c_dev->base +REG_CR ); +writew (VIAI2C_CR_ENABLE , i2c->base +VIAI2C_REG_CR ); }else { -writew (pmsg->buf[xfer_len] &0xFF , i2c_dev->base + -REG_CDR ); -writew (CR_CPU_RDY |CR_ENABLE , i2c_dev->base +REG_CR ); +writew (pmsg->buf[xfer_len] &0xFF , i2c->base +VIAI2C_REG_CDR ); +writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , i2c->base +VIAI2C_REG_CR ); } }return 0 ; } -static int wmt_i2c_read (struct wmt_i2c_dev *i2c_dev,struct i2c_msg *pmsg) +static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) { -u16 val, tcr_val = i2c_dev->tcr; +u16 val, tcr_val = i2c->tcr;int ret;u32 xfer_len =0 ; - val =readw (i2c_dev->base +REG_CR ); - val &= ~(CR_TX_END |CR_TX_NEXT_NO_ACK ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END );if (!(pmsg->flags &I2C_M_NOSTART )) - val |=CR_CPU_RDY ; + val |=VIAI2C_CR_CPU_RDY ;if (pmsg->len ==1 ) - val |=CR_TX_NEXT_NO_ACK ; + val |=VIAI2C_CR_RX_END ; -writew (val, i2c_dev->base +REG_CR ); +writew (val, i2c->base +VIAI2C_REG_CR ); -reinit_completion (&i2c_dev->complete); +reinit_completion (&i2c->complete); - tcr_val |=TCR_MASTER_READ | (pmsg->addr &TCR_SLAVE_ADDR_MASK ); + tcr_val |=VIAI2C_TCR_READ | (pmsg->addr &VIAI2C_TCR_ADDR_MASK ); -writew (tcr_val, i2c_dev->base +REG_TCR ); +writew (tcr_val, i2c->base +VIAI2C_REG_TCR );if (pmsg->flags &I2C_M_NOSTART ) { - val =readw (i2c_dev->base +REG_CR ); - val |=CR_CPU_RDY ; -writew (val, i2c_dev->base +REG_CR ); + val =readw (i2c->base +VIAI2C_REG_CR ); + val |=VIAI2C_CR_CPU_RDY ; +writew (val, i2c->base +VIAI2C_REG_CR ); }while (xfer_len < pmsg->len) { - ret =wmt_check_status (i2c_dev); + ret =viai2c_check_status (i2c);if (ret)return ret; - pmsg->buf[xfer_len] =readw (i2c_dev->base +REG_CDR ) >>8 ; + pmsg->buf[xfer_len] =readw (i2c->base +VIAI2C_REG_CDR ) >>8 ; xfer_len++; - val =readw (i2c_dev->base +REG_CR ) |CR_CPU_RDY ; + val =readw (i2c->base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ;if (xfer_len == pmsg->len -1 ) - val |=CR_TX_NEXT_NO_ACK ; -writew (val, i2c_dev->base +REG_CR ); + val |=VIAI2C_CR_RX_END ; +writew (val, i2c->base +VIAI2C_REG_CR ); }return 0 ; } -int wmt_i2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num) +int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num) {struct i2c_msg *pmsg;int i;int ret =0 ; -struct wmt_i2c_dev *i2c_dev =i2c_get_adapdata (adap); +struct viai2c *i2c =i2c_get_adapdata (adap);for (i =0 ; ret >=0 && i < num; i++) { pmsg = &msgs[i];if (!(pmsg->flags &I2C_M_NOSTART )) { - ret =wmt_i2c_wait_bus_not_busy (i2c_dev); + ret =viai2c_wait_bus_not_busy (i2c);if (ret <0 )return ret; }if (pmsg->flags &I2C_M_RD ) - ret =wmt_i2c_read (i2c_dev, pmsg); + ret =viai2c_read (i2c, pmsg);else - ret =wmt_i2c_write (i2c_dev, pmsg, (i +1 ) == num); + ret =viai2c_write (i2c, pmsg, (i +1 ) == num); }return (ret <0 ) ? ret : i; } -static irqreturn_t wmt_i2c_isr (int irq,void *data) +static irqreturn_t viai2c_isr (int irq,void *data) { -struct wmt_i2c_dev *i2c_dev = data; +struct viai2c *i2c = data;/* save the status and write-clear it */ - i2c_dev->cmd_status =readw (i2c_dev->base +REG_ISR ); -writew (i2c_dev->cmd_status, i2c_dev->base +REG_ISR ); + i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); +writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR ); -complete (&i2c_dev->complete); +complete (&i2c->complete);return IRQ_HANDLED ; } -int wmt_i2c_init (struct platform_device *pdev,struct wmt_i2c_dev **pi2c_dev) +int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c) {int err; -struct wmt_i2c_dev *i2c_dev; +struct viai2c *i2c;struct device_node *np = pdev->dev.of_node; - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL ); -if (!i2c_dev) + i2c =devm_kzalloc (&pdev->dev,sizeof (*i2c),GFP_KERNEL ); +if (!i2c)return -ENOMEM ; - i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); -if (IS_ERR (i2c_dev->base)) -return PTR_ERR (i2c_dev->base); + i2c->base =devm_platform_get_and_ioremap_resource (pdev,0 ,NULL ); +if (IS_ERR (i2c->base)) +return PTR_ERR (i2c->base); - i2c_dev->irq =irq_of_parse_and_map (np,0 ); -if (!i2c_dev->irq) + i2c->irq =irq_of_parse_and_map (np,0 ); +if (!i2c->irq)return -EINVAL ; - err =devm_request_irq (&pdev->dev, i2c_dev->irq, wmt_i2c_isr, -0 , pdev->name, i2c_dev); + err =devm_request_irq (&pdev->dev, i2c->irq, viai2c_isr, +0 , pdev->name, i2c);if (err)return dev_err_probe (&pdev->dev, err, -"failed to request irq %i\n" , i2c_dev->irq); +"failed to request irq %i\n" , i2c->irq); - i2c_dev->dev = &pdev->dev; -init_completion (&i2c_dev->complete); -platform_set_drvdata (pdev, i2c_dev); + i2c->dev = &pdev->dev; +init_completion (&i2c->complete); +platform_set_drvdata (pdev, i2c); - *pi2c_dev = i2c_dev; + *pi2c = i2c;return 0 ; }
drivers/i2c/busses/i2c-viai2c-common.h +34 -36
91 lines not on this page · raw message
drivers/i2c/busses/i2c-viai2c-wmt.c +31 -31
123 lines not on this page · raw message
Signature · 1 line
2.34.1
Andi Shyti
maintainerRe: [PATCH v10 3/6] i2c: wmt: rename something
Hi Hans,
Quoted 7 lines · Hans Hu
1. The I2C IP for both wmt and zhaoxin originates from VIA. Rename common registers, functions, and variable names to follow the
VIAI2C_andviai2c_naming conventions for consistency and clarity.
2. renamei2c_devto i2c, to shorten the length of a line.
3. renamewait_resulttotime_left, make it better to reflect the meaning of the value returned bywait_for_completion_timeout().
4. removeTCR_MASTER_WRITE, its value is 0.
next time all the above changes should be on separate patches.
Andi
PATCH v10 4/6 i2c: wmt: fix a bug when thread blocked
In reply to Hans HuDuring each byte access, the host performs clock stretching.
To reduce the host performs clock stretching, move most of the per-msg processing to the interrupt context.
--- drivers/i2c/busses/i2c-viai2c-common.c | 145 +++++++++++++------------ drivers/i2c/busses/i2c-viai2c-common.h | 6 +- 2 files changed, 80 insertions(+), 71 deletions(-)
drivers/i2c/busses/i2c-viai2c-common.c +76 -69
@@ -18,37 +18,18 @@ int viai2c_wait_bus_not_busy(struct viai2c *i2c)return 0 ; } -int viai2c_check_status (struct viai2c *i2c) -{ -int ret =0 ; -unsigned long time_left; - - time_left =wait_for_completion_timeout (&i2c->complete, -msecs_to_jiffies (500 )); -if (!time_left) -return -ETIMEDOUT ; - -if (i2c->cmd_status &VIAI2C_ISR_NACK_ADDR ) - ret = -EIO ; - -if (i2c->cmd_status &VIAI2C_ISR_SCL_TIMEOUT ) - ret = -ETIMEDOUT ; - -return ret; -} -static int viai2c_write (struct viai2c *i2c,struct i2c_msg *pmsg,int last) {u16 val, tcr_val = i2c->tcr; -int ret; -int xfer_len =0 ; + + i2c->last = last;if (pmsg->len ==0 ) {/* * We still need to run through the while (..) once, so * start at -1 and break out early from the loop */ - xfer_len =-1 ; + i2c->xfered_len =-1 ;writew (0 , i2c->base +VIAI2C_REG_CDR ); }else {writew (pmsg->buf[0 ] &0xFF , i2c->base +VIAI2C_REG_CDR );
@@ -73,42 +54,15 @@ static int viai2c_write(struct viai2c *i2c, struct i2c_msg *pmsg, int last)writew (val, i2c->base +VIAI2C_REG_CR ); } -while (xfer_len < pmsg->len) { - ret =viai2c_check_status (i2c); -if (ret) -return ret; - - xfer_len++; - - val =readw (i2c->base +VIAI2C_REG_CSR ); -if (val &VIAI2C_CSR_RCV_NOT_ACK ) { -dev_dbg (i2c->dev,"write RCV NACK error\n" ); -return -EIO ; - } - -if (pmsg->len ==0 ) { - val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE ; -writew (val, i2c->base +VIAI2C_REG_CR ); -break ; - } - -if (xfer_len == pmsg->len) { -if (last !=1 ) -writew (VIAI2C_CR_ENABLE , i2c->base +VIAI2C_REG_CR ); - }else { -writew (pmsg->buf[xfer_len] &0xFF , i2c->base +VIAI2C_REG_CDR ); -writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , i2c->base +VIAI2C_REG_CR ); - } - } +if (!wait_for_completion_timeout (&i2c->complete,VIAI2C_TIMEOUT )) +return -ETIMEDOUT ; -return 0 ; +return i2c->ret; }static int viai2c_read (struct viai2c *i2c,struct i2c_msg *pmsg) {u16 val, tcr_val = i2c->tcr; -int ret; -u32 xfer_len =0 ; val =readw (i2c->base +VIAI2C_REG_CR ); val &= ~(VIAI2C_CR_TX_END |VIAI2C_CR_RX_END );
@@ -133,21 +87,10 @@ static int viai2c_read(struct viai2c *i2c, struct i2c_msg *pmsg)writew (val, i2c->base +VIAI2C_REG_CR ); } -while (xfer_len < pmsg->len) { - ret =viai2c_check_status (i2c); -if (ret) -return ret; - - pmsg->buf[xfer_len] =readw (i2c->base +VIAI2C_REG_CDR ) >>8 ; - xfer_len++; - - val =readw (i2c->base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ; -if (xfer_len == pmsg->len -1 ) - val |=VIAI2C_CR_RX_END ; -writew (val, i2c->base +VIAI2C_REG_CR ); - } +if (!wait_for_completion_timeout (&i2c->complete,VIAI2C_TIMEOUT )) +return -ETIMEDOUT ; -return 0 ; +return i2c->ret; }int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num)
@@ -165,6 +108,9 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)return ret; } + i2c->msg = pmsg; + i2c->xfered_len =0 ; +if (pmsg->flags &I2C_M_RD ) ret =viai2c_read (i2c, pmsg);else
@@ -174,15 +120,76 @@ int viai2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)return (ret <0 ) ? ret : i; } +/* +* Main process of the byte mode xfer +* +* Return value indicates whether the transfer is complete +* 1: all the data has been successfully transferred +* 0: there is still data that needs to be transferred +* -EIO: error occurred +*/ +static int viai2c_irq_xfer (struct viai2c *i2c) +{ +u16 val; +struct i2c_msg *msg = i2c->msg; +u8 read = msg->flags &I2C_M_RD ; +void __iomem *base = i2c->base; + +if (read) { + msg->buf[i2c->xfered_len] =readw (base +VIAI2C_REG_CDR ) >>8 ; + + val =readw (base +VIAI2C_REG_CR ) |VIAI2C_CR_CPU_RDY ; +if (i2c->xfered_len == msg->len -2 ) + val |=VIAI2C_CR_RX_END ; +writew (val, base +VIAI2C_REG_CR ); + }else { + val =readw (base +VIAI2C_REG_CSR ); +if (val &VIAI2C_CSR_RCV_NOT_ACK ) +return -EIO ; + +/* I2C_SMBUS_QUICK */ +if (msg->len ==0 ) { + val =VIAI2C_CR_TX_END |VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE ; +writew (val, base +VIAI2C_REG_CR ); +return 1 ; + } + +if ((i2c->xfered_len +1 ) == msg->len) { +if (!i2c->last) +writew (VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); + }else { +writew (msg->buf[i2c->xfered_len +1 ] &0xFF , base +VIAI2C_REG_CDR ); +writew (VIAI2C_CR_CPU_RDY |VIAI2C_CR_ENABLE , base +VIAI2C_REG_CR ); + } + } + + i2c->xfered_len++; + +return i2c->xfered_len == msg->len; +} +static irqreturn_t viai2c_isr (int irq,void *data) {struct viai2c *i2c = data; +u8 status;/* save the status and write-clear it */ - i2c->cmd_status =readw (i2c->base +VIAI2C_REG_ISR ); -writew (i2c->cmd_status, i2c->base +VIAI2C_REG_ISR ); + status =readw (i2c->base +VIAI2C_REG_ISR ); +writew (status, i2c->base +VIAI2C_REG_ISR ); + + i2c->ret =0 ; +if (status &VIAI2C_ISR_NACK_ADDR ) + i2c->ret = -EIO ; + +if (status &VIAI2C_ISR_SCL_TIMEOUT ) + i2c->ret = -ETIMEDOUT ; + +if (!i2c->ret) + i2c->ret =viai2c_irq_xfer (i2c); -complete (&i2c->complete); +/* All the data has been successfully transferred or error occurred */ +if (i2c->ret) +complete (&i2c->complete);return IRQ_HANDLED ; }
drivers/i2c/busses/i2c-viai2c-common.h +4 -2
@@ -58,11 +58,13 @@ struct viai2c {struct clk *clk;u16 tcr;int irq; -u16 cmd_status; +u16 xfered_len; +struct i2c_msg *msg; +int ret; +bool last; };int viai2c_wait_bus_not_busy (struct viai2c *i2c); -int viai2c_check_status (struct viai2c *i2c);int viai2c_xfer (struct i2c_adapter *adap,struct i2c_msg msgs[],int num);int viai2c_init (struct platform_device *pdev,struct viai2c **pi2c);
Signature · 1 line
2.34.1