Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm

[linux-flexiantxendom0-3.2.10.git] / arch / arm / mach-pxa / devices.c

diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index 72a15a6..166eee5 100644 (file)
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -407,29 +407,34 @@ static struct resource pxa_rtc_resources[] = {
        [1] = {
                .start  = IRQ_RTC1Hz,
                .end    = IRQ_RTC1Hz,
+               .name   = "rtc 1Hz",
                .flags  = IORESOURCE_IRQ,
        },
        [2] = {
                .start  = IRQ_RTCAlrm,
                .end    = IRQ_RTCAlrm,
+               .name   = "rtc alarm",
                .flags  = IORESOURCE_IRQ,
        },
 };
 
+struct platform_device pxa_device_rtc = {
+       .name           = "pxa-rtc",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(pxa_rtc_resources),
+       .resource       = pxa_rtc_resources,
+};
+
 static struct resource sa1100_rtc_resources[] = {
-       [0] = {
-               .start  = 0x40900000,
-               .end    = 0x409000ff,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
+       {
                .start  = IRQ_RTC1Hz,
                .end    = IRQ_RTC1Hz,
+               .name   = "rtc 1Hz",
                .flags  = IORESOURCE_IRQ,
-       },
-       [2] = {
+       }, {
                .start  = IRQ_RTCAlrm,
                .end    = IRQ_RTCAlrm,
+               .name   = "rtc alarm",
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -437,15 +442,8 @@ static struct resource sa1100_rtc_resources[] = {
 struct platform_device sa1100_device_rtc = {
        .name           = "sa1100-rtc",
        .id             = -1,
-       .num_resources  = ARRAY_SIZE(sa1100_rtc_resources),
-       .resource       = sa1100_rtc_resources,
-};
-
-struct platform_device pxa_device_rtc = {
-       .name           = "pxa-rtc",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(pxa_rtc_resources),
-       .resource       = pxa_rtc_resources,
+       .num_resources  = ARRAY_SIZE(sa1100_rtc_resources),
+       .resource       = sa1100_rtc_resources,
 };
 
 static struct resource pxa_ac97_resources[] = {