Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6580ad3f authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge a fix from Philipp Zabel:

This patch fixes an erroneous revert that slipped in with commit
b424080a 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: default avatarOlof Johansson <olof@lixom.net>
parents 4b660a7f e3ec0a8c

include/linux/reset.h

+10 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _LINUX_RESET_H_



struct device;

struct device_node;

struct reset_control;



#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);

}



struct reset_control *of_reset_control_get(struct device_node *node,

					   const char *id);



#else



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);

}



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