1 files changed, 15 insertions, 30 deletions

diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c
index 3d44a59fc0df..731552d68adf 100644
--- a/arch/arm/mach-rpc/riscpc.c
+++ b/arch/arm/mach-rpc/riscpc.c
@@ -98,15 +98,9 @@ static void __init rpc_map_io(void)
 }
 
 static struct resource acornfb_resources[] = {
-        {       /* VIDC */
-                .start          = 0x03400000,
-                .end            = 0x035fffff,
-                .flags          = IORESOURCE_MEM,
-        }, {
-                .start          = IRQ_VSYNCPULSE,
-                .end            = IRQ_VSYNCPULSE,
-                .flags          = IORESOURCE_IRQ,
-        },
+        /* VIDC */
+        DEFINE_RES_MEM(0x03400000, 0x00200000),
+        DEFINE_RES_IRQ(IRQ_VSYNCPULSE),
 };
 
 static struct platform_device acornfb_device = {
@@ -120,11 +114,7 @@ static struct platform_device acornfb_device = {
 };
 
 static struct resource iomd_resources[] = {
-        {
-                .start          = 0x03200000,
-                .end            = 0x0320ffff,
-                .flags          = IORESOURCE_MEM,
-        },
+        DEFINE_RES_MEM(0x03200000, 0x10000),
 };
 
 static struct platform_device iomd_device = {
@@ -134,18 +124,25 @@ static struct platform_device iomd_device = {
         .resource               = iomd_resources,
 };
 
+static struct resource iomd_kart_resources[] = {
+        DEFINE_RES_IRQ(IRQ_KEYBOARDRX),
+        DEFINE_RES_IRQ(IRQ_KEYBOARDTX),
+};
+
 static struct platform_device kbd_device = {
         .name                   = "kart",
         .id                     = -1,
         .dev                    = {
                 .parent         = &iomd_device.dev,
         },
+        .num_resources          = ARRAY_SIZE(iomd_kart_resources),
+        .resource               = iomd_kart_resources,
 };
 
 static struct plat_serial8250_port serial_platform_data[] = {
         {
                 .mapbase        = 0x03010fe0,
-                .irq            = 10,
+                .irq            = IRQ_SERIALPORT,
                 .uartclk        = 1843200,
                 .regshift       = 2,
                 .iotype         = UPIO_MEM,
@@ -167,21 +164,9 @@ static struct pata_platform_info pata_platform_data = {
 };
 
 static struct resource pata_resources[] = {
-        [0] = {
-                .start          = 0x030107c0,
-                .end            = 0x030107df,
-                .flags          = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start          = 0x03010fd8,
-                .end            = 0x03010fdb,
-                .flags          = IORESOURCE_MEM,
-        },
-        [2] = {
-                .start          = IRQ_HARDDISK,
-                .end            = IRQ_HARDDISK,
-                .flags          = IORESOURCE_IRQ,
-        },
+        DEFINE_RES_MEM(0x030107c0, 0x20),
+        DEFINE_RES_MEM(0x03010fd8, 0x04),
+        DEFINE_RES_IRQ(IRQ_HARDDISK),
 };
 
 static struct platform_device pata_device = {