aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Jarzmik <robert.jarzmik@free.fr>2008-11-13 17:50:56 -0500
committerEric Miao <eric.miao@marvell.com>2008-12-02 01:43:47 -0500
commit724931465c234f71551e229dcd8842d1fc531d77 (patch)
tree2ff6bc90a2d95497fc5f7588b2a13e8211e3941e
parenta10c287d393bdd32127d59f3ec8fd7bb80e2fa05 (diff)
[ARM] pxa: add resources for incoming rtc-pxa driver
Add IO memory and IRQ ressources for pxa based SoC to be able to use the new rtc-pxa driver. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Eric Miao <eric.miao@marvell.com>
-rw-r--r--arch/arm/mach-pxa/devices.c27
-rw-r--r--arch/arm/mach-pxa/devices.h1
-rw-r--r--arch/arm/mach-pxa/pxa25x.c2
-rw-r--r--arch/arm/mach-pxa/pxa27x.c1
-rw-r--r--arch/arm/mach-pxa/pxa3xx.c1
5 files changed, 30 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index 88c362651445..e16f8e3d58d3 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -330,11 +330,36 @@ void __init pxa_set_ficp_info(struct pxaficp_platform_data *info)
330 pxa_register_device(&pxa_device_ficp, info); 330 pxa_register_device(&pxa_device_ficp, info);
331} 331}
332 332
333struct platform_device pxa_device_rtc = { 333static struct resource pxa_rtc_resources[] = {
334 [0] = {
335 .start = 0x40900000,
336 .end = 0x40900000 + 0x3b,
337 .flags = IORESOURCE_MEM,
338 },
339 [1] = {
340 .start = IRQ_RTC1Hz,
341 .end = IRQ_RTC1Hz,
342 .flags = IORESOURCE_IRQ,
343 },
344 [2] = {
345 .start = IRQ_RTCAlrm,
346 .end = IRQ_RTCAlrm,
347 .flags = IORESOURCE_IRQ,
348 },
349};
350
351struct platform_device sa1100_device_rtc = {
334 .name = "sa1100-rtc", 352 .name = "sa1100-rtc",
335 .id = -1, 353 .id = -1,
336}; 354};
337 355
356struct platform_device pxa_device_rtc = {
357 .name = "pxa-rtc",
358 .id = -1,
359 .num_resources = ARRAY_SIZE(pxa_rtc_resources),
360 .resource = pxa_rtc_resources,
361};
362
338static struct resource pxa_ac97_resources[] = { 363static struct resource pxa_ac97_resources[] = {
339 [0] = { 364 [0] = {
340 .start = 0x40500000, 365 .start = 0x40500000,
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h
index bb04af4b0aa3..ecc24a4dca6d 100644
--- a/arch/arm/mach-pxa/devices.h
+++ b/arch/arm/mach-pxa/devices.h
@@ -11,6 +11,7 @@ extern struct platform_device pxa_device_hwuart;
11extern struct platform_device pxa_device_i2c; 11extern struct platform_device pxa_device_i2c;
12extern struct platform_device pxa_device_i2s; 12extern struct platform_device pxa_device_i2s;
13extern struct platform_device pxa_device_ficp; 13extern struct platform_device pxa_device_ficp;
14extern struct platform_device sa1100_device_rtc;
14extern struct platform_device pxa_device_rtc; 15extern struct platform_device pxa_device_rtc;
15extern struct platform_device pxa_device_ac97; 16extern struct platform_device pxa_device_ac97;
16 17
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 0f672998b2eb..265b8a5657b7 100644
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -312,7 +312,7 @@ static struct platform_device *pxa25x_devices[] __initdata = {
312 &pxa_device_btuart, 312 &pxa_device_btuart,
313 &pxa_device_stuart, 313 &pxa_device_stuart,
314 &pxa_device_i2s, 314 &pxa_device_i2s,
315 &pxa_device_rtc, 315 &sa1100_device_rtc,
316 &pxa25x_device_ssp, 316 &pxa25x_device_ssp,
317 &pxa25x_device_nssp, 317 &pxa25x_device_nssp,
318 &pxa25x_device_assp, 318 &pxa25x_device_assp,
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 7769718a80b4..9fdef7641c2f 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -333,6 +333,7 @@ static struct platform_device *devices[] __initdata = {
333 &pxa_device_btuart, 333 &pxa_device_btuart,
334 &pxa_device_stuart, 334 &pxa_device_stuart,
335 &pxa_device_i2s, 335 &pxa_device_i2s,
336 &sa1100_device_rtc,
336 &pxa_device_rtc, 337 &pxa_device_rtc,
337 &pxa27x_device_ssp1, 338 &pxa27x_device_ssp1,
338 &pxa27x_device_ssp2, 339 &pxa27x_device_ssp2,
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index a9b175684736..041b8abb9e1a 100644
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -541,6 +541,7 @@ static struct platform_device *devices[] __initdata = {
541 &pxa_device_btuart, 541 &pxa_device_btuart,
542 &pxa_device_stuart, 542 &pxa_device_stuart,
543 &pxa_device_i2s, 543 &pxa_device_i2s,
544 &sa1100_device_rtc,
544 &pxa_device_rtc, 545 &pxa_device_rtc,
545 &pxa27x_device_ssp1, 546 &pxa27x_device_ssp1,
546 &pxa27x_device_ssp2, 547 &pxa27x_device_ssp2,