]> Pileus Git - ~andy/linux/commitdiff
ARM: S3C24XX: Use common macro to define resources on mach-vr1000.c
authorTushar Behera <tushar.behera@linaro.org>
Sat, 12 May 2012 07:12:25 +0000 (16:12 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 12 May 2012 07:12:25 +0000 (16:12 +0900)
Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/mach-s3c24xx/mach-vr1000.c

index 87608d45dac48f72d19a16df3220af7f4d88ff6b..bd5f189f0424cc43ad78e60cc09bc734e179373a 100644 (file)
@@ -187,40 +187,17 @@ static struct platform_device serial_device = {
 /* DM9000 ethernet devices */
 
 static struct resource vr1000_dm9k0_resource[] = {
-       [0] = {
-               .start = S3C2410_CS5 + VR1000_PA_DM9000,
-               .end   = S3C2410_CS5 + VR1000_PA_DM9000 + 3,
-               .flags = IORESOURCE_MEM
-       },
-       [1] = {
-               .start = S3C2410_CS5 + VR1000_PA_DM9000 + 0x40,
-               .end   = S3C2410_CS5 + VR1000_PA_DM9000 + 0x7f,
-               .flags = IORESOURCE_MEM
-       },
-       [2] = {
-               .start = IRQ_VR1000_DM9000A,
-               .end   = IRQ_VR1000_DM9000A,
-               .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-       }
-
+       [0] = DEFINE_RES_MEM(S3C2410_CS5 + VR1000_PA_DM9000, 4),
+       [1] = DEFINE_RES_MEM(S3C2410_CS5 + VR1000_PA_DM9000 + 0x40, 0x40),
+       [2] = DEFINE_RES_NAMED(IRQ_VR1000_DM9000A, 1, NULL, IORESOURCE_IRQ \
+                                               | IORESOURCE_IRQ_HIGHLEVEL),
 };
 
 static struct resource vr1000_dm9k1_resource[] = {
-       [0] = {
-               .start = S3C2410_CS5 + VR1000_PA_DM9000 + 0x80,
-               .end   = S3C2410_CS5 + VR1000_PA_DM9000 + 0x83,
-               .flags = IORESOURCE_MEM
-       },
-       [1] = {
-               .start = S3C2410_CS5 + VR1000_PA_DM9000 + 0xC0,
-               .end   = S3C2410_CS5 + VR1000_PA_DM9000 + 0xFF,
-               .flags = IORESOURCE_MEM
-       },
-       [2] = {
-               .start = IRQ_VR1000_DM9000N,
-               .end   = IRQ_VR1000_DM9000N,
-               .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
-       }
+       [0] = DEFINE_RES_MEM(S3C2410_CS5 + VR1000_PA_DM9000 + 0x80, 4),
+       [1] = DEFINE_RES_MEM(S3C2410_CS5 + VR1000_PA_DM9000 + 0xC0, 0x40),
+       [2] = DEFINE_RES_NAMED(IRQ_VR1000_DM9000N, 1, NULL, IORESOURCE_IRQ \
+                                               | IORESOURCE_IRQ_HIGHLEVEL),
 };
 
 /* for the moment we limit ourselves to 16bit IO until some