summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorFabio Baltieri <fabio.baltieri@linaro.org>2013-02-20 12:29:16 +0400
committerOlof Johansson <olof@lixom.net>2013-05-10 00:10:08 +0400
commit33c8abcee7e6c0828c9c76114e11e31fbcaec4e9 (patch)
treeabc13cdc5f99fe99d23a812067f3ce1e27698591 /arch
parentee99ce89d7597db221219cbd899581c46613ca13 (diff)
downloadlinux-33c8abcee7e6c0828c9c76114e11e31fbcaec4e9.tar.xz
ARM: ux500: read the correct soc_id number
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 <fabio.baltieri@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 995928ba22fd..e90b5ab23b6d 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -191,7 +191,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));
}