Commit 2c4fabec authored Feb 02, 2015 by Rob Herring Committed by Alexandre Belloni Sep 05, 2015

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>

parent 3cdf4ad9

arch/arm/mach-pxa/devices.c

+2 −16

Original line number	Diff line number	Diff line
		@@ -440,25 +440,11 @@ struct platform_device pxa_device_rtc = {
		.resource = pxa_rtc_resources,
		};

		static struct resource sa1100_rtc_resources[] = {
		{
		.start = IRQ_RTC1Hz,
		.end = IRQ_RTC1Hz,
		.name = "rtc 1Hz",
		.flags = IORESOURCE_IRQ,
		}, {
		.start = IRQ_RTCAlrm,
		.end = IRQ_RTCAlrm,
		.name = "rtc alarm",
		.flags = IORESOURCE_IRQ,
		},
		};

		struct platform_device sa1100_device_rtc = {
		.name = "sa1100-rtc",
		.id = -1,
		.num_resources = ARRAY_SIZE(sa1100_rtc_resources),
		.resource = sa1100_rtc_resources,
		.num_resources = ARRAY_SIZE(pxa_rtc_resources),
		.resource = pxa_rtc_resources,
		};

		static struct resource pxa_ac97_resources[] = {