From patchwork Mon Jul 6 19:24:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 491803 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 CB724140323 for ; Tue, 7 Jul 2015 05:30:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754916AbbGFT14 (ORCPT ); Mon, 6 Jul 2015 15:27:56 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:33603 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754258AbbGFT1r (ORCPT ); Mon, 6 Jul 2015 15:27:47 -0400 Received: by pdbdz6 with SMTP id dz6so15808088pdb.0 for ; Mon, 06 Jul 2015 12:27:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RkaGQocLFXiq2JZ3THYjhiAh/0PuzkIv9OIliG+UXCs=; b=g9J6nSHIaEBeQpLATnMCVgVWmncfZHsWa0C3tfVevs7LXeaNsAYFjg5D4HU98a/hUg 8CyJR+fU+XBMNyrS9mdfUJ294m/ZfkTOL4Az0P27/pElFnTkPlX6mmOrlet10WRyZ+W8 ofInS0oD6RzqNEFJ5Pvd60nK/2YF1MX5UC1H7g1tN5hhwbsZRa7O4s2u+1daV8rvPVHL b4ZpeC2N3VNKdpzRIUpz1L6HyTPdj01ZBT7Zyz8UQuuvmVMoB6v2UnkAjFT4Og+6c6Tk pr74UzQEInP/qfbk0fUY2aF4l1fTB6N27X5TB6a/8bxsr85/a1fCh8KsiYicL7U0+5A+ q84A== X-Gm-Message-State: ALoCoQlWcBg40x5dOEBvpnwjEncAOW1Evfx7v7yfXpbedNNN5x7GY4X/m24UTTzfEGWKrxGgr/Zb X-Received: by 10.69.10.196 with SMTP id ec4mr788471pbd.69.1436210866216; Mon, 06 Jul 2015 12:27:46 -0700 (PDT) Received: from localhost.localdomain ([202.62.77.106]) by mx.google.com with ESMTPSA id x7sm19293964pas.28.2015.07.06.12.27.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Jul 2015 12:27:45 -0700 (PDT) From: Vaibhav Hiremath To: linux-i2c@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, wsa@the-dreams.de, robert.jarzmik@free.fr, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, robh+dt@kernel.org, Vaibhav Hiremath , "Jett.Zhou" Subject: [PATCH-v3 02/11] i2c: pxa: No need to set slave addr for i2c master mode reset Date: Tue, 7 Jul 2015 00:54:46 +0530 Message-Id: <1436210695-19159-3-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436210695-19159-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1436210695-19159-1-git-send-email-vaibhav.hiremath@linaro.org> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Normally i2c controller works as master, so slave addr is not needed, or it will impact some slave device (eg. ST NFC chip) i2c accesses, because it has the same i2c address with controller. Signed-off-by: Jett.Zhou Signed-off-by: Vaibhav Hiremath Acked-by: Robert Jarzmik --- drivers/i2c/busses/i2c-pxa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index f4ac8c5..023e59f 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -459,7 +459,7 @@ static void i2c_pxa_reset(struct pxa_i2c *i2c) writel(I2C_ISR_INIT, _ISR(i2c)); writel(readl(_ICR(i2c)) & ~ICR_UR, _ICR(i2c)); - if (i2c->reg_isar) + if (i2c->reg_isar && IS_ENABLED(CONFIG_I2C_PXA_SLAVE)) writel(i2c->slave_addr, _ISAR(i2c)); /* set control register values */