| Message ID | 1385559113-4354-1-git-send-email-ivan.khoronzhuk@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wednesday 27 November 2013 07:01 PM, Ivan Khoronzhuk wrote: > 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. > > Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Looks good to me. Since bulk of this patch touches mach-davinci, I would like to take this through my tree to avoid conflicts with other mach-davinci patches I accept. Thanks, Sekhar
On Wednesday 27 November 2013 09:00 AM, Sekhar Nori wrote: > On Wednesday 27 November 2013 07:01 PM, Ivan Khoronzhuk wrote: >> 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. >> >> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> > > Looks good to me. Since bulk of this patch touches mach-davinci, I would > like to take this through my tree to avoid conflicts with other > mach-davinci patches I accept. > Sounds good. Thanks Sekhar !! Regards, Santosh
On 11/27/2013 05:31 AM, Ivan Khoronzhuk wrote: > 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. > > Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > --- > based on: > https://lkml.org/lkml/2013/11/27/164 > > CC: > Sekhar Nori <nsekhar@ti.com> > Guenter Roeck <linux@roeck-us.net> > > arch/arm/mach-davinci/da830.c | 2 +- > arch/arm/mach-davinci/da850.c | 2 +- > arch/arm/mach-davinci/da8xx-dt.c | 2 +- > arch/arm/mach-davinci/devices-da8xx.c | 4 ++-- > arch/arm/mach-davinci/devices.c | 2 +- > arch/arm/mach-davinci/dm355.c | 2 +- > arch/arm/mach-davinci/dm365.c | 2 +- > arch/arm/mach-davinci/dm644x.c | 2 +- > arch/arm/mach-davinci/dm646x.c | 2 +- > drivers/watchdog/davinci_wdt.c | 4 ++-- > 10 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c > index 0813b51..82c6013 100644 > --- 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 352984e..ccb2f58 100644 > --- 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 d2bc574..ed19287 100644 > --- 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 c46eccb..f9ba74b 100644 > --- 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 3996e98..5cf9a02 100644 > --- 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 ef9ff1f..4bb8132 100644 > --- 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 1511a06..b0e8df3 100644 > --- 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 143a321..aeaad95 100644 > --- 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 2a73f29..a56779b 100644 > --- 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 884f696..9128c74 100644 > --- a/drivers/watchdog/davinci_wdt.c > +++ b/drivers/watchdog/davinci_wdt.c > @@ -218,7 +218,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, > }, > @@ -238,4 +238,4 @@ MODULE_PARM_DESC(heartbeat, > __MODULE_STRING(DEFAULT_HEARTBEAT)); > > MODULE_LICENSE("GPL"); > -MODULE_ALIAS("platform:watchdog"); > +MODULE_ALIAS("platform:davinci-wdt"); >
On 11/27/2013 06:00 AM, Sekhar Nori wrote: > On Wednesday 27 November 2013 07:01 PM, Ivan Khoronzhuk wrote: >> 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. >> >> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> > > Looks good to me. Since bulk of this patch touches mach-davinci, I would > like to take this through my tree to avoid conflicts with other > mach-davinci patches I accept. > Good idea, and makes sense. Guenter
On Wednesday 27 November 2013 09:27 PM, Guenter Roeck wrote: > On 11/27/2013 06:00 AM, Sekhar Nori wrote: >> On Wednesday 27 November 2013 07:01 PM, Ivan Khoronzhuk wrote: >>> 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. >>> >>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> >> >> Looks good to me. Since bulk of this patch touches mach-davinci, I would >> like to take this through my tree to avoid conflicts with other >> mach-davinci patches I accept. >> > > Good idea, and makes sense. Added to v3.14/soc with your Reviewed-by Thanks, Sekhar [1] https://git.kernel.org/cgit/linux/kernel/git/nsekhar/linux-davinci.git/log/?h=v3.14/soc
On 11/28/2013 08:04 AM, Sekhar Nori wrote: > On Wednesday 27 November 2013 09:27 PM, Guenter Roeck wrote: >> On 11/27/2013 06:00 AM, Sekhar Nori wrote: >>> On Wednesday 27 November 2013 07:01 PM, Ivan Khoronzhuk wrote: >>>> 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. >>>> >>>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> >>> >>> Looks good to me. Since bulk of this patch touches mach-davinci, I would >>> like to take this through my tree to avoid conflicts with other >>> mach-davinci patches I accept. >>> >> >> Good idea, and makes sense. > > Added to v3.14/soc with your Reviewed-by > > Thanks, > Sekhar > > [1] > https://git.kernel.org/cgit/linux/kernel/git/nsekhar/linux-davinci.git/log/?h=v3.14/soc > Thanks, Sekhar. What about other WDT patches, are you OK with them? https://lkml.org/lkml/2013/11/27/164
On 11/27/2013 10:04 PM, Sekhar Nori wrote: > On Wednesday 27 November 2013 09:27 PM, Guenter Roeck wrote: >> On 11/27/2013 06:00 AM, Sekhar Nori wrote: >>> On Wednesday 27 November 2013 07:01 PM, Ivan Khoronzhuk wrote: >>>> 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. >>>> >>>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> >>> >>> Looks good to me. Since bulk of this patch touches mach-davinci, I would >>> like to take this through my tree to avoid conflicts with other >>> mach-davinci patches I accept. >>> >> >> Good idea, and makes sense. > > Added to v3.14/soc with your Reviewed-by > You should get an Ack from Wim. Thanks, Guenter
Wim, On Thursday 28 November 2013 06:29 PM, Guenter Roeck wrote: > On 11/27/2013 10:04 PM, Sekhar Nori wrote: >> On Wednesday 27 November 2013 09:27 PM, Guenter Roeck wrote: >>> On 11/27/2013 06:00 AM, Sekhar Nori wrote: >>>> On Wednesday 27 November 2013 07:01 PM, Ivan Khoronzhuk wrote: >>>>> 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. >>>>> >>>>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> >>>> >>>> Looks good to me. Since bulk of this patch touches mach-davinci, I >>>> would >>>> like to take this through my tree to avoid conflicts with other >>>> mach-davinci patches I accept. >>>> >>> >>> Good idea, and makes sense. >> >> Added to v3.14/soc with your Reviewed-by >> > > You should get an Ack from Wim. Can you please provide your ack? I will add it to the existing commit. Thanks, Sekhar
On Friday 29 November 2013 01:44 PM, Sekhar Nori wrote: > Wim, > > On Thursday 28 November 2013 06:29 PM, Guenter Roeck wrote: >> On 11/27/2013 10:04 PM, Sekhar Nori wrote: >>> On Wednesday 27 November 2013 09:27 PM, Guenter Roeck wrote: >>>> On 11/27/2013 06:00 AM, Sekhar Nori wrote: >>>>> On Wednesday 27 November 2013 07:01 PM, Ivan Khoronzhuk wrote: >>>>>> 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. >>>>>> >>>>>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> >>>>> >>>>> Looks good to me. Since bulk of this patch touches mach-davinci, I >>>>> would >>>>> like to take this through my tree to avoid conflicts with other >>>>> mach-davinci patches I accept. >>>>> >>>> >>>> Good idea, and makes sense. >>> >>> Added to v3.14/soc with your Reviewed-by >>> >> >> You should get an Ack from Wim. > > Can you please provide your ack? I will add it to the existing commit. I never received an ack from Wim, but I am going to send this for merging through ARM-SoC anyway. I will keep Wim copied on the pull request so he knows. Thanks, Sekhar
On Thursday 09 January 2014 04:38 PM, Wim Van Sebroeck wrote: > Hi Sekhar, > >> On Friday 29 November 2013 01:44 PM, Sekhar Nori wrote: >>> Wim, >>> >>> On Thursday 28 November 2013 06:29 PM, Guenter Roeck wrote: >>>> On 11/27/2013 10:04 PM, Sekhar Nori wrote: >>>>> On Wednesday 27 November 2013 09:27 PM, Guenter Roeck wrote: >>>>>> On 11/27/2013 06:00 AM, Sekhar Nori wrote: >>>>>>> On Wednesday 27 November 2013 07:01 PM, Ivan Khoronzhuk wrote: >>>>>>>> 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. >>>>>>>> >>>>>>>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> >>>>>>> >>>>>>> Looks good to me. Since bulk of this patch touches mach-davinci, I >>>>>>> would >>>>>>> like to take this through my tree to avoid conflicts with other >>>>>>> mach-davinci patches I accept. >>>>>>> >>>>>> >>>>>> Good idea, and makes sense. >>>>> >>>>> Added to v3.14/soc with your Reviewed-by >>>>> >>>> >>>> You should get an Ack from Wim. >>> >>> Can you please provide your ack? I will add it to the existing commit. >> >> I never received an ack from Wim, but I am going to send this for >> merging through ARM-SoC anyway. I will keep Wim copied on the pull >> request so he knows. > > This has my Ack. No issue with getting this through the ARM-SoC tree but bear in mind that there are allready other davinci pateches in the linux-watchdog-next tree+. Okay. I will add you ack (I just applied my signed tag, grr). I did a test merge of this patch with today's linux-next and see no conflicts. Thanks, Sekhar
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 0813b51..82c6013 100644 --- 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 352984e..ccb2f58 100644 --- 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 d2bc574..ed19287 100644 --- 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 c46eccb..f9ba74b 100644 --- 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 3996e98..5cf9a02 100644 --- 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 ef9ff1f..4bb8132 100644 --- 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 1511a06..b0e8df3 100644 --- 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 143a321..aeaad95 100644 --- 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 2a73f29..a56779b 100644 --- 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 884f696..9128c74 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c @@ -218,7 +218,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, }, @@ -238,4 +238,4 @@ MODULE_PARM_DESC(heartbeat, __MODULE_STRING(DEFAULT_HEARTBEAT)); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:watchdog"); +MODULE_ALIAS("platform: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. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> --- based on: https://lkml.org/lkml/2013/11/27/164 CC: Sekhar Nori <nsekhar@ti.com> Guenter Roeck <linux@roeck-us.net> arch/arm/mach-davinci/da830.c | 2 +- arch/arm/mach-davinci/da850.c | 2 +- arch/arm/mach-davinci/da8xx-dt.c | 2 +- arch/arm/mach-davinci/devices-da8xx.c | 4 ++-- arch/arm/mach-davinci/devices.c | 2 +- arch/arm/mach-davinci/dm355.c | 2 +- arch/arm/mach-davinci/dm365.c | 2 +- arch/arm/mach-davinci/dm644x.c | 2 +- arch/arm/mach-davinci/dm646x.c | 2 +- drivers/watchdog/davinci_wdt.c | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-)