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

Commit 4f04be62 authored by Andrew Lunn's avatar Andrew Lunn Committed by Mike Turquette
Browse files

ARM: Orion: WDT: Add clk/clkdev support 



Remove tclk from platform data.  This makes the platform data
structure empty, so remove it.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-by: default avatarJamie Lentin <jm@lentin.co.uk>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 452503eb

arch/arm/mach-kirkwood/common.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -112,6 +112,7 @@ void __init kirkwood_clk_init(void) 
	orion_clkdev_add(NULL, "orion_spi.1", runit);

	orion_clkdev_add(NULL, "orion_spi.1", runit);

	orion_clkdev_add(NULL, MV643XX_ETH_NAME ".0", ge0);

	orion_clkdev_add(NULL, MV643XX_ETH_NAME ".0", ge0);

	orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", ge1);

	orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", ge1);

	orion_clkdev_add(NULL, "orion_wdt", tclk);

}

}





/*****************************************************************************

/*****************************************************************************
@@ -351,7 +352,7 @@ void __init kirkwood_xor1_init(void) 
 ****************************************************************************/

 ****************************************************************************/

void __init kirkwood_wdt_init(void)

void __init kirkwood_wdt_init(void)

{

{

	orion_wdt_init(kirkwood_tclk);

	orion_wdt_init();

}

}

arch/arm/mach-orion5x/common.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -193,7 +193,7 @@ static void __init orion5x_crypto_init(void) 
 ****************************************************************************/

 ****************************************************************************/

void __init orion5x_wdt_init(void)

void __init orion5x_wdt_init(void)

{

{

	orion_wdt_init(orion5x_tclk);

	orion_wdt_init();

}

}

arch/arm/plat-orion/common.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/mv643xx_eth.h>

#include <linux/mv643xx_eth.h>

#include <linux/mv643xx_i2c.h>

#include <linux/mv643xx_i2c.h>

#include <net/dsa.h>

#include <net/dsa.h>

#include <plat/orion_wdt.h>

#include <plat/mv_xor.h>

#include <plat/mv_xor.h>

#include <plat/ehci-orion.h>

#include <plat/ehci-orion.h>

#include <mach/bridge-regs.h>

#include <mach/bridge-regs.h>
@@ -47,6 +46,7 @@ void __init orion_clkdev_init(struct clk *tclk) 
	orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", tclk);

	orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", tclk);

	orion_clkdev_add(NULL, MV643XX_ETH_NAME ".2", tclk);

	orion_clkdev_add(NULL, MV643XX_ETH_NAME ".2", tclk);

	orion_clkdev_add(NULL, MV643XX_ETH_NAME ".3", tclk);

	orion_clkdev_add(NULL, MV643XX_ETH_NAME ".3", tclk);

	orion_clkdev_add(NULL, "orion_wdt", tclk);

}

}





/* Fill in the resources structure and link it into the platform

/* Fill in the resources structure and link it into the platform
@@ -575,24 +575,18 @@ void __init orion_spi_1_init(unsigned long mapbase) 
/*****************************************************************************

/*****************************************************************************

 * Watchdog

 * Watchdog

 ****************************************************************************/

 ****************************************************************************/

static struct orion_wdt_platform_data orion_wdt_data;



static struct resource orion_wdt_resource =

static struct resource orion_wdt_resource =

		DEFINE_RES_MEM(TIMER_VIRT_BASE, 0x28);

		DEFINE_RES_MEM(TIMER_VIRT_BASE, 0x28);





static struct platform_device orion_wdt_device = {

static struct platform_device orion_wdt_device = {

	.name		= "orion_wdt",

	.name		= "orion_wdt",

	.id		= -1,

	.id		= -1,

	.dev		= {

		.platform_data	= &orion_wdt_data,

	},

	.resource	= &orion_wdt_resource,

	.num_resources	= 1,

	.num_resources	= 1,

	.resource	= &orion_wdt_resource,

};

};





void __init orion_wdt_init(unsigned long tclk)

void __init orion_wdt_init(void)

{

{

	orion_wdt_data.tclk = tclk;

	platform_device_register(&orion_wdt_device);

	platform_device_register(&orion_wdt_device);

}

}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ void __init orion_spi_init(unsigned long mapbase); 




void __init orion_spi_1_init(unsigned long mapbase);

void __init orion_spi_1_init(unsigned long mapbase);





void __init orion_wdt_init(unsigned long tclk);

void __init orion_wdt_init(void);





void __init orion_xor0_init(unsigned long mapbase_low,

void __init orion_xor0_init(unsigned long mapbase_low,

			    unsigned long mapbase_high,

			    unsigned long mapbase_high,

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

deleted100644 → 0
+0 −18
Original line number Original line Diff line number Diff line 
/*

 * arch/arm/plat-orion/include/plat/orion_wdt.h

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2. This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



#ifndef __PLAT_ORION_WDT_H

#define __PLAT_ORION_WDT_H



struct orion_wdt_platform_data {

	u32	tclk;		/* no <linux/clk.h> support yet */

};





#endif