Commit 3b937a7d authored by Nicolas Pitre's avatar Nicolas Pitre
Browse files

[ARM] Orion/Kirkwood: rename orion5x_wdt to orion_wdt 



The Orion watchdog driver is also used on Kirkwood.

Convention is to use orion5x for stuff specific to 88F5xxx Orion chips
and simply "orion" for shared stuff across SoCs including Kirkwood.

Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
parent 054bd3f0

arch/arm/mach-kirkwood/common.c

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <plat/mvsdio.h>

#include <plat/mv_xor.h>

#include <plat/orion_nand.h>

#include <plat/orion5x_wdt.h>

#include <plat/orion_wdt.h>

#include <plat/time.h>

#include "common.h"
@@ -771,12 +771,12 @@ static void __init kirkwood_xor1_init(void) 
/*****************************************************************************

 * Watchdog

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

static struct orion5x_wdt_platform_data kirkwood_wdt_data = {

static struct orion_wdt_platform_data kirkwood_wdt_data = {

	.tclk		= 0,

};



static struct platform_device kirkwood_wdt_device = {

	.name		= "orion5x_wdt",

	.name		= "orion_wdt",

	.id		= -1,

	.dev		= {

		.platform_data	= &kirkwood_wdt_data,

arch/arm/mach-orion5x/common.c

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <plat/ehci-orion.h>

#include <plat/mv_xor.h>

#include <plat/orion_nand.h>

#include <plat/orion5x_wdt.h>

#include <plat/orion_wdt.h>

#include <plat/time.h>

#include "common.h"
@@ -540,12 +540,12 @@ void __init orion5x_xor_init(void) 
/*****************************************************************************

 * Watchdog

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

static struct orion5x_wdt_platform_data orion5x_wdt_data = {

static struct orion_wdt_platform_data orion5x_wdt_data = {

	.tclk			= 0,

};



static struct platform_device orion5x_wdt_device = {

	.name		= "orion5x_wdt",

	.name		= "orion_wdt",

	.id		= -1,

	.dev		= {

		.platform_data	= &orion5x_wdt_data,

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

+4 −4
Original line number Diff line number Diff line 
/*

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

 * 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_ORION5X_WDT_H

#define __PLAT_ORION5X_WDT_H

#ifndef __PLAT_ORION_WDT_H

#define __PLAT_ORION_WDT_H



struct orion5x_wdt_platform_data {

struct orion_wdt_platform_data {

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

};

drivers/watchdog/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -231,14 +231,14 @@ config DAVINCI_WATCHDOG 
	  NOTE: once enabled, this timer cannot be disabled.

	  Say N if you are unsure.



config ORION5X_WATCHDOG

	tristate "Orion5x watchdog"

config ORION_WATCHDOG

	tristate "Orion watchdog"

	depends on ARCH_ORION5X || ARCH_KIRKWOOD

	help

	  Say Y here if to include support for the watchdog timer

	  in the Orion5x and Kirkwood ARM SoCs.

	  in the Marvell Orion5x and Kirkwood ARM SoCs.

	  To compile this driver as a module, choose M here: the

	  module will be called orion5x_wdt.

	  module will be called orion_wdt.



# AVR32 Architecture

drivers/watchdog/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o 
obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o

obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o

obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o

obj-$(CONFIG_ORION5X_WATCHDOG) += orion5x_wdt.o

obj-$(CONFIG_ORION_WATCHDOG) += orion_wdt.o



# AVR32 Architecture

obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE