Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e00d378 authored by Andrew Lunn's avatar Andrew Lunn Committed by Nicolas Pitre
Browse files

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



Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarNicolas Pitre <nico@fluxnic.net>
parent 980f9f60

arch/arm/mach-kirkwood/common.c

+1 −16
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-orion5x/common.c

+1 −16
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/plat-orion/common.c

+21 −0
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/plat-orion/include/plat/common.h

+2 −0
Original line number Diff line number Diff line
@@ -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