diff options
author | Gabriel FERNANDEZ <gabriel.fernandez@st.com> | 2014-04-11 11:07:00 -0400 |
---|---|---|
committer | Maxime Coquelin <maxime.coquelin@st.com> | 2014-05-21 08:26:57 -0400 |
commit | ce73d9be6aa60b09ce6c54cf03e2b7e4d1c45dfa (patch) | |
tree | a1faf8cced6ccd8444a5bcb567fcc01d655eacbc | |
parent | 2e86cd21b50a8af19e73bf0923e88cdcdb142ad3 (diff) |
driver: reset: sti: add keyscan for stih415
Add keyscan reset on stih415 reset controller.
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Giuseppe Condorelli <giuseppe.condorelli@st.com>
Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org>
Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
-rw-r--r-- | drivers/reset/sti/reset-stih415.c | 1 | ||||
-rw-r--r-- | include/dt-bindings/reset-controller/stih415-resets.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/reset/sti/reset-stih415.c b/drivers/reset/sti/reset-stih415.c index e6f6c41abe12..c93fd260447e 100644 --- a/drivers/reset/sti/reset-stih415.c +++ b/drivers/reset/sti/reset-stih415.c | |||
@@ -73,6 +73,7 @@ static const struct syscfg_reset_channel_data stih415_softresets[] = { | |||
73 | [STIH415_USB0_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 9), | 73 | [STIH415_USB0_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 9), |
74 | [STIH415_USB1_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 10), | 74 | [STIH415_USB1_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 10), |
75 | [STIH415_USB2_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 11), | 75 | [STIH415_USB2_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 11), |
76 | [STIH415_KEYSCAN_SOFTRESET] = STIH415_SRST_LPM(LPM_SYSCFG_1, 8), | ||
76 | }; | 77 | }; |
77 | 78 | ||
78 | static struct syscfg_reset_controller_data stih415_powerdown_controller = { | 79 | static struct syscfg_reset_controller_data stih415_powerdown_controller = { |
diff --git a/include/dt-bindings/reset-controller/stih415-resets.h b/include/dt-bindings/reset-controller/stih415-resets.h index c2f8a66913c5..c2329fe29cf6 100644 --- a/include/dt-bindings/reset-controller/stih415-resets.h +++ b/include/dt-bindings/reset-controller/stih415-resets.h | |||
@@ -22,5 +22,6 @@ | |||
22 | #define STIH415_USB0_SOFTRESET 3 | 22 | #define STIH415_USB0_SOFTRESET 3 |
23 | #define STIH415_USB1_SOFTRESET 4 | 23 | #define STIH415_USB1_SOFTRESET 4 |
24 | #define STIH415_USB2_SOFTRESET 5 | 24 | #define STIH415_USB2_SOFTRESET 5 |
25 | #define STIH415_KEYSCAN_SOFTRESET 6 | ||
25 | 26 | ||
26 | #endif /* _DT_BINDINGS_RESET_CONTROLLER_STIH415 */ | 27 | #endif /* _DT_BINDINGS_RESET_CONTROLLER_STIH415 */ |