From: Hans Hu <hanshu-oc@zhaoxin.com>
To: <andi.shyti@kernel.org>, <wsa@kernel.org>, <linux-i2c@vger.kernel.org>
Cc: <cobechen@zhaoxin.com>
Subject: [PATCH v3 11/12] i2c: via-common: add zhaoxin platform
Date: Thu, 2 Nov 2023 10:54:01 +0800 [thread overview]
Message-ID: <724d41f2ce79314cab76a2141229cc7126fb1c75.1698889581.git.hanshu-oc@zhaoxin.com> (raw)
In-Reply-To: <cover.1698889581.git.hanshu-oc@zhaoxin.com>
There 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.
Signed-off-by: Hans Hu <hanshu-oc@zhaoxin.com>
---
drivers/i2c/busses/i2c-viai2c-common.c | 30 +++++++++++++++++++-------
drivers/i2c/busses/i2c-viai2c-common.h | 7 ++++++
2 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/drivers/i2c/busses/i2c-viai2c-common.c b/drivers/i2c/busses/i2c-viai2c-common.c
index 45ac56941bee..0247865cb57a 100644
--- a/drivers/i2c/busses/i2c-viai2c-common.c
+++ b/drivers/i2c/busses/i2c-viai2c-common.c
@@ -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);
diff --git a/drivers/i2c/busses/i2c-viai2c-common.h b/drivers/i2c/busses/i2c-viai2c-common.h
index f3dcc609679e..c1b9ccff24e8 100644
--- a/drivers/i2c/busses/i2c-viai2c-common.h
+++ b/drivers/i2c/busses/i2c-viai2c-common.h
@@ -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);
--
2.34.1
next prev parent reply other threads:[~2023-11-02 3:10 UTC|newest]
Thread overview: 133+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-02 2:53 [PATCH v3 00/12] i2c: add zhaoxin i2c controller driver Hans Hu
2023-11-02 2:53 ` [PATCH v3 01/12] i2c: wmt: Reduce redundant: bus busy check Hans Hu
2023-12-22 9:33 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 02/12] i2c: wmt: Reduce redundant: wait event complete Hans Hu
2023-12-22 9:34 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 03/12] i2c: wmt: Reduce redundant: clock mode setting Hans Hu
2023-12-22 9:36 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 04/12] i2c: wmt: Reduce redundant: REG_CR setting Hans Hu
2023-12-22 9:38 ` Wolfram Sang
2023-12-22 10:15 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 05/12] i2c: wmt: Reduce redundant: function parameter Hans Hu
2023-12-22 9:48 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 06/12] i2c: wmt: delete .remove_new Hans Hu
2023-12-22 9:51 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 07/12] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2023-12-22 10:26 ` Wolfram Sang
2023-12-22 10:55 ` Hans Hu
2023-12-22 11:00 ` Wolfram Sang
2023-11-02 2:53 ` [PATCH v3 08/12] i2c: wmt: rename marcos with prefix WMTI2C_ Hans Hu
2023-11-02 2:53 ` [PATCH v3 09/12] i2c: wmt: adjust line length to meet style Hans Hu
2023-11-02 2:54 ` [PATCH v3 10/12] i2c: wmt: split out common files Hans Hu
2023-11-02 2:54 ` Hans Hu [this message]
2023-11-02 2:54 ` [PATCH v3 12/12] i2c: add zhaoxin i2c controller driver Hans Hu
2023-11-08 9:50 ` [PATCH v3 00/12] " Wolfram Sang
2023-12-27 4:39 ` [PATCH v4 0/8] " Hans Hu
2023-12-27 4:39 ` [PATCH v4 1/8] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2023-12-27 19:00 ` Wolfram Sang
2023-12-28 2:05 ` Hans Hu
2023-12-27 4:39 ` [PATCH v4 2/8] i2c: wmt: rename marcos with prefix WMTI2C_ Hans Hu
2023-12-27 4:39 ` [PATCH v4 3/8] i2c: wmt: adjust line length to meet style Hans Hu
2023-12-27 4:39 ` [PATCH v4 4/8] i2c: wmt: split out common files Hans Hu
2023-12-27 4:39 ` [PATCH v4 5/8] i2c: wmt: rename with prefix VIAI2C_ and viai2c_ Hans Hu
2023-12-27 4:39 ` [PATCH v4 6/8] i2c: wmt: fix a bug when thread blocked Hans Hu
2023-12-27 4:39 ` [PATCH v4 7/8] i2c: wmt: add platform type VIAI2C_PLAT_WMT Hans Hu
2023-12-27 4:39 ` [PATCH v4 8/8] i2c: add zhaoxin i2c controller driver Hans Hu
2023-12-28 3:17 ` [PATCH v5 0/8] " Hans Hu
2023-12-28 3:17 ` [PATCH v5 1/8] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2023-12-28 3:17 ` [PATCH v5 2/8] i2c: wmt: rename marcos with prefix WMTI2C_ Hans Hu
2023-12-28 3:17 ` [PATCH v5 3/8] i2c: wmt: adjust line length to meet style Hans Hu
2023-12-28 3:17 ` [PATCH v5 4/8] i2c: wmt: split out common files Hans Hu
2023-12-28 3:17 ` [PATCH v5 5/8] i2c: wmt: rename with prefix VIAI2C_ and viai2c_ Hans Hu
2023-12-28 3:17 ` [PATCH v5 6/8] i2c: wmt: fix a bug when thread blocked Hans Hu
2023-12-28 3:17 ` [PATCH v5 7/8] i2c: wmt: add platform type VIAI2C_PLAT_WMT Hans Hu
2023-12-28 3:17 ` [PATCH v5 8/8] i2c: add zhaoxin i2c controller driver Hans Hu
2023-12-29 5:17 ` kernel test robot
2023-12-29 6:30 ` [PATCH v6 0/8] " Hans Hu
2023-12-29 6:30 ` [PATCH v6 1/8] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2024-01-03 12:56 ` Andi Shyti
2024-01-04 1:44 ` Hans Hu
2023-12-29 6:30 ` [PATCH v6 2/8] i2c: wmt: rename marcos with prefix WMTI2C_ Hans Hu
2024-01-03 13:29 ` Andi Shyti
2023-12-29 6:30 ` [PATCH v6 3/8] i2c: wmt: adjust line length to meet style Hans Hu
2024-01-03 16:52 ` Andi Shyti
2024-01-04 1:49 ` Hans Hu
2023-12-29 6:30 ` [PATCH v6 4/8] i2c: wmt: split out common files Hans Hu
2024-01-03 17:21 ` Andi Shyti
2024-01-04 2:04 ` Hans Hu
2024-01-04 9:22 ` Andi Shyti
2024-01-04 9:45 ` Hans Hu
2024-01-04 12:36 ` Andi Shyti
2023-12-29 6:30 ` [PATCH v6 5/8] i2c: wmt: rename with prefix VIAI2C_ and viai2c_ Hans Hu
2024-01-03 18:45 ` Andi Shyti
2024-01-04 2:12 ` Hans Hu
2023-12-29 6:30 ` [PATCH v6 6/8] i2c: wmt: fix a bug when thread blocked Hans Hu
2024-01-03 19:39 ` Andi Shyti
2024-01-04 2:30 ` Hans Hu
2024-01-04 9:18 ` Andi Shyti
2024-01-04 10:02 ` Hans Hu
2024-01-04 12:37 ` Andi Shyti
2023-12-29 6:30 ` [PATCH v6 7/8] i2c: wmt: add platform type VIAI2C_PLAT_WMT Hans Hu
2023-12-29 6:30 ` [PATCH v6 8/8] i2c: add zhaoxin i2c controller driver Hans Hu
2024-01-03 20:02 ` Andi Shyti
2024-01-04 2:40 ` Hans Hu
2024-01-03 20:03 ` [PATCH v6 0/8] " Andi Shyti
2024-01-05 7:51 ` [PATCH v7 0/6] " Hans Hu
2024-01-05 7:51 ` [PATCH v7 1/6] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2024-01-15 15:17 ` Krzysztof Kozlowski
2024-01-16 1:43 ` Hans Hu
2024-01-21 23:56 ` Andi Shyti
2024-02-21 12:10 ` Wolfram Sang
2024-01-05 7:51 ` [PATCH v7 2/6] i2c: wmt: split out common files Hans Hu
2024-02-21 12:19 ` Wolfram Sang
2024-01-05 7:51 ` [PATCH v7 3/6] i2c: wmt: rename something Hans Hu
2024-02-21 12:34 ` Wolfram Sang
2024-01-05 7:51 ` [PATCH v7 4/6] i2c: wmt: fix a bug when thread blocked Hans Hu
2024-02-21 12:37 ` Wolfram Sang
2024-02-22 9:03 ` Hans Hu
2024-02-22 9:37 ` Wolfram Sang
2024-02-22 10:42 ` Hans Hu
2024-02-22 17:26 ` Wolfram Sang
2024-01-05 7:51 ` [PATCH v7 5/6] i2c: wmt: add platform type VIAI2C_PLAT_WMT Hans Hu
2024-02-21 12:39 ` Wolfram Sang
2024-02-22 8:50 ` Hans Hu
2024-01-05 7:51 ` [PATCH v7 6/6] i2c: add zhaoxin i2c controller driver Hans Hu
2024-02-21 12:44 ` Wolfram Sang
2024-02-22 8:49 ` Hans Hu
2024-02-27 6:36 ` [PATCH v8 0/6] " Hans Hu
2024-02-27 6:36 ` [PATCH v8 1/6] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2024-02-27 6:36 ` [PATCH v8 2/6] i2c: wmt: split out common files Hans Hu
2024-02-27 6:36 ` [PATCH v8 3/6] i2c: wmt: rename something Hans Hu
2024-02-27 6:36 ` [PATCH v8 4/6] i2c: wmt: fix a bug when thread blocked Hans Hu
2024-03-04 9:41 ` Wolfram Sang
2024-02-27 6:36 ` [PATCH v8 5/6] i2c: wmt: add platform type VIAI2C_PLAT_WMT Hans Hu
2024-03-04 9:46 ` Wolfram Sang
2024-02-27 6:36 ` [PATCH v8 6/6] i2c: add zhaoxin i2c controller driver Hans Hu
2024-03-04 9:49 ` Wolfram Sang
2024-03-04 23:01 ` [SPAM] " Andi Shyti
2024-03-05 2:45 ` Hans Hu
2024-03-06 11:50 ` Andi Shyti
2024-03-06 16:54 ` Wolfram Sang
2024-03-06 21:24 ` [PATCH v9 0/6] " Andi Shyti
2024-03-06 21:24 ` [PATCH v9 1/6] i2c: wmt: create wmt_i2c_init for general init Andi Shyti
2024-03-06 21:24 ` [PATCH v9 2/6] i2c: wmt: split out common files Andi Shyti
2024-03-06 21:24 ` [PATCH v9 3/6] i2c: wmt: rename something Andi Shyti
2024-03-06 21:24 ` [PATCH v9 4/6] i2c: wmt: fix a bug when thread blocked Andi Shyti
2024-03-06 21:24 ` [PATCH v9 5/6] i2c: wmt: add platform type VIAI2C_PLAT_WMT Andi Shyti
2024-03-06 21:24 ` [PATCH v9 6/6] i2c: add zhaoxin i2c controller driver Andi Shyti
2024-03-08 1:22 ` [PATCH v9 0/6] " Hans Hu
2024-03-08 12:30 ` Andi Shyti
2024-04-03 23:29 ` Andi Shyti
2024-04-07 1:36 ` Hans Hu
2024-04-08 2:54 ` [PATCH v10 " Hans Hu
2024-04-08 2:54 ` [PATCH v10 1/6] i2c: wmt: create wmt_i2c_init for general init Hans Hu
2024-04-23 11:23 ` Andi Shyti
2024-04-08 2:54 ` [PATCH v10 2/6] i2c: wmt: split out common files Hans Hu
2024-04-08 2:54 ` [PATCH v10 3/6] i2c: wmt: rename something Hans Hu
2024-04-23 11:54 ` Andi Shyti
2024-04-08 2:54 ` [PATCH v10 4/6] i2c: wmt: fix a bug when thread blocked Hans Hu
2024-04-08 2:54 ` [PATCH v10 5/6] i2c: wmt: add platform type VIAI2C_PLAT_WMT Hans Hu
2024-04-08 2:54 ` [PATCH v10 6/6] i2c: add zhaoxin i2c controller driver Hans Hu
2024-04-23 12:02 ` [PATCH v10 0/6] " Andi Shyti
2024-04-23 12:16 ` Hans Hu
2024-04-29 0:20 ` Andi Shyti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=724d41f2ce79314cab76a2141229cc7126fb1c75.1698889581.git.hanshu-oc@zhaoxin.com \
--to=hanshu-oc@zhaoxin.com \
--cc=andi.shyti@kernel.org \
--cc=cobechen@zhaoxin.com \
--cc=linux-i2c@vger.kernel.org \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).