From patchwork Thu May 28 13:03:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 49103 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B9BF1202A3 for ; Thu, 28 May 2015 13:06:38 +0000 (UTC) Received: by wifx6 with SMTP id x6sf13733559wif.1 for ; Thu, 28 May 2015 06:06:37 -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=REHOP0n8l/ZDTIsjQSolJ+NWyYiCl5f90t4U6KCMlhk=; b=g5yCA/wUqSLmIcndaZzb+InRMkBEyV9Xhu6TzkIMoZtLukf4ROVgJcXhAV9ttLKOhm ODMzc/Y7fXZLMeFS8KKGS1K0SxcEHYynuQuPCFlznGCs7tbQUicoa8iyyya37l7Zt6GQ kxh7DkhErrrTLEJ8H8m9PrQvTTnE6J1C5PeXH64Nz68jUKOCIRuYLUt2ino1cywxvPRc wSi+ZV5WuIHZgCKYNUfVwSiKyjX1Ipw0Ziqr0Si09SVxNIxce4yn8ljKHqXnTMRgUEcp apC+xiwGYUuN9x2Lq+1dcfVnYEijT9IoBanKNsnodeFd65Uu/OxDJnrFJXV6Eg4/RMXr Pvjw== X-Gm-Message-State: ALoCoQm+G6ECaCUx4Pr0ejXe9R+LZESSHmiB9TavdQRTGeiMDohsf2JRinh357+5iPRVV4IWUJa8 X-Received: by 10.112.162.228 with SMTP id yd4mr2600523lbb.8.1432818397859; Thu, 28 May 2015 06:06:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.195 with SMTP id g3ls196570lam.0.gmail; Thu, 28 May 2015 06:06:37 -0700 (PDT) X-Received: by 10.112.48.68 with SMTP id j4mr2688550lbn.60.1432818397714; Thu, 28 May 2015 06:06:37 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id x10si1895333lae.131.2015.05.28.06.06.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2015 06:06:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lagv1 with SMTP id v1so31191052lag.3 for ; Thu, 28 May 2015 06:06:37 -0700 (PDT) X-Received: by 10.112.163.168 with SMTP id yj8mr2739490lbb.36.1432818397611; Thu, 28 May 2015 06:06:37 -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 hn6csp1144206lbb; Thu, 28 May 2015 06:06:36 -0700 (PDT) X-Received: by 10.70.49.73 with SMTP id s9mr5199247pdn.149.1432818395721; Thu, 28 May 2015 06:06:35 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i4si3510427pdh.229.2015.05.28.06.06.34; Thu, 28 May 2015 06:06:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-i2c-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 S1753633AbbE1NGe (ORCPT + 1 other); Thu, 28 May 2015 09:06:34 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:32876 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752212AbbE1NGd (ORCPT ); Thu, 28 May 2015 09:06:33 -0400 Received: by padbw4 with SMTP id bw4so23204461pad.0 for ; Thu, 28 May 2015 06:06:33 -0700 (PDT) X-Received: by 10.70.96.194 with SMTP id du2mr5469347pdb.108.1432818393271; Thu, 28 May 2015 06:06:33 -0700 (PDT) Received: from localhost.localdomain ([202.62.77.106]) by mx.google.com with ESMTPSA id dc5sm2392557pbc.53.2015.05.28.06.06.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 May 2015 06:06:32 -0700 (PDT) From: Vaibhav Hiremath To: linux-i2c@vger.kernel.org Cc: Wolfram Sang , linux-arm-kernel@lists.infradead.org, "Jett.Zhou" , Vaibhav Hiremath Subject: [PATCH 02/12] i2c: pxa: No need to set slave addr for i2c master mode reset Date: Thu, 28 May 2015 18:33:34 +0530 Message-Id: <1432818224-17070-3-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432818224-17070-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1432818224-17070-1-git-send-email-vaibhav.hiremath@linaro.org> Sender: linux-i2c-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-i2c@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.215.46 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: , From: "Jett.Zhou" 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 [vaibhav.hiremath@linaro.org: Updated Changelog] Signed-off-by: Vaibhav Hiremath Cc: Wolfram Sang Signed-off-by: Vaibhav Hiremath --- drivers/i2c/busses/i2c-pxa.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index f4ac8c5..d4c798a 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -459,8 +459,10 @@ static void i2c_pxa_reset(struct pxa_i2c *i2c) writel(I2C_ISR_INIT, _ISR(i2c)); writel(readl(_ICR(i2c)) & ~ICR_UR, _ICR(i2c)); +#ifdef CONFIG_I2C_PXA_SLAVE if (i2c->reg_isar) writel(i2c->slave_addr, _ISAR(i2c)); +#endif /* set control register values */ writel(I2C_ICR_INIT | (i2c->fast_mode ? ICR_FM : 0), _ICR(i2c));