diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:37:23 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:37:23 -0400 |
| commit | f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 (patch) | |
| tree | 362b9b6a3bd32b868e5917a32d448ac75c5854df /arch/arm/mach-bcmring/arch.c | |
| parent | 4fa73a1bf89ebea4eba8a9982b5f64d266d8b5e9 (diff) | |
| parent | 6daa642d9b8ec762b3c5641cd5e5fa855a5405bf (diff) | |
Merge branch 'omap4-i2c-init' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-bcmring/arch.c')
| -rw-r--r-- | arch/arm/mach-bcmring/arch.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c index 53dd2a9eecf9..2f139196d63d 100644 --- a/arch/arm/mach-bcmring/arch.c +++ b/arch/arm/mach-bcmring/arch.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <asm/setup.h> | 29 | #include <asm/setup.h> |
| 30 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
| 31 | #include <asm/mach/time.h> | 31 | #include <asm/mach/time.h> |
| 32 | #include <asm/pmu.h> | ||
| 32 | 33 | ||
| 33 | #include <asm/mach/arch.h> | 34 | #include <asm/mach/arch.h> |
| 34 | #include <mach/dma.h> | 35 | #include <mach/dma.h> |
| @@ -85,8 +86,23 @@ static struct platform_device nand_device = { | |||
| 85 | .num_resources = ARRAY_SIZE(nand_resource), | 86 | .num_resources = ARRAY_SIZE(nand_resource), |
| 86 | }; | 87 | }; |
| 87 | 88 | ||
| 89 | static struct resource pmu_resource = { | ||
| 90 | .start = IRQ_PMUIRQ, | ||
| 91 | .end = IRQ_PMUIRQ, | ||
| 92 | .flags = IORESOURCE_IRQ, | ||
| 93 | }; | ||
| 94 | |||
| 95 | static struct platform_device pmu_device = { | ||
| 96 | .name = "arm-pmu", | ||
| 97 | .id = ARM_PMU_DEVICE_CPU, | ||
| 98 | .resource = &pmu_resource, | ||
| 99 | .num_resources = 1, | ||
| 100 | }; | ||
| 101 | |||
| 102 | |||
| 88 | static struct platform_device *devices[] __initdata = { | 103 | static struct platform_device *devices[] __initdata = { |
| 89 | &nand_device, | 104 | &nand_device, |
| 105 | &pmu_device, | ||
| 90 | }; | 106 | }; |
| 91 | 107 | ||
| 92 | /**************************************************************************** | 108 | /**************************************************************************** |