From: "Sören Brinkmann" <soren.brinkmann@xilinx.com>
To: Wolfram Sang <wsa@the-dreams.de>
Cc: Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>, Rob Landley <rob@landley.net>,
Russell King <linux@arm.linux.org.uk>,
Grant Likely <grant.likely@linaro.org>,
Michal Simek <michal.simek@xilinx.com>,
Mike Looijmans <mike.looijmans@topic.nl>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Harini Katakam <harinik@xilinx.com>, <linux-doc@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-i2c@vger.kernel.org>
Subject: Re: [PATCH v4 2/3] i2c: Add driver for Cadence I2C controller
Date: Fri, 4 Apr 2014 09:32:32 -0700 [thread overview]
Message-ID: <53e29fb2-2a42-4cbf-9c15-490d81ee0de4@CH1EHSMHS005.ehs.local> (raw)
In-Reply-To: <20140404143847.GA5529@katana>
On Fri, 2014-04-04 at 04:38PM +0200, Wolfram Sang wrote:
> On Thu, Apr 03, 2014 at 10:59:26AM -0700, Soren Brinkmann wrote:
> > Add a driver for the Cadence I2C controller. This controller is for
> > example found in Xilinx Zynq.
> >
> > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
> > Tested-by: Michal Simek <michal.simek@xilinx.com>
> > Reviewed-by: Harini Katakam <harinik@xilinx.com>
>
> Only minor stuff, but since you resend anyhow because of 400kHz issue...
>
> > +static void cdns_i2c_mrecv(struct cdns_i2c *id)
> > +{
> > + unsigned int ctrl_reg;
> > + unsigned int isr_status;
> > +
> > + id->p_recv_buf = id->p_msg->buf;
> > + id->recv_count = id->p_msg->len;
> > +
> > + /* Put the controller in master receive mode and clear the FIFO */
> > + ctrl_reg = cdns_i2c_readreg(CDNS_I2C_CR_OFFSET);
> > + ctrl_reg |= CDNS_I2C_CR_RW | CDNS_I2C_CR_CLR_FIFO;
> > +
> > + if ((id->p_msg->flags & I2C_M_RECV_LEN) == I2C_M_RECV_LEN)
>
> 'if (id->p_msg->flags & I2C_M_RECV_LEN)' is enough.
>
> > + /* Report the other error interrupts to application as EIO */
> > + if (id->err_status & (CDNS_I2C_IXR_RX_UNF |
> > + CDNS_I2C_IXR_TX_OVF |
> > + CDNS_I2C_IXR_RX_OVF |
> > + CDNS_I2C_IXR_NACK)) {
> > + cdns_i2c_master_reset(adap);
> > + return -EIO;
> > + }
>
> NACK is returned as -ENXIO. Check 'Documentation/i2c/fault-codes' for
> standard patterns. I'd think the rest is EIO, though.
Okay, I'll put this into the next version:
diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c
index 43af8c351c8b..63f3f03ecc9b 100644
--- a/drivers/i2c/busses/i2c-cadence.c
+++ b/drivers/i2c/busses/i2c-cadence.c
@@ -311,7 +311,7 @@ static void cdns_i2c_mrecv(struct cdns_i2c *id)
ctrl_reg = cdns_i2c_readreg(CDNS_I2C_CR_OFFSET);
ctrl_reg |= CDNS_I2C_CR_RW | CDNS_I2C_CR_CLR_FIFO;
- if ((id->p_msg->flags & I2C_M_RECV_LEN) == I2C_M_RECV_LEN)
+ if (id->p_msg->flags & I2C_M_RECV_LEN)
id->recv_count = I2C_SMBUS_BLOCK_MAX + 1;
/*
@@ -531,12 +531,13 @@ static int cdns_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
if (ret)
return ret;
- /* Report the other error interrupts to application as EIO */
- if (id->err_status & (CDNS_I2C_IXR_RX_UNF |
- CDNS_I2C_IXR_TX_OVF |
- CDNS_I2C_IXR_RX_OVF |
- CDNS_I2C_IXR_NACK)) {
+ /* Report the other error interrupts to application */
+ if (id->err_status) {
cdns_i2c_master_reset(adap);
+
+ if (id->err_status & CDNS_I2C_IXR_NACK)
+ return -ENXIO;
+
return -EIO;
}
}
Thanks,
Sören
next prev parent reply other threads:[~2014-04-04 16:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-03 17:59 [PATCH v4 1/3] i2c: cadence: Document device tree bindings Soren Brinkmann
2014-04-03 17:59 ` [PATCH v4 2/3] i2c: Add driver for Cadence I2C controller Soren Brinkmann
2014-04-04 14:38 ` Wolfram Sang
2014-04-04 16:32 ` Sören Brinkmann [this message]
2014-04-03 17:59 ` [PATCH v4 3/3] ARM: zynq: dt: Add I2C nodes to Zynq device tree Soren Brinkmann
2014-04-03 19:51 ` [PATCH v4 1/3] i2c: cadence: Document device tree bindings Rob Herring
2014-04-03 20:15 ` Sören Brinkmann
2014-04-04 19:17 ` Gerhard Sittig
2014-04-04 20:57 ` Sören Brinkmann
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=53e29fb2-2a42-4cbf-9c15-490d81ee0de4@CH1EHSMHS005.ehs.local \
--to=soren.brinkmann@xilinx.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=grant.likely@linaro.org \
--cc=harinik@xilinx.com \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=michal.simek@xilinx.com \
--cc=mike.looijmans@topic.nl \
--cc=pawel.moll@arm.com \
--cc=rob@landley.net \
--cc=robh+dt@kernel.org \
--cc=wsa@the-dreams.de \
/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
all inboxes | Powered by JetHome®