diff options
author | Kevin Hilman <khilman@linaro.org> | 2014-01-16 22:59:44 +0100 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2014-01-16 22:59:52 +0100 |
commit | cd2f43a1f7400a74a084094502f70df2e169c6e8 (patch) | |
tree | 5c1d96e485f494c09b1b60c14e8c2d88e00cee33 /arch/arm/mach-davinci/da8xx-dt.c | |
parent | Merge branch 'qcom/drivers' into next/drivers (diff) | |
parent | watchdog: davinci: rename platform driver to davinci-wdt (diff) | |
download | linux-cd2f43a1f7400a74a084094502f70df2e169c6e8.tar.xz linux-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/da8xx-dt.c')
-rw-r--r-- | arch/arm/mach-davinci/da8xx-dt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c index d2bc574ae172..ed1928740b5f 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), |