From patchwork Tue Mar 8 11:09:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Green X-Patchwork-Id: 436 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:42:39 -0000 Delivered-To: patches@linaro.org Received: by 10.224.60.68 with SMTP id o4cs23984qah; Tue, 8 Mar 2011 03:09:38 -0800 (PST) Received: by 10.213.27.146 with SMTP id i18mr3478654ebc.94.1299582577929; Tue, 08 Mar 2011 03:09:37 -0800 (PST) Received: from mail-ey0-f178.google.com (mail-ey0-f178.google.com [209.85.215.178]) by mx.google.com with ESMTPS id t3si1350465eeh.56.2011.03.08.03.09.37 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Mar 2011 03:09:37 -0800 (PST) Received-SPF: pass (google.com: domain of andy.warmcat.com@googlemail.com designates 209.85.215.178 as permitted sender) client-ip=209.85.215.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of andy.warmcat.com@googlemail.com designates 209.85.215.178 as permitted sender) smtp.mail=andy.warmcat.com@googlemail.com; dkim=pass (test mode) header.i=@googlemail.com Received: by mail-ey0-f178.google.com with SMTP id 25so2180740eya.37 for ; Tue, 08 Mar 2011 03:09:37 -0800 (PST) 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=YFYgYxjhqh5f9LapgBVjq6xSWDtY/89ZzWE6ycuAcK66TllssV6itKKWGqR83+SUt6 v540i5PRInd4T7vGCXyWKnJ8Z82BNdRQc08EmU1eN/TUMwoqz5pd/qrlHk3/jKUSCF5B Zyt1mQ+JRMfbRtLDfobUc7Up4YNhkjWjzHF1E= 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=yFJrp3AZRVscRpGmkeTwqeZu/HfqRi3CnYLvoCdR8egY5vgD+CKe+Sf/LxbRs8EDz+ o3SnD+QyBP3CwPIiIAYJ9GO3tGSPj/s/FqcGNIxv0xEcb/3fIfuE5AREgOqmLUxaIIXN NDrTekjlI6hDdCwXgmKhLrQU1Mm/Fljv7dwQY= Received: by 10.216.191.232 with SMTP id g82mr4080827wen.24.1299582576989; Tue, 08 Mar 2011 03:09:36 -0800 (PST) Received: from otae.warmcat.com (s15404224.onlinehome-server.info [87.106.134.80]) by mx.google.com with ESMTPS id d54sm253805wej.10.2011.03.08.03.09.35 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 Mar 2011 03:09:36 -0800 (PST) Sender: Andy Green From: Andy Green Subject: [PATCH 2 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, 08 Mar 2011 11:09:34 +0000 Message-ID: <20110308110934.23531.70384.stgit@otae.warmcat.com> In-Reply-To: <20110308105934.23531.83540.stgit@otae.warmcat.com> References: <20110308105934.23531.83540.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);