Skip to content

Commit

Permalink
watchdog: watchdog_dev: Use device tree alias for naming watchdogs
Browse files Browse the repository at this point in the history
Currently there is no way to easily differentiate multiple
watchdog devices. The watchdogs are named by the order they
are probed.
1st probed watchdog: /dev/watchdog0
2nd probed watchdog: /dev/watchdog1
...

This change uses the alias of the watchdog device node for
the name of the watchdog.
aliases {
    watchdog0 = "/...../...."
    watchdog3 = "/..../....."
    watchdog2 = "/..../....."
    ...
}

This will translate to...
/dev/watchdog0
/dev/watchdog3
/dev/watchdog2

v2
Assign alias number to id in watchdog_core instead of watchdog_dev.
If failed to get id, fallback to original ida_simple_get call.

Signed-off-by: Justin Chen <justinpopo6@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  • Loading branch information
Justin Chen authored and Wim Van Sebroeck committed Oct 27, 2015
1 parent 7a3629f commit 9dd4e17
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions drivers/watchdog/watchdog_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ EXPORT_SYMBOL_GPL(watchdog_init_timeout);

static int __watchdog_register_device(struct watchdog_device *wdd)
{
int ret, id, devno;
int ret, id = -1, devno;

if (wdd == NULL || wdd->info == NULL || wdd->ops == NULL)
return -EINVAL;
Expand All @@ -157,7 +157,18 @@ static int __watchdog_register_device(struct watchdog_device *wdd)
*/

mutex_init(&wdd->lock);
id = ida_simple_get(&watchdog_ida, 0, MAX_DOGS, GFP_KERNEL);

/* Use alias for watchdog id if possible */
if (wdd->parent) {
ret = of_alias_get_id(wdd->parent->of_node, "watchdog");
if (ret >= 0)
id = ida_simple_get(&watchdog_ida, ret,
ret + 1, GFP_KERNEL);
}

if (id < 0)
id = ida_simple_get(&watchdog_ida, 0, MAX_DOGS, GFP_KERNEL);

if (id < 0)
return id;
wdd->id = id;
Expand Down

0 comments on commit 9dd4e17

Please sign in to comment.