From patchwork Wed Feb 20 08:29:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 15003 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id D870223F7B for ; Wed, 20 Feb 2013 08:29:42 +0000 (UTC) Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com [209.85.212.50]) by fiordland.canonical.com (Postfix) with ESMTP id 4AAB5A184FD for ; Wed, 20 Feb 2013 08:29:42 +0000 (UTC) Received: by mail-vb0-f50.google.com with SMTP id ft2so4760641vbb.23 for ; Wed, 20 Feb 2013 00:29:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=Dmr15XzXjeTDV7gnSVYuyFifS/vTvNDL3hzQQ64bcaw=; b=cXsu4ztjebRF4npuUrSIW5Q0278rJ2+qYLUeDHaLFVl4rvsfkplGNZrk2PPUwtMkFM aFlnew/HVhVBJLMUBi3r0uZIwD1TWSonHKWDvgM2Xc51kkoLff8YBYQY0DumDjXKaSxT TmrAVt42liM5F8oYQlZlhMaSyhWKx+QvXKEv4fl5PhRQmVep55uRdGSxZd89x11diE1Q V9ATsKMSGKl3bzI/0m1sJeyn5AfQlzum7opz89wRRH0duXZSb3+XmS1Oi7yy4IS96chD XdhhbdmjlUl8ATHMUGLLOR+ASIdDoK8M31a+v/TluuJN43wfJQAebG8DebH57PNIuzG5 PDhQ== X-Received: by 10.52.93.235 with SMTP id cx11mr21045340vdb.51.1361348981794; Wed, 20 Feb 2013 00:29:41 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp185449veb; Wed, 20 Feb 2013 00:29:41 -0800 (PST) X-Received: by 10.180.95.66 with SMTP id di2mr32474304wib.18.1361348980767; Wed, 20 Feb 2013 00:29:40 -0800 (PST) Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com [74.125.83.41]) by mx.google.com with ESMTPS id r7si44998621eeo.78.2013.02.20.00.29.40 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 20 Feb 2013 00:29:40 -0800 (PST) Received-SPF: neutral (google.com: 74.125.83.41 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=74.125.83.41; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.83.41 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) smtp.mail=fabio.baltieri@linaro.org Received: by mail-ee0-f41.google.com with SMTP id c13so4100477eek.28 for ; Wed, 20 Feb 2013 00:29:40 -0800 (PST) X-Received: by 10.14.201.5 with SMTP id a5mr66886517eeo.17.1361348980118; Wed, 20 Feb 2013 00:29:40 -0800 (PST) Received: from localhost ([2a01:2003:1:1e91:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPS id t4sm107944737eel.0.2013.02.20.00.29.34 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 20 Feb 2013 00:29:39 -0800 (PST) From: Fabio Baltieri To: Linus Walleij , Srinidhi Kasagar Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Fabio Baltieri Subject: [PATCH] ARM: ux500: read the correct soc_id number Date: Wed, 20 Feb 2013 09:29:16 +0100 Message-Id: <1361348956-4387-1-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.7.12.1 X-Gm-Message-State: ALoCoQm5wpqFRScJ57aggzGXic1rn7bDgxO7pyZSP2sjKA6ypqwvl3U9DAfd/XVpfo5bEqLa5ZeS Fix db8500_read_soc_id() to read all five soc_id number locations instead of repeating the second one two times. Signed-off-by: Fabio Baltieri --- arch/arm/mach-ux500/cpu-db8500.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 5b286e0..4b5602b 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -199,7 +199,7 @@ static const char *db8500_read_soc_id(void) /* Throw these device-specific numbers into the entropy pool */ add_device_randomness(uid, 0x14); return kasprintf(GFP_KERNEL, "%08x%08x%08x%08x%08x", - readl((u32 *)uid+1), + readl((u32 *)uid+0), readl((u32 *)uid+1), readl((u32 *)uid+2), readl((u32 *)uid+3), readl((u32 *)uid+4)); }