Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (95 commits)
  [ARM] 4578/1: CM-x270: PCMCIA support
  [ARM] 4577/1: ITE 8152 PCI bridge support
  [ARM] 4576/1: CM-X270 machine support
  [ARM] pxa: Avoid pxa_gpio_mode() in gpio_direction_{in,out}put()
  [ARM] pxa: move pxa_set_mode() from pxa2xx_mainstone.c to mainstone.c
  [ARM] pxa: move pxa_set_mode() from pxa2xx_lubbock.c to lubbock.c
  [ARM] pxa: Make cpu_is_pxaXXX dependent on configuration symbols
  [ARM] pxa: PXA3xx base support
  [NET] smc91x: fix PXA DMA support code
  [SERIAL] Fix console initialisation ordering
  [ARM] pxa: tidy up arch/arm/mach-pxa/Makefile
  [ARM] Update arch/arm/Kconfig for drivers/Kconfig changes
  [ARM] 4600/1: fix kernel build failure with build-id-supporting binutils
  [ARM] 4599/1: Preserve ATAG list for use with kexec (2.6.23)
  [ARM] Rename consistent_sync() as dma_cache_maint()
  [ARM] 4572/1: ep93xx: add cirrus logic edb9307 support
  [ARM] 4596/1: S3C2412: Correct IRQs for SDI+CF and add decoding support
  [ARM] 4595/1: ns9xxx: define registers as void __iomem * instead of volatile u32
  [ARM] 4594/1: ns9xxx: use the new gpio functions
  [ARM] 4593/1: ns9xxx: implement generic clockevents
  ...

1 files changed, 44 insertions, 1 deletions

diff --git a/arch/arm/mach-footbridge/isa.c b/arch/arm/mach-footbridge/isa.c
index 28846c7edaaf..725a219d0ed5 100644
--- a/arch/arm/mach-footbridge/isa.c
+++ b/arch/arm/mach-footbridge/isa.c
@@ -12,6 +12,39 @@
 
 #include <asm/irq.h>
 
+static struct resource rtc_resources[] = {
+        [0] = {
+                .start  = 0x70,
+                .end    = 0x73,
+                .flags  = IORESOURCE_IO,
+        },
+        [1] = {
+                .start  = IRQ_ISA_RTC_ALARM,
+                .end    = IRQ_ISA_RTC_ALARM,
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+
+static struct platform_device rtc_device = {
+        .name           = "rtc_cmos",
+        .id             = -1,
+        .resource       = rtc_resources,
+        .num_resources  = ARRAY_SIZE(rtc_resources),
+};
+
+static struct resource serial_resources[] = {
+        [0] = {
+                .start  = 0x3f8,
+                .end    = 0x3ff,
+                .flags  = IORESOURCE_IO,
+        },
+        [1] = {
+                .start  = 0x2f8,
+                .end    = 0x2ff,
+                .flags  = IORESOURCE_IO,
+        },
+};
+
 static struct plat_serial8250_port serial_platform_data[] = {
         {
                 .iobase         = 0x3f8,
@@ -38,11 +71,21 @@ static struct platform_device serial_device = {
         .dev                    = {
                 .platform_data  = serial_platform_data,
         },
+        .resource               = serial_resources,
+        .num_resources          = ARRAY_SIZE(serial_resources),
 };
 
 static int __init footbridge_isa_init(void)
 {
-        return platform_device_register(&serial_device);
+        int err;
+
+        err = platform_device_register(&rtc_device);
+        if (err)
+                printk(KERN_ERR "Unable to register RTC device: %d\n", err);
+        err = platform_device_register(&serial_device);
+        if (err)
+                printk(KERN_ERR "Unable to register serial device: %d\n", err);
+        return 0;
 }
 
 arch_initcall(footbridge_isa_init);