From patchwork Fri Jul 31 12:00:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert ABEL X-Patchwork-Id: 502511 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6BC411402CD for ; Fri, 31 Jul 2015 22:07:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751101AbbGaMHW (ORCPT ); Fri, 31 Jul 2015 08:07:22 -0400 Received: from smarthost.TechFak.Uni-Bielefeld.DE ([129.70.137.17]:44784 "EHLO smarthost.TechFak.Uni-Bielefeld.DE" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751174AbbGaMHW (ORCPT ); Fri, 31 Jul 2015 08:07:22 -0400 Received: from knoppers.TechFak.Uni-Bielefeld.DE (knoppers.TechFak.Uni-Bielefeld.DE [129.70.129.230]) (Authenticated sender: rabel) by smarthost.TechFak.Uni-Bielefeld.DE (Postfix) with ESMTPA id F24DC80034; Fri, 31 Jul 2015 14:00:43 +0200 (CEST) From: Robert ABEL To: wsa@the-dreams.de, linux-i2c@vger.kernel.org Cc: michal.simek@xilinx.com, Robert ABEL Subject: [PATCH 5/6] i2c: Xilinx IIC: make reset after TX error configurable Date: Fri, 31 Jul 2015 14:00:33 +0200 Message-Id: <1438344034-20211-7-git-send-email-rabel@cit-ec.uni-bielefeld.de> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1438344034-20211-1-git-send-email-rabel@cit-ec.uni-bielefeld.de> References: <1438344034-20211-1-git-send-email-rabel@cit-ec.uni-bielefeld.de> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org CONFIG_I2C_XILINX_ERRATA makes resetting XIIC after every Master Transmit error configurable. Also mention proper module name for XIIC kernel module. Signed-off-by: Robert ABEL --- drivers/i2c/busses/Kconfig | 9 ++++++++- drivers/i2c/busses/i2c-xiic.c | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 46d5488..3255e89 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -886,7 +886,14 @@ config I2C_XILINX Xilinx I2C controller. This driver can also be built as a module. If so, the module - will be called xilinx_i2c. + will be called i2c-xiic. + +config I2C_XILINX_ERRATA + bool "Reset on " + depends on I2C_XILINX + help + By enabling this option, the Xilinx I2C Controller will be reset + after Master Transmit Errors. config I2C_XLR tristate "XLR I2C support" diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index 5c9897e..6a834bc 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c @@ -509,6 +509,15 @@ static irqreturn_t xiic_process(int irq, void *dev_id) break; } +#if defined(CONFIG_I2C_XILINX_ERRATA) + if (!(msg->flags & I2C_M_RD)) { + /* dynamic mode seem to suffer from problems if we just flush + * fifos and the next message is a TX with len 0 (only addr) + * reset the IP instead of just flushing fifos + */ + xiic_reinit(i2c); + } +#endif } /* Receive FIFO is full */