From patchwork Wed Mar 16 07:20:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Green X-Patchwork-Id: 636 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:14 -0000 Delivered-To: patches@linaro.org Received: by 10.151.46.5 with SMTP id y5cs1301ybj; Wed, 16 Mar 2011 00:20:31 -0700 (PDT) Received: by 10.216.144.166 with SMTP id n38mr4457298wej.75.1300260030353; Wed, 16 Mar 2011 00:20:30 -0700 (PDT) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id e7si1130422wer.165.2011.03.16.00.20.29 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Mar 2011 00:20:30 -0700 (PDT) Received-SPF: pass (google.com: domain of andy.warmcat.com@googlemail.com designates 74.125.82.178 as permitted sender) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of andy.warmcat.com@googlemail.com designates 74.125.82.178 as permitted sender) smtp.mail=andy.warmcat.com@googlemail.com; dkim=pass (test mode) header.i=@googlemail.com Received: by mail-wy0-f178.google.com with SMTP id 26so1558835wyj.37 for ; Wed, 16 Mar 2011 00:20:29 -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=Kq6iMbxTchNAa8/ztLzUdmOdISJxEZKuBl91wP7xqWts9WZ9jmTZUxhJQspkbur5wN P091tmqFGvyf6clZpiPgbFloiDFxt1kkQs1upIL0zZ3iwfYXU2+jR9AUOkNozQP5/Yfk ie8FSj1sTF2sSrc1bN2DRiu7VxOGgvoaoI4eQ= 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=qfpxuQ6I39D3ewP6AZH3qVtt595DfSnpqJPKIAgX7vgT7rRboRVdRD2kF1ya36DYFS D/slzhVDoqUpGlgkczQNaLHsTpXix3dvlxqNLssHQUQ5kOIrxa06vldC3tELLPDsm5cr qFgFWNQSMjOws5W4iHOUO24OOkyx/fxMSgIoE= Received: by 10.227.199.210 with SMTP id et18mr395647wbb.227.1300260029478; Wed, 16 Mar 2011 00:20:29 -0700 (PDT) Received: from otae.warmcat.com (cpc1-nrte21-2-0-cust677.8-4.cable.virginmedia.com [81.111.78.166]) by mx.google.com with ESMTPS id bd8sm779596wbb.13.2011.03.16.00.20.28 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 16 Mar 2011 00:20:29 -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-i2c@lists.infradead.org Cc: patches@linaro.org, Ben Dooks , Andy Green Date: Wed, 16 Mar 2011 07:20:27 +0000 Message-ID: <20110316072027.453.66618.stgit@otae.warmcat.com> In-Reply-To: <20110316071633.453.22228.stgit@otae.warmcat.com> References: <20110316071633.453.22228.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);