From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCHv2 03/15] [orion] Consolidate the creation of the RTC platform data.
Date: Sun, 15 May 2011 13:32:42 +0200 [thread overview]
Message-ID: <1305459174-25517-4-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1305459174-25517-1-git-send-email-andrew@lunn.ch>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/mach-dove/common.c | 13 +------------
arch/arm/mach-kirkwood/common.c | 8 +-------
arch/arm/plat-orion/common.c | 18 ++++++++++++++++++
arch/arm/plat-orion/include/plat/common.h | 3 +++
4 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index fffa92e..8a414cb 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -205,20 +205,9 @@ void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data)
/*****************************************************************************
* SoC RTC
****************************************************************************/
-static struct resource dove_rtc_resource[] = {
- {
- .start = DOVE_RTC_PHYS_BASE,
- .end = DOVE_RTC_PHYS_BASE + 32 - 1,
- .flags = IORESOURCE_MEM,
- }, {
- .start = IRQ_DOVE_RTC,
- .flags = IORESOURCE_IRQ,
- }
-};
-
void __init dove_rtc_init(void)
{
- platform_device_register_simple("rtc-mv", -1, dove_rtc_resource, 2);
+ orion_rtc_init(DOVE_RTC_PHYS_BASE, IRQ_DOVE_RTC);
}
/*****************************************************************************
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 8cdf9f9..b77050e 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -326,15 +326,9 @@ void __init kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts,
/*****************************************************************************
* SoC RTC
****************************************************************************/
-static struct resource kirkwood_rtc_resource = {
- .start = RTC_PHYS_BASE,
- .end = RTC_PHYS_BASE + SZ_16 - 1,
- .flags = IORESOURCE_MEM,
-};
-
static void __init kirkwood_rtc_init(void)
{
- platform_device_register_simple("rtc-mv", -1, &kirkwood_rtc_resource, 1);
+ orion_rtc_init(RTC_PHYS_BASE, NO_IRQ);
}
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index 4eac532..d065591 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -169,3 +169,21 @@ void __init orion_uart3_init(unsigned int membase,
uart_complete(&orion_uart3, orion_uart3_data, orion_uart3_resources,
membase, mapbase, irq, uartclk);
}
+
+/*****************************************************************************
+ * SoC RTC
+ ****************************************************************************/
+static struct resource orion_rtc_resource[2];
+
+void __init orion_rtc_init(unsigned long mapbase,
+ unsigned long irq)
+{
+ orion_rtc_resource[0].start = mapbase;
+ orion_rtc_resource[0].end = mapbase + SZ_32 - 1;
+ orion_rtc_resource[0].flags = IORESOURCE_MEM;
+ orion_rtc_resource[1].start = irq;
+ orion_rtc_resource[1].end = irq;
+ orion_rtc_resource[1].flags = IORESOURCE_IRQ;
+
+ platform_device_register_simple("rtc-mv", -1, orion_rtc_resource, 2);
+}
diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h
index d57e3bb..7cba5e8 100644
--- a/arch/arm/plat-orion/include/plat/common.h
+++ b/arch/arm/plat-orion/include/plat/common.h
@@ -30,5 +30,8 @@ void __init orion_uart3_init(unsigned int membase,
resource_size_t mapbase,
unsigned int irq,
unsigned int uartclk);
+
+void __init orion_rtc_init(unsigned long mapbase,
+ unsigned long irq);
#endif
--
1.7.4.4
next prev parent reply other threads:[~2011-05-15 11:32 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-15 11:32 [PATCHv2 00/15] Consolidate Orion platform information setup Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 01/15] [Orion] Rename some constants to macros to make code more identical Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 02/15] [orion] Consolidate the creation of the uart platform data Andrew Lunn
2011-05-15 11:32 ` Andrew Lunn [this message]
2011-05-15 11:32 ` [PATCHv2 04/15] [kirkwood] Add support for RTC interrupts which allows RTC alarms Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 05/15] [orion] Consolidate ethernet platform data Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 06/15] [orion] Consolidate I2C initialization Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 07/15] [orion] Consolidate SPI initialization Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 08/15] [orion] Consolidate the platform data setup for the watchdog Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 09/15] [orion] Consolidate the XOR platform setup code Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 10/15] [orion] Consolidate USB " Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 11/15] [orion] Consolidate SATA platform setup Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 12/15] [orion] Consolidate setup of the crypto engine Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 13/15] [orion] Refactor the MPP code. Common code in the orion platform Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 14/15] [orion5x] Refactor mpp code to use common orion platform mpp Andrew Lunn
2011-05-15 11:32 ` [PATCHv2 15/15] [dove] Consolidate mpp code with " Andrew Lunn
2011-05-16 20:31 ` [PATCHv2 00/15] Consolidate Orion platform information setup Nicolas Pitre
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=1305459174-25517-4-git-send-email-andrew@lunn.ch \
--to=andrew@lunn.ch \
--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).