From patchwork Tue Jul 14 07:36:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 51086 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0B018202B9 for ; Tue, 14 Jul 2015 07:39:32 +0000 (UTC) Received: by lafd3 with SMTP id d3sf523127laf.1 for ; Tue, 14 Jul 2015 00:39:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=ZfY2Au9gu2pZK7JN3mzII98aQeIf7v7RE0+/Z6YHPNk=; b=N1PQj8N6/m7czNUnAELm06lbSs4Y0RT7XWzyCp2ri5/HtXgYWK4+ae1GaKVYMCdrp8 ewcgC5sxECNIp3g8bnUNwW6QaY6eOVTGuvtYaC6LQlaCs9Mpq2UKdi/9QsaPdAyLfApK UrMZkQXvsG5mq+FgfdxgBRFmBSlDpX9h43FI/AxCEBsEwnTlY3fqcsOrEhIft7JOsahG bE9x+D5Az//+piSEpFXem1oZpIJSQbjA/CNzNvF1yZsw71JV3PzwkeyaPAeWktTBYehs Gp2rpsyHOBW1rvJEUgbAaMPWyBJWmHiZ9bnCewfyDbkkmPpHcpG/XNQuyXVFXRYYLsjG 4QYg== X-Gm-Message-State: ALoCoQmXLpuMqae6IvKO4go9OrHsOYKIWC2Zj/ejK8PrlBXXFJLbusADsMpWdYnPZNOZPtDzgLdD X-Received: by 10.180.77.225 with SMTP id v1mr9335935wiw.5.1436859570790; Tue, 14 Jul 2015 00:39:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.7.136 with SMTP id dc8ls7733lad.101.gmail; Tue, 14 Jul 2015 00:39:30 -0700 (PDT) X-Received: by 10.112.24.71 with SMTP id s7mr35318353lbf.37.1436859570588; Tue, 14 Jul 2015 00:39:30 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id ll10si167443lac.26.2015.07.14.00.39.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Jul 2015 00:39:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbbyj8 with SMTP id yj8so1106219lbb.0 for ; Tue, 14 Jul 2015 00:39:30 -0700 (PDT) X-Received: by 10.112.120.134 with SMTP id lc6mr9528114lbb.86.1436859570036; Tue, 14 Jul 2015 00:39:30 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp2195022lbb; Tue, 14 Jul 2015 00:39:28 -0700 (PDT) X-Received: by 10.70.1.102 with SMTP id 6mr77246379pdl.32.1436859568221; Tue, 14 Jul 2015 00:39:28 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h4si328330pda.83.2015.07.14.00.39.27; Tue, 14 Jul 2015 00:39:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753197AbbGNHjV (ORCPT + 26 others); Tue, 14 Jul 2015 03:39:21 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:33988 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753115AbbGNHjQ (ORCPT ); Tue, 14 Jul 2015 03:39:16 -0400 Received: by pacan13 with SMTP id an13so1349473pac.1 for ; Tue, 14 Jul 2015 00:39:16 -0700 (PDT) X-Received: by 10.66.65.138 with SMTP id x10mr35653442pas.15.1436859556281; Tue, 14 Jul 2015 00:39:16 -0700 (PDT) Received: from localhost.localdomain ([202.62.77.106]) by smtp.gmail.com with ESMTPSA id pe3sm275937pdb.55.2015.07.14.00.39.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Jul 2015 00:39:15 -0700 (PDT) From: Vaibhav Hiremath To: linux-i2c@vger.kernel.org Cc: wsa@the-dreams.de, robh+dt@kernel.org, robert.jarzmik@free.fr, yizhang@marvell.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Vaibhav Hiremath , "Jett.Zhou" Subject: [PATCH-v4 02/11] i2c: pxa: No need to set slave addr for i2c master mode reset Date: Tue, 14 Jul 2015 13:06:41 +0530 Message-Id: <1436859410-28878-3-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436859410-28878-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1436859410-28878-1-git-send-email-vaibhav.hiremath@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: vaibhav.hiremath@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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. For example, On the pxa1928 based platform, where PMIC (88pm860) is present @0x30 address on TWSI0 interface, and if we set 0x30 as a slave address in pxa1928 TWSI0 module, all the transactions towards PMIC would go for toss. 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 */