From patchwork Tue Mar 15 19:58:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Green X-Patchwork-Id: 606 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:44:05 -0000 Delivered-To: patches@linaro.org Received: by 10.151.46.5 with SMTP id y5cs80536ybj; Tue, 15 Mar 2011 12:58:09 -0700 (PDT) Received: by 10.227.140.23 with SMTP id g23mr9559469wbu.46.1300219088903; Tue, 15 Mar 2011 12:58:08 -0700 (PDT) Received: from mail-ww0-f42.google.com (mail-ww0-f42.google.com [74.125.82.42]) by mx.google.com with ESMTPS id j7si329675wbc.19.2011.03.15.12.58.07 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 Mar 2011 12:58:07 -0700 (PDT) Received-SPF: pass (google.com: domain of andy.warmcat.com@googlemail.com designates 74.125.82.42 as permitted sender) client-ip=74.125.82.42; Authentication-Results: mx.google.com; spf=pass (google.com: domain of andy.warmcat.com@googlemail.com designates 74.125.82.42 as permitted sender) smtp.mail=andy.warmcat.com@googlemail.com; dkim=pass (test mode) header.i=@googlemail.com Received: by wwk4 with SMTP id 4so3300171wwk.1 for ; Tue, 15 Mar 2011 12:58:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:sender:from:subject:to:cc:date:message-id :in-reply-to:references:user-agent:mime-version:content-type :content-transfer-encoding; bh=UE3XtJE+dALxXLg8ScAYhyBwmkLS+j3KtwAFwtAk+EI=; b=pGH0CSl40uacYyVeQUBFQNhQ2gkRJNFG4W8AeTam3ZUkPvSsH4DjaEH+wR4BQTUJE9 XkAyC8Gf0qBUo9MfchHBeA+AOPYRsiOHyXAmsHtVUypoPbfQLjIGfPpltb5+6Og+OuVc nRSz5jt3qW/dQb6T09nx5edCV296ShGZGHxV4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=sender:from:subject:to:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; b=BdGWZngUpC6GTOQWG4j1Dvj+8wJFFOCZrlXBPF3jXwukdPfmduIx+d6lPOo/EC6JUS QnwAcItbOACt9pHTyb/G1dZCzKF7t7geHuSGRNEVL8qZXeURQP6HB071XxDAYhC0lwWJ 71TaMrCqO9bFhSrj/k/0PrDpWnKD0IZrpGNys= Received: by 10.216.182.212 with SMTP id o62mr4070407wem.52.1300219087078; Tue, 15 Mar 2011 12:58:07 -0700 (PDT) Received: from otae.warmcat.com (s15404224.onlinehome-server.info [87.106.134.80]) by mx.google.com with ESMTPS id b54sm109258wer.21.2011.03.15.12.58.06 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 Mar 2011 12:58:06 -0700 (PDT) Sender: Andy Green From: Andy Green Subject: [PATCH 3 18/18] I2C: OMAP1/OMAP2+: prepend I2C IP version to probed version shown in dev_info To: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Cc: patches@linaro.org, Ben Dooks , Andy Green Date: Tue, 15 Mar 2011 19:58:04 +0000 Message-ID: <20110315195804.30000.70399.stgit@otae.warmcat.com> In-Reply-To: <20110315195147.30000.86184.stgit@otae.warmcat.com> References: <20110315195147.30000.86184.stgit@otae.warmcat.com> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 The IP version is prepended to the existing printed probed version as an "epoch" version. Cc: patches@linaro.org Cc: Ben Dooks Reported-by: Peter Maydell Signed-off-by: Andy Green --- drivers/i2c/busses/i2c-omap.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index c997c55..d53cd61 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -1093,8 +1093,8 @@ omap_i2c_probe(struct platform_device *pdev) goto err_unuse_clocks; } - dev_info(dev->dev, "bus %d rev%d.%d at %d kHz\n", - pdev->id, dev->rev >> 4, dev->rev & 0xf, dev->speed); + dev_info(dev->dev, "bus %d rev%d.%d.%d at %d kHz\n", pdev->id, + pdata->rev, dev->rev >> 4, dev->rev & 0xf, dev->speed); omap_i2c_idle(dev);