Merge tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

New feature development

This adds support for new features, and contains stuff from most
platforms. A number of these patches could have fit into other
branches, too, but were small enough not to cause too much
confusion here.

* tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
  mfd/db8500-prcmu: remove support for early silicon revisions
  ARM: ux500: fix the smp_twd clock calculation
  ARM: ux500: remove support for early silicon revisions
  ARM: ux500: update register files
  ARM: ux500: register DB5500 PMU dynamically
  ARM: ux500: update ASIC detection for U5500
  ARM: ux500: support DB8520
  ARM: picoxcell: implement watchdog restart
  ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C
  ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx <= ES2.1
  ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4
  ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3
  ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3
  ARM: Orion: Remove address map info from all platform data structures
  ARM: Orion: Get address map from plat-orion instead of via platform_data
  ARM: Orion: mbus_dram_info consolidation
  ARM: Orion: Consolidate the address map setup
  ARM: Kirkwood: Add configuration for MPP12 as GPIO
  ARM: Kirkwood: Recognize A1 revision of 6282 chip
  ARM: ux500: update the MOP500 GPIO assignments
  ...

1 files changed, 20 insertions, 21 deletions

diff --git a/arch/arm/mach-ux500/cpu-db5500.c b/arch/arm/mach-ux500/cpu-db5500.c
index 5323286b265e..18aa5c05c69e 100644
--- a/arch/arm/mach-ux500/cpu-db5500.c
+++ b/arch/arm/mach-ux500/cpu-db5500.c
@@ -46,26 +46,6 @@ static struct map_desc u5500_io_desc[] __initdata = {
         __IO_DEV_DESC(U5500_PRCMU_TCDM_BASE, SZ_4K),
 };
 
-static struct resource db5500_pmu_resources[] = {
-        [0] = {
-                .start          = IRQ_DB5500_PMU0,
-                .end            = IRQ_DB5500_PMU0,
-                .flags          = IORESOURCE_IRQ,
-        },
-        [1] = {
-                .start          = IRQ_DB5500_PMU1,
-                .end            = IRQ_DB5500_PMU1,
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device db5500_pmu_device = {
-        .name                   = "arm-pmu",
-        .id                     = ARM_PMU_DEVICE_CPU,
-        .num_resources          = ARRAY_SIZE(db5500_pmu_resources),
-        .resource               = db5500_pmu_resources,
-};
-
 static struct resource mbox0_resources[] = {
         {
                 .name = "mbox_peer",
@@ -151,7 +131,6 @@ static struct platform_device mbox2_device = {
 };
 
 static struct platform_device *db5500_platform_devs[] __initdata = {
-        &db5500_pmu_device,
         &mbox0_device,
         &mbox1_device,
         &mbox2_device,
@@ -192,6 +171,25 @@ void __init u5500_map_io(void)
         _PRCMU_BASE = __io_address(U5500_PRCMU_BASE);
 }
 
+static void __init db5500_pmu_init(void)
+{
+        struct resource res[] = {
+                [0] = {
+                        .start          = IRQ_DB5500_PMU0,
+                        .end            = IRQ_DB5500_PMU0,
+                        .flags          = IORESOURCE_IRQ,
+                },
+                [1] = {
+                        .start          = IRQ_DB5500_PMU1,
+                        .end            = IRQ_DB5500_PMU1,
+                        .flags          = IORESOURCE_IRQ,
+                },
+        };
+
+        platform_device_register_simple("arm-pmu", ARM_PMU_DEVICE_CPU,
+                                        res, ARRAY_SIZE(res));
+}
+
 static int usb_db5500_rx_dma_cfg[] = {
         DB5500_DMA_DEV4_USB_OTG_IEP_1_9,
         DB5500_DMA_DEV5_USB_OTG_IEP_2_10,
@@ -217,6 +215,7 @@ static int usb_db5500_tx_dma_cfg[] = {
 void __init u5500_init_devices(void)
 {
         db5500_add_gpios();
+        db5500_pmu_init();
         db5500_dma_init();
         db5500_add_rtc();
         db5500_add_usb(usb_db5500_rx_dma_cfg, usb_db5500_tx_dma_cfg);