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

Commit 84374812 authored by Ivan Khoronzhuk's avatar Ivan Khoronzhuk Committed by Sekhar Nori
Browse files

watchdog: davinci: rename platform driver to davinci-wdt 



As we switch to use the watchdog core which permits more than one
active watchdog in the system, rename platform driver to
"davinci-wdt" to be identifiable.

Acked-by: default avatarWim Van Sebroeck <wim@iguana.be>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarIvan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 6ce4eac1

arch/arm/mach-davinci/da830.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static struct clk_lookup da830_clks[] = { 
	CLK(NULL,		"pll0_sysclk7",	&pll0_sysclk7),

	CLK("i2c_davinci.1",	NULL,		&i2c0_clk),

	CLK(NULL,		"timer0",	&timerp64_0_clk),

	CLK("watchdog",		NULL,		&timerp64_1_clk),

	CLK("davinci-wdt",	NULL,		&timerp64_1_clk),

	CLK(NULL,		"arm_rom",	&arm_rom_clk),

	CLK(NULL,		"scr0_ss",	&scr0_ss_clk),

	CLK(NULL,		"scr1_ss",	&scr1_ss_clk),

arch/arm/mach-davinci/da850.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static struct clk_lookup da850_clks[] = { 
	CLK(NULL,		"pll1_sysclk3",	&pll1_sysclk3),

	CLK("i2c_davinci.1",	NULL,		&i2c0_clk),

	CLK(NULL,		"timer0",	&timerp64_0_clk),

	CLK("watchdog",		NULL,		&timerp64_1_clk),

	CLK("davinci-wdt",	NULL,		&timerp64_1_clk),

	CLK(NULL,		"arm_rom",	&arm_rom_clk),

	CLK(NULL,		"tpcc0",	&tpcc0_clk),

	CLK(NULL,		"tptc0",	&tptc0_clk),

arch/arm/mach-davinci/da8xx-dt.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static void __init da8xx_init_irq(void) 


static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("ti,davinci-i2c", 0x01c22000, "i2c_davinci.1", NULL),

	OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "watchdog", NULL),

	OF_DEV_AUXDATA("ti,davinci-wdt", 0x01c21000, "davinci-wdt", NULL),

	OF_DEV_AUXDATA("ti,da830-mmc", 0x01c40000, "da830-mmc.0", NULL),

	OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f00000, "ehrpwm", NULL),

	OF_DEV_AUXDATA("ti,da850-ehrpwm", 0x01f02000, "ehrpwm", NULL),

arch/arm/mach-davinci/devices-da8xx.c

+2 −2
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static struct resource da8xx_watchdog_resources[] = { 
};



static struct platform_device da8xx_wdt_device = {

	.name		= "watchdog",

	.name		= "davinci-wdt",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(da8xx_watchdog_resources),

	.resource	= da8xx_watchdog_resources,
@@ -399,7 +399,7 @@ void da8xx_restart(enum reboot_mode mode, const char *cmd) 
{

	struct device *dev;



	dev = bus_find_device_by_name(&platform_bus_type, NULL, "watchdog");

	dev = bus_find_device_by_name(&platform_bus_type, NULL, "davinci-wdt");

	if (!dev) {

		pr_err("%s: failed to find watchdog device\n", __func__);

		return;

arch/arm/mach-davinci/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -302,7 +302,7 @@ static struct resource wdt_resources[] = { 
};



struct platform_device davinci_wdt_device = {

	.name		= "watchdog",

	.name		= "davinci-wdt",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(wdt_resources),

	.resource	= wdt_resources,