diff options
author | Simon Horman <horms@verge.net.au> | 2012-11-08 17:49:35 +0900 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2012-11-08 17:49:35 +0900 |
commit | ab3ff12a78a64b851ab22726ab99dca6ad37bf94 (patch) | |
tree | 4340e41495528f1a1dc733b45a792617ff4e8992 /arch/arm/mach-shmobile/setup-r8a7740.c | |
parent | 631a7b5d958d2ef2c2333b105794c693642f0641 (diff) | |
parent | 2944628607f76e4755660cd710f22a4748ef88d8 (diff) | |
download | talos-op-linux-ab3ff12a78a64b851ab22726ab99dca6ad37bf94.tar.gz talos-op-linux-ab3ff12a78a64b851ab22726ab99dca6ad37bf94.zip |
Merge branch 'soc' into boards
Conflicts:
arch/arm/configs/marzen_defconfig
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r8a7740.c')
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7740.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c index 11bb1d984197..6ac242cdca7f 100644 --- a/arch/arm/mach-shmobile/setup-r8a7740.c +++ b/arch/arm/mach-shmobile/setup-r8a7740.c @@ -590,6 +590,21 @@ static struct platform_device i2c1_device = { .num_resources = ARRAY_SIZE(i2c1_resources), }; +static struct resource pmu_resources[] = { + [0] = { + .start = evt2irq(0x19a0), + .end = evt2irq(0x19a0), + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device pmu_device = { + .name = "arm-pmu", + .id = -1, + .num_resources = ARRAY_SIZE(pmu_resources), + .resource = pmu_resources, +}; + static struct platform_device *r8a7740_late_devices[] __initdata = { &i2c0_device, &i2c1_device, @@ -597,6 +612,7 @@ static struct platform_device *r8a7740_late_devices[] __initdata = { &dma1_device, &dma2_device, &usb_dma_device, + &pmu_device, }; /* @@ -747,7 +763,7 @@ static const char *r8a7740_boards_compat_dt[] __initdata = { NULL, }; -DT_MACHINE_START(SH7372_DT, "Generic R8A7740 (Flattened Device Tree)") +DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)") .map_io = r8a7740_map_io, .init_early = r8a7740_add_early_devices_dt, .init_irq = r8a7740_init_irq, |