From: andrew@lunn.ch (Andrew Lunn)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/14] [orion] Consolidate the platform data setup for the watchdog.
Date: Sun, 8 May 2011 16:15:34 +0200 [thread overview]
Message-ID: <1304864141-1121-8-git-send-email-andrew@lunn.ch> (raw)
In-Reply-To: <1304864141-1121-1-git-send-email-andrew@lunn.ch>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
arch/arm/mach-kirkwood/common.c | 17 +----------------
arch/arm/mach-orion5x/common.c | 17 +----------------
arch/arm/plat-orion/common.c | 21 +++++++++++++++++++++
arch/arm/plat-orion/include/plat/common.h | 2 ++
4 files changed, 25 insertions(+), 32 deletions(-)
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index b8c6c19..b9df345 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -29,7 +29,6 @@
#include <plat/mvsdio.h>
#include <plat/mv_xor.h>
#include <plat/orion_nand.h>
-#include <plat/orion_wdt.h>
#include <plat/common.h>
#include <plat/time.h>
#include "common.h"
@@ -575,23 +574,9 @@ static void __init kirkwood_xor1_init(void)
/*****************************************************************************
* Watchdog
****************************************************************************/
-static struct orion_wdt_platform_data kirkwood_wdt_data = {
- .tclk = 0,
-};
-
-static struct platform_device kirkwood_wdt_device = {
- .name = "orion_wdt",
- .id = -1,
- .dev = {
- .platform_data = &kirkwood_wdt_data,
- },
- .num_resources = 0,
-};
-
static void __init kirkwood_wdt_init(void)
{
- kirkwood_wdt_data.tclk = kirkwood_tclk;
- platform_device_register(&kirkwood_wdt_device);
+ orion_wdt_init(kirkwood_tclk);
}
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 0f5e4b2..7cebf36 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -30,7 +30,6 @@
#include <plat/ehci-orion.h>
#include <plat/mv_xor.h>
#include <plat/orion_nand.h>
-#include <plat/orion_wdt.h>
#include <plat/time.h>
#include <plat/common.h>
#include "common.h"
@@ -380,23 +379,9 @@ static int __init orion5x_crypto_init(void)
/*****************************************************************************
* Watchdog
****************************************************************************/
-static struct orion_wdt_platform_data orion5x_wdt_data = {
- .tclk = 0,
-};
-
-static struct platform_device orion5x_wdt_device = {
- .name = "orion_wdt",
- .id = -1,
- .dev = {
- .platform_data = &orion5x_wdt_data,
- },
- .num_resources = 0,
-};
-
void __init orion5x_wdt_init(void)
{
- orion5x_wdt_data.tclk = orion5x_tclk;
- platform_device_register(&orion5x_wdt_device);
+ orion_wdt_init(orion5x_tclk);
}
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index e86ff90..f393ce2 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -18,6 +18,7 @@
#include <linux/mv643xx_i2c.h>
#include <net/dsa.h>
#include <linux/spi/orion_spi.h>
+#include <plat/orion_wdt.h>
/* Fill in the resources structure and link it into the platform
device structure. There is always a memory region, and nearly
@@ -568,3 +569,23 @@ void __init orion_spi_1_init(unsigned long mapbase,
mapbase, SZ_512 - 1, NO_IRQ);
platform_device_register(&orion_spi_1);
}
+
+/*****************************************************************************
+ * Watchdog
+ ****************************************************************************/
+static struct orion_wdt_platform_data orion_wdt_data;
+
+static struct platform_device orion_wdt_device = {
+ .name = "orion_wdt",
+ .id = -1,
+ .dev = {
+ .platform_data = &orion_wdt_data,
+ },
+ .num_resources = 0,
+};
+
+void __init orion_wdt_init(unsigned long tclk)
+{
+ orion_wdt_data.tclk = tclk;
+ platform_device_register(&orion_wdt_device);
+}
diff --git a/arch/arm/plat-orion/include/plat/common.h b/arch/arm/plat-orion/include/plat/common.h
index beb470b..f3540c2 100644
--- a/arch/arm/plat-orion/include/plat/common.h
+++ b/arch/arm/plat-orion/include/plat/common.h
@@ -83,4 +83,6 @@ void __init orion_spi_init(unsigned long mapbase,
void __init orion_spi_1_init(unsigned long mapbase,
unsigned long tclk);
+
+void __init orion_wdt_init(unsigned long tclk);
#endif
--
1.7.4.4
next prev parent reply other threads:[~2011-05-08 14:15 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-08 14:15 [PATCH 00/14] Consolidate orion platform data code Andrew Lunn
2011-05-08 14:15 ` [PATCH 01/14] [Orion] Rename some constants to macros to make code more identical Andrew Lunn
2011-05-08 14:44 ` saeed bishara
2011-05-08 14:15 ` [PATCH 02/14] [orion] Consolidate the creation of the uart platform data Andrew Lunn
2011-05-08 14:15 ` [PATCH 03/14] [orion] Consolidate the creation of the RTC " Andrew Lunn
2011-05-08 15:10 ` saeed bishara
2011-05-08 18:46 ` Andrew Lunn
2011-05-08 14:15 ` [PATCH 04/14] [orion] Consolidate ethernet " Andrew Lunn
2011-05-08 15:29 ` saeed bishara
2011-05-09 14:08 ` Andrew Lunn
2011-05-08 14:15 ` [PATCH 05/14] [orion] Consolidate I2C initialization Andrew Lunn
2011-05-08 14:15 ` [PATCH 06/14] [orion] Consolidate SPI initialization Andrew Lunn
2011-05-08 14:15 ` Andrew Lunn [this message]
2011-05-08 14:15 ` [PATCH 08/14] [orion] Consolidate the XOR platform setup code Andrew Lunn
2011-05-08 14:15 ` [PATCH 09/14] [orion] Consolidate USB " Andrew Lunn
2011-05-08 14:15 ` [PATCH 10/14] [orion] Consolidate SATA platform setup Andrew Lunn
2011-05-08 14:15 ` [PATCH 11/14] [orion] Consolidate setup of the crypto engine Andrew Lunn
2011-05-08 14:15 ` [PATCH 12/14] [orion] Refactor the MPP code. Common code in the orion platform Andrew Lunn
2011-05-08 14:15 ` [PATCH 13/14] [dove] Remove mpp.[ch]. They are not used Andrew Lunn
2011-05-08 14:39 ` saeed bishara
2011-05-08 17:19 ` Andrew Lunn
2011-05-12 10:40 ` saeed bishara
2011-05-08 14:15 ` [PATCH 14/14] [orion5x] Refactor mpp code to use common orion platform mpp Andrew Lunn
2011-05-08 16:03 ` saeed bishara
2011-05-08 17:28 ` Andrew Lunn
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=1304864141-1121-8-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).