From: Rob Herring <robh@kernel.org>
To: Russell King <linux@arm.linux.org.uk>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Eric Miao <eric.y.miao@gmail.com>,
Haojian Zhuang <haojian.zhuang@gmail.com>,
Alessandro Zummo <a.zummo@towertech.it>
Cc: rtc-linux@googlegroups.com,
Robert Jarzmik <robert.jarzmik@free.fr>,
Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org,
Rob Herring <robh@kernel.org>, Daniel Mack <daniel@zonque.org>
Subject: [rtc-linux] [PATCH v3 1/4] ARM: pxa: add memory resource to RTC device
Date: Mon, 11 May 2015 17:41:26 -0500 [thread overview]
Message-ID: <1431384089-28367-2-git-send-email-robh@kernel.org> (raw)
In-Reply-To: <1431384089-28367-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>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@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 3543466..b598db6 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
--
--
You received this message because you are subscribed to "rtc-linux".
Membership options at http://groups.google.com/group/rtc-linux .
Please read http://groups.google.com/group/rtc-linux/web/checklist
before submitting a driver.
---
You received this message because you are subscribed to the Google Groups "rtc-linux" group.
To unsubscribe from this group and stop receiving emails from it, send an email to rtc-linux+unsubscribe@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
WARNING: multiple messages have this Message-ID (diff)
From: robh@kernel.org (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 1/4] ARM: pxa: add memory resource to RTC device
Date: Mon, 11 May 2015 17:41:26 -0500 [thread overview]
Message-ID: <1431384089-28367-2-git-send-email-robh@kernel.org> (raw)
In-Reply-To: <1431384089-28367-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>
Acked-by: 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 3543466..b598db6 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
next prev parent reply other threads:[~2015-05-11 22:41 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 22:41 [rtc-linux] [PATCH v3 0/4] SA1100 RTC clean-up for ARM64 Rob Herring
2015-05-11 22:41 ` Rob Herring
2015-05-11 22:41 ` Rob Herring [this message]
2015-05-11 22:41 ` [PATCH v3 1/4] ARM: pxa: add memory resource to RTC device Rob Herring
2015-05-11 22:49 ` [rtc-linux] " Russell King - ARM Linux
2015-05-11 22:49 ` Russell King - ARM Linux
2015-05-12 0:35 ` [rtc-linux] " Rob Herring
2015-05-12 0:35 ` Rob Herring
2015-05-12 6:20 ` [rtc-linux] " Robert Jarzmik
2015-05-12 6:20 ` Robert Jarzmik
2015-05-12 20:24 ` Robert Jarzmik
2015-05-12 20:24 ` Robert Jarzmik
2015-05-12 20:30 ` [rtc-linux] " Arnd Bergmann
2015-05-12 20:30 ` Arnd Bergmann
2015-05-12 20:36 ` [rtc-linux] " Russell King - ARM Linux
2015-05-12 20:36 ` Russell King - ARM Linux
2015-05-12 20:49 ` [rtc-linux] " Arnd Bergmann
2015-05-12 20:49 ` Arnd Bergmann
2015-05-12 20:29 ` [rtc-linux] " Rob Herring
2015-05-12 20:29 ` Rob Herring
2015-05-12 8:59 ` [rtc-linux] " Russell King - ARM Linux
2015-05-12 8:59 ` Russell King - ARM Linux
2015-05-11 22:41 ` [rtc-linux] [PATCH v3 2/4] rtc: sa1100: convert to run-time register mapping Rob Herring
2015-05-11 22:41 ` Rob Herring
2015-05-11 22:41 ` [rtc-linux] [PATCH v3 3/4] ARM: sa1100: remove unused RTC register definitions Rob Herring
2015-05-11 22:41 ` Rob Herring
2015-05-11 22:41 ` [rtc-linux] [PATCH v3 4/4] ARM: mmp: " Rob Herring
2015-05-11 22:41 ` 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=1431384089-28367-2-git-send-email-robh@kernel.org \
--to=robh@kernel.org \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@free-electrons.com \
--cc=arnd@arndb.de \
--cc=daniel@zonque.org \
--cc=eric.y.miao@gmail.com \
--cc=haojian.zhuang@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux@arm.linux.org.uk \
--cc=robert.jarzmik@free.fr \
--cc=rtc-linux@googlegroups.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.