diff options
author | Fabio Baltieri <fabio.baltieri@linaro.org> | 2013-02-20 03:29:16 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-05-09 16:10:08 -0400 |
commit | 33c8abcee7e6c0828c9c76114e11e31fbcaec4e9 (patch) | |
tree | abc13cdc5f99fe99d23a812067f3ce1e27698591 /arch/arm/mach-ux500 | |
parent | ee99ce89d7597db221219cbd899581c46613ca13 (diff) |
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/arm/mach-ux500')
-rw-r--r-- | arch/arm/mach-ux500/cpu-db8500.c | 2 |
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) | |||
191 | /* Throw these device-specific numbers into the entropy pool */ | 191 | /* Throw these device-specific numbers into the entropy pool */ |
192 | add_device_randomness(uid, 0x14); | 192 | add_device_randomness(uid, 0x14); |
193 | return kasprintf(GFP_KERNEL, "%08x%08x%08x%08x%08x", | 193 | return kasprintf(GFP_KERNEL, "%08x%08x%08x%08x%08x", |
194 | readl((u32 *)uid+1), | 194 | readl((u32 *)uid+0), |
195 | readl((u32 *)uid+1), readl((u32 *)uid+2), | 195 | readl((u32 *)uid+1), readl((u32 *)uid+2), |
196 | readl((u32 *)uid+3), readl((u32 *)uid+4)); | 196 | readl((u32 *)uid+3), readl((u32 *)uid+4)); |
197 | } | 197 | } |