From patchwork Mon Jun 15 15:49:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 6610251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9E4DBC0020 for ; Mon, 15 Jun 2015 15:56:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DAFCA20552 for ; Mon, 15 Jun 2015 15:56:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6226F205DA for ; Mon, 15 Jun 2015 15:56:47 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z4WiT-0000LM-26; Mon, 15 Jun 2015 15:54:29 +0000 Received: from mail-pd0-f177.google.com ([209.85.192.177]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z4Whi-0008UA-PZ for linux-arm-kernel@lists.infradead.org; Mon, 15 Jun 2015 15:53:43 +0000 Received: by pdjn11 with SMTP id n11so75764051pdj.0 for ; Mon, 15 Jun 2015 08:53:21 -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=ziOtr6zR0DSicaYepg06dC52xDm2mfrqQgK61cMjuL8=; b=VpbYq7guF29sT2LhTrhxq9cOkIwTlnaFndcidZfued8o+WDC71TWRGZ3Mn8jszO1kp 7yGbTBKOukfvZ45bFdR47CD7R4PmF3KWZ6erfXTlN/Cnidbcb+xJUO6rt/qjw+ZN2f1+ +nD97nT3M+Zzej+ZiMf/HK7zVpYIIG6ykjE9zApEqpLyVxkzUiS+pzXcbwavz573ql// 5LtKtqnHkj5ocVTLmEbD5M1GsxFmS6t9Ch0/FulZB2p1lEVpQ0Mnh4UHFogSC2jmDt8I WeN2QLiszSLXEYKqtkiQcN5uEQ7zCWtXF+UimQwsv81gEdsgjicRi+guM49lHsL//iR5 +f9g== X-Gm-Message-State: ALoCoQnAC6+6Gk3slyI/ZF08a7PkLQr29jLzSKkPIW4WFf/IdXJpWFLQiMA6rQW3rgAVtA2ZDcYB X-Received: by 10.68.135.136 with SMTP id ps8mr50274532pbb.78.1434383601706; Mon, 15 Jun 2015 08:53:21 -0700 (PDT) Received: from localhost.localdomain ([202.62.77.106]) by mx.google.com with ESMTPSA id fs16sm12662484pdb.12.2015.06.15.08.53.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Jun 2015 08:53:20 -0700 (PDT) From: Vaibhav Hiremath To: linux-i2c@vger.kernel.org Subject: [PATCH-V2 02/12] i2c: pxa: No need to set slave addr for i2c master mode reset Date: Mon, 15 Jun 2015 21:19:49 +0530 Message-Id: <1434383399-2370-3-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1434383399-2370-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1434383399-2370-1-git-send-email-vaibhav.hiremath@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150615_085342_928014_A7F459D0 X-CRM114-Status: UNSURE ( 9.14 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: "Jett.Zhou" , robert.jarzmik@free.fr, Vaibhav Hiremath , linux-arm-kernel@lists.infradead.org, wsa@the-dreams.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Wolfram Sang 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 */