diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-17 01:59:44 +0400 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-17 01:59:52 +0400 |
| commit | cd2f43a1f7400a74a084094502f70df2e169c6e8 (patch) | |
| tree | 5c1d96e485f494c09b1b60c14e8c2d88e00cee33 /arch/arm/mach-davinci/devices-da8xx.c | |
| parent | 64576e439709738c0f55ab60cdba0ad18d5aa24e (diff) | |
| parent | 843748123d95ae77a489b41f2f193e8502fc7ea8 (diff) | |
| download | linux-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/devices-da8xx.c')
| -rw-r--r-- | arch/arm/mach-davinci/devices-da8xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c index 78829c513fdc..0486cdf28c8d 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; |