From patchwork Wed Apr 5 10:32:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96816 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp196064qgd; Wed, 5 Apr 2017 03:33:33 -0700 (PDT) X-Received: by 10.98.72.147 with SMTP id q19mr28774119pfi.253.1491388413898; Wed, 05 Apr 2017 03:33:33 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f16si20271056pli.143.2017.04.05.03.33.33; Wed, 05 Apr 2017 03:33:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933410AbdDEKda (ORCPT + 6 others); Wed, 5 Apr 2017 06:33:30 -0400 Received: from mail-pg0-f48.google.com ([74.125.83.48]:35080 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933059AbdDEKdZ (ORCPT ); Wed, 5 Apr 2017 06:33:25 -0400 Received: by mail-pg0-f48.google.com with SMTP id 81so6024339pgh.2 for ; Wed, 05 Apr 2017 03:32:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lRttNU9zl7m+OOHtrXYozdnODA3bc/VkKLtfQ5BIhq8=; b=bjqkDJz/2HxfFt8FPl5+gSGjX577SvZDpPLWnwwKjOxHiWPk0u0eF9IO55GOeTwbQA 1w2XRNIkuFLIuh1B+82SAz4UEWsGmwwSz4v8DHUaEpI0CXRIU9y4Hj/kk9BA/cHF9tex JMT86qv17zHdeYYJxQRT2C0UiHxsjrrqnCo9U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lRttNU9zl7m+OOHtrXYozdnODA3bc/VkKLtfQ5BIhq8=; b=iG2fWcjbLgRoWmPKUErPYGPrnjNCgxQDG2IgzOCleTySZFcVA6211oT13M1qp2j0EL zoNRvUEY7SNTPHOB4PlGj6PyqwNNPY868WLtnwDWrwdD4TB2K2RWg9TMeyOUpjK+O0+w p5L4s12V4u4DlGcGhMHpoDUtrG4t5dY4Ap/NCRJ549jw65R8wP2ExkVF/YvMb/Q6q+wC IE4TNPkZByN+yYKpAU7BOdDBn/ofSFjSMxHvaX8T7mvtdfVgkF96dbMG69jxliB6WO9X SAMDSTgdQKQglg3n0tlajgOK/8rLbNIi6cbjEnmhcbby17wetWKvdTbJCiqSje8/c6d6 1UOA== X-Gm-Message-State: AFeK/H2zi9gj6Pj59HdRBUAnmm/feYb+iPeUBedQ7ZO2z+0V7ct5yigXWX6f8HcAD48tXptW X-Received: by 10.98.129.195 with SMTP id t186mr28669383pfd.130.1491388365227; Wed, 05 Apr 2017 03:32:45 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id a62sm36732075pgc.60.2017.04.05.03.32.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 03:32:44 -0700 (PDT) From: Amit Pundir To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, =?utf-8?q?Noralf_Tr=C3=B8nnes?= , Wolfram Sang Subject: [PATCH v2 for-4.9 08/32] i2c: bcm2835: Can't support I2C_M_IGNORE_NAK Date: Wed, 5 Apr 2017 16:02:00 +0530 Message-Id: <1491388344-13521-9-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491388344-13521-1-git-send-email-amit.pundir@linaro.org> References: <1491388344-13521-1-git-send-email-amit.pundir@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Noralf Trønnes The controller can't support this flag, so remove it. Documentation/i2c/i2c-protocol states that all of the message is sent: I2C_M_IGNORE_NAK: Normally message is interrupted immediately if there is [NA] from the client. Setting this flag treats any [NA] as [A], and all of message is sent. >From the BCM2835 ARM Peripherals datasheet: The ERR field is set when the slave fails to acknowledge either its address or a data byte written to it. So when the controller doesn't receive an ack, it sets ERR and raises an interrupt. In other words, the whole message is not sent. Signed-off-by: Noralf Trønnes Reviewed-by: Eric Anholt Signed-off-by: Wolfram Sang (cherry picked from commit 8d2cc5cc6ee5c0fc48a96bb29af55fc700f66fdf) Signed-off-by: Amit Pundir --- drivers/i2c/busses/i2c-bcm2835.c | 4 ---- 1 file changed, 4 deletions(-) -- 2.7.4 diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c index 54d510a..565ef69 100644 --- a/drivers/i2c/busses/i2c-bcm2835.c +++ b/drivers/i2c/busses/i2c-bcm2835.c @@ -212,10 +212,6 @@ static int bcm2835_i2c_xfer_msg(struct bcm2835_i2c_dev *i2c_dev, if (likely(!i2c_dev->msg_err)) return 0; - if ((i2c_dev->msg_err & BCM2835_I2C_S_ERR) && - (msg->flags & I2C_M_IGNORE_NAK)) - return 0; - dev_dbg(i2c_dev->dev, "i2c transfer failed: %x\n", i2c_dev->msg_err); if (i2c_dev->msg_err & BCM2835_I2C_S_ERR)