Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ARM: orion: Consolidate the platform data setup for the watchdog.

Browse source 
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
This commit is contained in:
Andrew Lunn 2011-05-15 13:32:47 +02:00 committed by Nicolas Pitre
parent 980f9f601a
commit 5e00d3783d
4 changed files with 25 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
arch/arm/mach-kirkwood/common.c
View file

@ -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);
}

17
arch/arm/mach-orion5x/common.c
View file

@ -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);
}

21
arch/arm/plat-orion/common.c
View file

@ -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
@ -564,3 +565,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);
}

2
arch/arm/plat-orion/include/plat/common.h
View file

@ -79,4 +79,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