Commit a0f2a5a1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'ux500-core' of... 

Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc

From Linus Walleij <linus.walleij@linaro.org>:

"Two small commits for v3.8 that I'd like to make sure
land in ARM SoC before I begin with all the other stuff."

* 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: ux500: add DB serial number to entropy pool
  ARM: ux500: support the HREFP520 board variant

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6f0c0580 4040d10a

arch/arm/mach-ux500/board-mop500.c

+11 −2
Original line number Diff line number Diff line 


/*

 * Copyright (C) 2008-2009 ST-Ericsson

 * Copyright (C) 2008-2012 ST-Ericsson

 *

 * Author: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>

 *
@@ -701,6 +700,16 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform") 
	.init_late	= ux500_init_late,

MACHINE_END



MACHINE_START(U8520, "ST-Ericsson U8520 Platform HREFP520")

	.atag_offset	= 0x100,

	.map_io		= u8500_map_io,

	.init_irq	= ux500_init_irq,

	.timer		= &ux500_timer,

	.handle_irq	= gic_handle_irq,

	.init_machine	= mop500_init_machine,

	.init_late	= ux500_init_late,

MACHINE_END



MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")

	.atag_offset	= 0x100,

	.smp		= smp_ops(ux500_smp_ops),

arch/arm/mach-ux500/cpu-db8500.c

+4 −1
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/mfd/abx500/ab8500.h>

#include <linux/platform_data/usb-musb-ux500.h>

#include <linux/random.h>



#include <asm/pmu.h>

#include <asm/mach/map.h>
@@ -24,7 +26,6 @@ 
#include <mach/hardware.h>

#include <mach/setup.h>

#include <mach/devices.h>

#include <linux/platform_data/usb-musb-ux500.h>

#include <mach/db8500-regs.h>



#include "devices-db8500.h"
@@ -187,6 +188,8 @@ static const char *db8500_read_soc_id(void) 
{

	void __iomem *uid = __io_address(U8500_BB_UID_BASE);



	/* 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+1), readl((u32 *)uid+2),

CRA Git | Maintained and supported by SUSTech CRA and CCSE