linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: robh@kernel.org (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/4] ARM: pxa: add memory resource to RTC device
Date: Tue,  3 Feb 2015 17:22:52 -0600	[thread overview]
Message-ID: <1423005775-26457-2-git-send-email-robh@kernel.org> (raw)
In-Reply-To: <1423005775-26457-1-git-send-email-robh@kernel.org>

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>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel at lists.infradead.org
---
 arch/arm/mach-pxa/devices.c | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index ac7b3ea..7425aff 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -439,25 +439,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[] = {
-- 
2.1.0

  reply	other threads:[~2015-02-03 23:22 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-03 23:22 [PATCH 0/4] SA1100 RTC clean-up for ARM64 Rob Herring
2015-02-03 23:22 ` Rob Herring [this message]
2015-02-03 23:22 ` [PATCH 2/4] rtc: sa1100: convert to run-time register mapping Rob Herring
2015-02-04 13:25   ` Arnd Bergmann
2015-02-04 13:44     ` Rob Herring
2015-02-04 13:49       ` Rob Herring
2015-02-04 14:24         ` Arnd Bergmann
2015-02-04 17:30   ` Robert Jarzmik
2015-02-05 13:34     ` Rob Herring
2015-02-05 13:50       ` Russell King - ARM Linux
2015-02-05 19:18         ` Robert Jarzmik
2015-02-05 20:47           ` Rob Herring
2015-02-06 16:26             ` Robert Jarzmik
2015-02-05 23:37           ` Russell King - ARM Linux
2015-02-06 16:20             ` =Robert Jarzmik
2015-02-14 12:22   ` Robert Jarzmik
2015-02-03 23:22 ` [PATCH 3/4] ARM: sa1100: remove unused RTC register definitions Rob Herring
2015-02-03 23:22 ` [PATCH 4/4] ARM: mmp: " Rob Herring
2015-02-04 10:44 ` [PATCH 0/4] SA1100 RTC clean-up for ARM64 Russell King - ARM Linux
2015-02-04 13:58   ` Rob Herring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1423005775-26457-2-git-send-email-robh@kernel.org \
    --to=robh@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).