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: Wim Van Sebroeck <wim@iguana.be>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 0813b5167e059e1c7c32d82374bbdb6470eb9370..82c601348f23670827a32076b2b785c9fb63a19d 100644 (file)
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -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),

diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 352984e1528a4ab08cdd2e52b072e841e6a895e1..ccb2f58932237f91d83f3c9e213ccbe45f563df7 100644 (file)
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -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),

diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index d2bc574ae172cfbfc2671f24372c137baa73056d..ed1928740b5f5d1817d5c214ca31486257a04e94 100644 (file)
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -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),

diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index c46eccbbd51226f5ae6ab5a16e1c89668c35fa1d..f9ba74b779677c7e5a0540cda7a1e53f55e1021a 100644 (file)
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -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;

diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index 3996e98f52fbe0c4e8601bb2dc1b8d0932a8ffd9..5cf9a027dcc6ae23063182c2461f1ddb66339e7b 100644 (file)
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -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,

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index ef9ff1fb6f52a2533378ba37563c06e877b32ea3..4bb813276a952b028adf3dc732d23bcdb5441695 100644 (file)
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -375,7 +375,7 @@ static struct clk_lookup dm355_clks[] = {
        CLK(NULL, "pwm3", &pwm3_clk),
        CLK(NULL, "timer0", &timer0_clk),
        CLK(NULL, "timer1", &timer1_clk),
-       CLK("watchdog", NULL, &timer2_clk),
+       CLK("davinci-wdt", NULL, &timer2_clk),
        CLK(NULL, "timer3", &timer3_clk),
        CLK(NULL, "rto", &rto_clk),
        CLK(NULL, "usb", &usb_clk),

diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 1511a0680f9a1d399cf3094b538c3c52caa06547..b0e8df37e8f7b56dec768813b5df2114268e5ae9 100644 (file)
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -473,7 +473,7 @@ static struct clk_lookup dm365_clks[] = {
        CLK(NULL, "pwm3", &pwm3_clk),
        CLK(NULL, "timer0", &timer0_clk),
        CLK(NULL, "timer1", &timer1_clk),
-       CLK("watchdog", NULL, &timer2_clk),
+       CLK("davinci-wdt", NULL, &timer2_clk),
        CLK(NULL, "timer3", &timer3_clk),
        CLK(NULL, "usb", &usb_clk),
        CLK("davinci_emac.1", NULL, &emac_clk),

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 143a3217e8efb8fde1aa417700c45840d242aac0..aeaad95d30d874a9999950ff22af1542521d2c1c 100644 (file)
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -322,7 +322,7 @@ static struct clk_lookup dm644x_clks[] = {
        CLK(NULL, "pwm2", &pwm2_clk),
        CLK(NULL, "timer0", &timer0_clk),
        CLK(NULL, "timer1", &timer1_clk),
-       CLK("watchdog", NULL, &timer2_clk),
+       CLK("davinci-wdt", NULL, &timer2_clk),
        CLK(NULL, NULL, NULL),
 };
 

diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 2a73f299c1d094615236359d6ac27959cdd16295..a56779bf239328f4cd7ef82405779c6a0bfed6f9 100644 (file)
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -356,7 +356,7 @@ static struct clk_lookup dm646x_clks[] = {
        CLK(NULL, "pwm1", &pwm1_clk),
        CLK(NULL, "timer0", &timer0_clk),
        CLK(NULL, "timer1", &timer1_clk),
-       CLK("watchdog", NULL, &timer2_clk),
+       CLK("davinci-wdt", NULL, &timer2_clk),
        CLK("palm_bk3710", NULL, &ide_clk),
        CLK(NULL, "vpif0", &vpif0_clk),
        CLK(NULL, "vpif1", &vpif1_clk),

diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index dd625cca1ae5669d4e513a8611736c1b82d33a62..12591f6596efe54a2d9f58b3cf26547867440685 100644 (file)
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -247,7 +247,7 @@ MODULE_DEVICE_TABLE(of, davinci_wdt_of_match);
 
 static struct platform_driver platform_wdt_driver = {
        .driver = {
-               .name = "watchdog",
+               .name = "davinci-wdt",
                .owner  = THIS_MODULE,
                .of_match_table = davinci_wdt_of_match,
        },
@@ -267,4 +267,4 @@ MODULE_PARM_DESC(heartbeat,
                 __MODULE_STRING(DEFAULT_HEARTBEAT));
 
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:watchdog");
+MODULE_ALIAS("platform:davinci-wdt");