From d9df37f6220765279b0908e04584d2e4dbc1e7b9 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 6 Jul 2012 09:06:20 +0100 Subject: [PATCH] --- yaml --- r: 326890 b: refs/heads/master c: 96bbf7910c9a198fda9c71081e4900a7e365dbbc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/board-mop500.c | 2 ++ trunk/arch/arm/mach-ux500/board-mop500.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e30496a9a5a2..8f3d4f125f22 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38cd8c5d7561c01619959f09099c7430420c4008 +refs/heads/master: 96bbf7910c9a198fda9c71081e4900a7e365dbbc diff --git a/trunk/arch/arm/mach-ux500/board-mop500.c b/trunk/arch/arm/mach-ux500/board-mop500.c index a534d8880de1..5d9600b1020b 100644 --- a/trunk/arch/arm/mach-ux500/board-mop500.c +++ b/trunk/arch/arm/mach-ux500/board-mop500.c @@ -732,6 +732,8 @@ static struct platform_device *snowball_of_platform_devs[] __initdata = { }; struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { + /* Requires call-back bindings. */ + OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata), /* Requires DMA and call-back bindings. */ OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", &uart0_plat), OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", &uart1_plat), diff --git a/trunk/arch/arm/mach-ux500/board-mop500.h b/trunk/arch/arm/mach-ux500/board-mop500.h index b5bfc1a78b1a..d04a8e6ce7ee 100644 --- a/trunk/arch/arm/mach-ux500/board-mop500.h +++ b/trunk/arch/arm/mach-ux500/board-mop500.h @@ -81,6 +81,7 @@ struct device; struct i2c_board_info; extern struct mmci_platform_data mop500_sdi0_data; extern struct mmci_platform_data mop500_sdi4_data; +extern struct arm_pmu_platdata db8500_pmu_platdata; extern void mop500_sdi_init(struct device *parent); extern void snowball_sdi_init(struct device *parent);