Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: pxa: add memory resource to SA1100 RTC device

The drivers for the SA1100 and PXA RTCs are now mutually exclusive, so
add the memory resource for the sa1100-rtc device. Since the memory
resource is already present in the pxa_rtc_resources, that makes
sa1100_rtc_resources and pxa_rtc_resources equivalent, so use
pxa_rtc_resources for both devices and remove the duplicate
sa1100_rtc_resources.

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Daniel Mack <daniel@zonque.org>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

authored by

Rob Herring and committed by
Alexandre Belloni
2c4fabec 3cdf4ad9

+2 -16
+2 -16
arch/arm/mach-pxa/devices.c
··· 440 440 .resource = pxa_rtc_resources, 441 441 }; 442 442 443 - static struct resource sa1100_rtc_resources[] = { 444 - { 445 - .start = IRQ_RTC1Hz, 446 - .end = IRQ_RTC1Hz, 447 - .name = "rtc 1Hz", 448 - .flags = IORESOURCE_IRQ, 449 - }, { 450 - .start = IRQ_RTCAlrm, 451 - .end = IRQ_RTCAlrm, 452 - .name = "rtc alarm", 453 - .flags = IORESOURCE_IRQ, 454 - }, 455 - }; 456 - 457 443 struct platform_device sa1100_device_rtc = { 458 444 .name = "sa1100-rtc", 459 445 .id = -1, 460 - .num_resources = ARRAY_SIZE(sa1100_rtc_resources), 461 - .resource = sa1100_rtc_resources, 446 + .num_resources = ARRAY_SIZE(pxa_rtc_resources), 447 + .resource = pxa_rtc_resources, 462 448 }; 463 449 464 450 static struct resource pxa_ac97_resources[] = {