From patchwork Sun Jun 9 02:36:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 17702 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7CEAC25E12 for ; Sun, 9 Jun 2013 02:38:28 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id ha12sf326857vcb.8 for ; Sat, 08 Jun 2013 19:38:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=WFOV5UC7rj8x/zM4mtKzAtM6143t2UTRTWpKqBrNk2c=; b=MEct7A/BdZligQDn4TU9MIwqqNSr+dP5Wkr9JH6YAaKDfwj9QrZfrHQyHEx9r/Izr7 aWJQ56K9CJKWXpm/fxyEcYBmZM8LANI875Hto5R8VJke2L26zFBPJX+gYQFmU56X0HKh tCSDSIHduZSi1dp7yZvvE0UksCBOmlGZlpSadUF6wCOQJlmD6ZWQAiXiZxXNllbeiAHH 1CtIXamU14BQHiSsMNburuJQLrmlng4KDWNF7cU9QMm/HIZamJyJXJSix4XFSY+dUNEU tzJ0Y4JJm+m5Q0HDkMZ7JgWPoeZ8R1BgfspWY03Z4gspbmzDDHf4R9LQDU9jWU1eIwlW yt9w== X-Received: by 10.224.36.66 with SMTP id s2mr5020813qad.6.1370745508156; Sat, 08 Jun 2013 19:38:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.12.143 with SMTP id y15ls2292585qeb.82.gmail; Sat, 08 Jun 2013 19:38:28 -0700 (PDT) X-Received: by 10.220.94.1 with SMTP id x1mr2532408vcm.12.1370745507966; Sat, 08 Jun 2013 19:38:27 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id cp2si1515449vcb.73.2013.06.08.19.38.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 08 Jun 2013 19:38:27 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hz10so3701945vcb.10 for ; Sat, 08 Jun 2013 19:38:27 -0700 (PDT) X-Received: by 10.220.170.72 with SMTP id c8mr2579773vcz.14.1370745507817; Sat, 08 Jun 2013 19:38:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.10.206 with SMTP id pb14csp28052vcb; Sat, 8 Jun 2013 19:38:27 -0700 (PDT) X-Received: by 10.66.4.106 with SMTP id j10mr8774223paj.218.1370745506855; Sat, 08 Jun 2013 19:38:26 -0700 (PDT) Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by mx.google.com with ESMTPS id ln2si4488201pab.344.2013.06.08.19.38.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 08 Jun 2013 19:38:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.173 is neither permitted nor denied by best guess record for domain of zhangfei.gao@linaro.org) client-ip=209.85.192.173; Received: by mail-pd0-f173.google.com with SMTP id v14so2322693pde.4 for ; Sat, 08 Jun 2013 19:38:26 -0700 (PDT) X-Received: by 10.66.21.37 with SMTP id s5mr2386244pae.103.1370745506483; Sat, 08 Jun 2013 19:38:26 -0700 (PDT) Received: from localhost.localdomain ([124.73.8.29]) by mx.google.com with ESMTPSA id xu10sm9578181pab.3.2013.06.08.19.38.22 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 08 Jun 2013 19:38:25 -0700 (PDT) From: Zhangfei Gao To: Wolfram Sang , Dirk Brandewie Cc: linux-arm-kernel@lists.infradead.org, Zhangfei Gao Subject: [PATCH 1/2] i2c-designware: support no DW_IC_COMP_TYPE platform Date: Sun, 9 Jun 2013 10:36:41 +0800 Message-Id: <1370745402-11844-2-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1370745402-11844-1-git-send-email-zhangfei.gao@linaro.org> References: <1370745402-11844-1-git-send-email-zhangfei.gao@linaro.org> X-Gm-Message-State: ALoCoQmQ+kpuu7/RwKOdnUph1RDSqCgM7vIZ+CMQ2ypHgOmWfREoSryICXc/qlbUDXYeFQbK2SzQ X-Original-Sender: zhangfei.gao@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Check accessor_flags before reading DW_IC_COMP_TYPE Give chance to platform no such register Signed-off-by: Zhangfei Gao --- drivers/i2c/busses/i2c-designware-core.c | 24 +++++++++++++----------- drivers/i2c/busses/i2c-designware-core.h | 1 + 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c index c41ca63..80cabbd 100644 --- a/drivers/i2c/busses/i2c-designware-core.c +++ b/drivers/i2c/busses/i2c-designware-core.c @@ -286,17 +286,19 @@ int i2c_dw_init(struct dw_i2c_dev *dev) input_clock_khz = dev->get_clk_rate_khz(dev); - reg = dw_readl(dev, DW_IC_COMP_TYPE); - if (reg == ___constant_swab32(DW_IC_COMP_TYPE_VALUE)) { - /* Configure register endianess access */ - dev->accessor_flags |= ACCESS_SWAP; - } else if (reg == (DW_IC_COMP_TYPE_VALUE & 0x0000ffff)) { - /* Configure register access mode 16bit */ - dev->accessor_flags |= ACCESS_16BIT; - } else if (reg != DW_IC_COMP_TYPE_VALUE) { - dev_err(dev->dev, "Unknown Synopsys component type: " - "0x%08x\n", reg); - return -ENODEV; + if (!dev->accessor_flags) { + reg = dw_readl(dev, DW_IC_COMP_TYPE); + if (reg == ___constant_swab32(DW_IC_COMP_TYPE_VALUE)) { + /* Configure register endianess access */ + dev->accessor_flags |= ACCESS_SWAP; + } else if (reg == (DW_IC_COMP_TYPE_VALUE & 0x0000ffff)) { + /* Configure register access mode 16bit */ + dev->accessor_flags |= ACCESS_16BIT; + } else if (reg != DW_IC_COMP_TYPE_VALUE) { + dev_err(dev->dev, "Unknown Synopsys component type: " + "0x%08x\n", reg); + return -ENODEV; + } } /* Disable the adapter */ diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index e761ad1..b38b54e 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -94,6 +94,7 @@ struct dw_i2c_dev { #define ACCESS_SWAP 0x00000001 #define ACCESS_16BIT 0x00000002 +#define ACCESS_32BIT 0x00000004 extern u32 dw_readl(struct dw_i2c_dev *dev, int offset); extern void dw_writel(struct dw_i2c_dev *dev, u32 b, int offset);