iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'reset/fixes' of git://git.pengutronix.de/git/pza/linux into next/fixes-non-critical

Browse Source 
Merge a fix from Philipp Zabel:

This patch fixes an erroneous revert that slipped in with commit
b424080a9e086e683ad5fdc624a7cf3c024e0c0f reset: Add optional resets and
stubs.

* 'reset/fixes' of git://git.pengutronix.de/git/pza/linux:
  reset: Add of_reset_control_get to reset.h

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-05-26 12:16:17 -07:00
commit 6580ad3fc1
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/reset.h
View File

@ -2,6 +2,7 @@
#define _LINUX_RESET_H_ #define _LINUX_RESET_H_
struct device; struct device;
struct device_node;
struct reset_control; struct reset_control;
#ifdef CONFIG_RESET_CONTROLLER #ifdef CONFIG_RESET_CONTROLLER
@ -33,6 +34,9 @@ static inline struct reset_control *devm_reset_control_get_optional(
return devm_reset_control_get(dev, id); return devm_reset_control_get(dev, id);
} }
struct reset_control *of_reset_control_get(struct device_node *node,
const char *id);
#else #else
static inline int reset_control_reset(struct reset_control *rstc) static inline int reset_control_reset(struct reset_control *rstc)
@ -75,6 +79,12 @@ static inline struct reset_control *devm_reset_control_get_optional(
return ERR_PTR(-ENOSYS); return ERR_PTR(-ENOSYS);
} }
static inline struct reset_control *of_reset_control_get(
struct device_node *node, const char *id)
{
return ERR_PTR(-ENOSYS);
}
#endif /* CONFIG_RESET_CONTROLLER */ #endif /* CONFIG_RESET_CONTROLLER */
#endif #endif