diff options
author | Kevin Hilman <khilman@linaro.org> | 2014-01-16 13:59:44 -0800 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2014-01-16 13:59:52 -0800 |
commit | cd2f43a1f7400a74a084094502f70df2e169c6e8 (patch) | |
tree | 5c1d96e485f494c09b1b60c14e8c2d88e00cee33 /arch/arm/mach-davinci/dm355.c | |
parent | 64576e439709738c0f55ab60cdba0ad18d5aa24e (diff) | |
parent | 843748123d95ae77a489b41f2f193e8502fc7ea8 (diff) | |
download | linux-stable-cd2f43a1f7400a74a084094502f70df2e169c6e8.tar.gz linux-stable-cd2f43a1f7400a74a084094502f70df2e169c6e8.tar.bz2 linux-stable-cd2f43a1f7400a74a084094502f70df2e169c6e8.zip |
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/dm355.c')
-rw-r--r-- | arch/arm/mach-davinci/dm355.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index 4d2c72fb40c4..4668c0e19767 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), |