diff options
author | Olof Johansson <olof@lixom.net> | 2019-04-29 12:53:21 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2019-04-29 12:53:21 -0400 |
commit | 1e6df9493700e92d26e4699a3f40846129b863e6 (patch) | |
tree | af77e028eb25f3c0828b685d35f469930c71d670 | |
parent | c687702b5f506c8575881548432dbe26e741ec55 (diff) | |
parent | d005aa750c9b7ca7f77dafd6dda33a0fcb6e7ae3 (diff) |
Merge tag 'reset-for-5.2' of git://git.pengutronix.de/pza/linux into arm/drivers
Reset controller changes for v5.2
This adds support for 'acquired'/'released' states to exclusive reset
controls to allow drivers that usually need direct control over their
reset line, to temporarily yield control to another driver, such as a
power domain controller during power transitions. A fix adds missing
headers to linux/reset.h, which caused build errors in linux-next,
discovered by the new lima DRM driver.
* tag 'reset-for-5.2' of git://git.pengutronix.de/pza/linux:
reset: fix linux/reset.h errors
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | include/linux/reset.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/reset.h b/include/linux/reset.h index 95d555c2130a..e7793fc0fa93 100644 --- a/include/linux/reset.h +++ b/include/linux/reset.h | |||
@@ -2,6 +2,8 @@ | |||
2 | #ifndef _LINUX_RESET_H_ | 2 | #ifndef _LINUX_RESET_H_ |
3 | #define _LINUX_RESET_H_ | 3 | #define _LINUX_RESET_H_ |
4 | 4 | ||
5 | #include <linux/err.h> | ||
6 | #include <linux/errno.h> | ||
5 | #include <linux/types.h> | 7 | #include <linux/types.h> |
6 | 8 | ||
7 | struct device; | 9 | struct device; |