summaryrefslogtreecommitdiff
path: root/arch/arm/mach-davinci/dm365.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2014-01-17 01:59:44 +0400
committerKevin Hilman <khilman@linaro.org>2014-01-17 01:59:52 +0400
commitcd2f43a1f7400a74a084094502f70df2e169c6e8 (patch)
tree5c1d96e485f494c09b1b60c14e8c2d88e00cee33 /arch/arm/mach-davinci/dm365.c
parent64576e439709738c0f55ab60cdba0ad18d5aa24e (diff)
parent843748123d95ae77a489b41f2f193e8502fc7ea8 (diff)
downloadlinux-cd2f43a1f7400a74a084094502f70df2e169c6e8.tar.xz
Merge tag 'davinci-for-v3.14/watchdog' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers
From Sekhar Nori: This patch updates the davinci watchdog platform device name from generic "watchdog" to something more specific. * tag 'davinci-for-v3.14/watchdog' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: watchdog: davinci: rename platform driver to davinci-wdt Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-davinci/dm365.c')
-rw-r--r--arch/arm/mach-davinci/dm365.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index 4117748f290b..b44b49e2801a 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),