linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: wsa@the-dreams.de (Wolfram Sang)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC V2 11/12] i2c: pmcmsp: make use of the new infrastructure for quirks
Date: Wed, 25 Feb 2015 17:02:02 +0100	[thread overview]
Message-ID: <1424880126-15047-12-git-send-email-wsa@the-dreams.de> (raw)
In-Reply-To: <1424880126-15047-1-git-send-email-wsa@the-dreams.de>

From: Wolfram Sang <wsa+renesas@sang-engineering.com>

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
 drivers/i2c/busses/i2c-pmcmsp.c | 42 ++++++++++++++++-------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/drivers/i2c/busses/i2c-pmcmsp.c b/drivers/i2c/busses/i2c-pmcmsp.c
index d37d9db6681e7b..2c40edbf6224eb 100644
--- a/drivers/i2c/busses/i2c-pmcmsp.c
+++ b/drivers/i2c/busses/i2c-pmcmsp.c
@@ -456,14 +456,6 @@ static enum pmcmsptwi_xfer_result pmcmsptwi_xfer_cmd(
 		return -EINVAL;
 	}
 
-	if (cmd->read_len > MSP_MAX_BYTES_PER_RW ||
-	    cmd->write_len > MSP_MAX_BYTES_PER_RW) {
-		dev_err(&pmcmsptwi_adapter.dev,
-			"%s: Cannot transfer more than %d bytes\n",
-			__func__, MSP_MAX_BYTES_PER_RW);
-		return -EINVAL;
-	}
-
 	mutex_lock(&data->lock);
 	dev_dbg(&pmcmsptwi_adapter.dev,
 		"Setting address to 0x%04x\n", cmd->addr);
@@ -520,25 +512,14 @@ static int pmcmsptwi_master_xfer(struct i2c_adapter *adap,
 	struct pmcmsptwi_cfg oldcfg, newcfg;
 	int ret;
 
-	if (num > 2) {
-		dev_dbg(&adap->dev, "%d messages unsupported\n", num);
-		return -EINVAL;
-	} else if (num == 2) {
-		/* Check for a dual write-then-read command */
+	if (num == 2) {
 		struct i2c_msg *nextmsg = msg + 1;
-		if (!(msg->flags & I2C_M_RD) &&
-		    (nextmsg->flags & I2C_M_RD) &&
-		    msg->addr == nextmsg->addr) {
-			cmd.type = MSP_TWI_CMD_WRITE_READ;
-			cmd.write_len = msg->len;
-			cmd.write_data = msg->buf;
-			cmd.read_len = nextmsg->len;
-			cmd.read_data = nextmsg->buf;
-		} else {
-			dev_dbg(&adap->dev,
-				"Non write-read dual messages unsupported\n");
-			return -EINVAL;
-		}
+
+		cmd.type = MSP_TWI_CMD_WRITE_READ;
+		cmd.write_len = msg->len;
+		cmd.write_data = msg->buf;
+		cmd.read_len = nextmsg->len;
+		cmd.read_data = nextmsg->buf;
 	} else if (msg->flags & I2C_M_RD) {
 		cmd.type = MSP_TWI_CMD_READ;
 		cmd.read_len = msg->len;
@@ -598,6 +579,14 @@ static u32 pmcmsptwi_i2c_func(struct i2c_adapter *adapter)
 		I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_PROC_CALL;
 }
 
+static struct i2c_adapter_quirks pmcmsptwi_i2c_quirks = {
+	.flags = I2C_AQ_COMB_WRITE_THEN_READ,
+	.max_write_len = MSP_MAX_BYTES_PER_RW,
+	.max_read_len = MSP_MAX_BYTES_PER_RW,
+	.max_comb_1st_msg_len = MSP_MAX_BYTES_PER_RW,
+	.max_comb_2nd_msg_len = MSP_MAX_BYTES_PER_RW,
+};
+
 /* -- Initialization -- */
 
 static struct i2c_algorithm pmcmsptwi_algo = {
@@ -609,6 +598,7 @@ static struct i2c_adapter pmcmsptwi_adapter = {
 	.owner		= THIS_MODULE,
 	.class		= I2C_CLASS_HWMON | I2C_CLASS_SPD,
 	.algo		= &pmcmsptwi_algo,
+	.quirks		= &pmcmsptwi_i2c_quirks,
 	.name		= DRV_NAME,
 };
 
-- 
2.1.4

  parent reply	other threads:[~2015-02-25 16:02 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-25 16:01 [RFC V2 00/12] i2c: describe adapter quirks in a generic way Wolfram Sang
2015-02-25 16:01 ` [RFC V2 01/12] i2c: add quirk structure to describe adapter flaws Wolfram Sang
2015-02-25 16:01 ` [RFC V2 02/12] i2c: add quirk checks to core Wolfram Sang
2015-02-25 16:01 ` [RFC V2 03/12] i2c: at91: make use of the new infrastructure for quirks Wolfram Sang
2015-03-08  8:28   ` Wolfram Sang
2015-03-09 16:11     ` Ludovic Desroches
2015-03-10 13:55     ` Ludovic Desroches
2015-03-12 14:50       ` Wolfram Sang
2015-02-25 16:01 ` [RFC V2 04/12] i2c: opal: " Wolfram Sang
2015-03-10 17:13   ` Neelesh Gupta
2015-03-10 23:12     ` Benjamin Herrenschmidt
2015-03-11  4:26       ` Neelesh Gupta
2015-03-12 14:55         ` Wolfram Sang
2015-02-25 16:01 ` [RFC V2 05/12] i2c: qup: " Wolfram Sang
2015-02-25 16:01 ` [RFC V2 06/12] i2c: cpm: " Wolfram Sang
2015-02-25 16:01 ` [RFC V2 07/12] i2c: axxia: " Wolfram Sang
2015-02-25 16:01 ` [RFC V2 08/12] i2c: dln2: " Wolfram Sang
2015-02-25 16:02 ` [RFC V2 09/12] i2c: powermac: " Wolfram Sang
2015-02-25 16:02 ` [RFC V2 10/12] i2c: viperboard: " Wolfram Sang
2015-02-25 16:02 ` Wolfram Sang [this message]
2015-02-25 16:02 ` [RFC V2 12/12] i2c: bcm-iproc: " Wolfram Sang
2015-02-26 23:32   ` Ray Jui
2015-03-12 14:56     ` Wolfram Sang
2015-03-05 13:27 ` [RFC V2 00/12] i2c: describe adapter quirks in a generic way Ivan T. Ivanov
2015-03-12 14:56   ` Wolfram Sang
2015-03-14 11:14 ` Wolfram Sang

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=1424880126-15047-12-git-send-email-wsa@the-dreams.de \
    --to=wsa@the-dreams.de \
    --cc=linux-arm-kernel@lists.infradead.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 NNTP newsgroup(s).