summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/da850.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2014-01-16 13:59:44 -0800
committerKevin Hilman <khilman@linaro.org>2014-01-16 13:59:52 -0800
commitcd2f43a1f7400a74a084094502f70df2e169c6e8 (patch)
tree5c1d96e485f494c09b1b60c14e8c2d88e00cee33 /arch/arm/mach-davinci/da850.c
parent64576e439709738c0f55ab60cdba0ad18d5aa24e (diff)
parent843748123d95ae77a489b41f2f193e8502fc7ea8 (diff)
downloadop-kernel-dev-cd2f43a1f7400a74a084094502f70df2e169c6e8.zip
op-kernel-dev-cd2f43a1f7400a74a084094502f70df2e169c6e8.tar.gz
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/da850.c')
-rw-r--r--arch/arm/mach-davinci/da850.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 4379317..2ab0043 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),
OpenPOWER on IntegriCloud