summaryrefslogtreecommitdiffstats
path: root/drivers/reset
diff options
context:
space:
mode:
authorGabriel FERNANDEZ <gabriel.fernandez@st.com>2014-04-11 17:07:00 +0200
committerMaxime Coquelin <maxime.coquelin@st.com>2014-05-21 14:27:05 +0200
commitd6c057f313cfe9484b46876dd13106ede6bc30e2 (patch)
tree96c57875a344088b7c87fd70e66a9cf2e3916301 /drivers/reset
parentce73d9be6aa60b09ce6c54cf03e2b7e4d1c45dfa (diff)
downloadlinux-stable-d6c057f313cfe9484b46876dd13106ede6bc30e2.tar.gz
linux-stable-d6c057f313cfe9484b46876dd13106ede6bc30e2.tar.bz2
linux-stable-d6c057f313cfe9484b46876dd13106ede6bc30e2.zip
driver: reset: sti: add keyscan for stih416
Add keyscan reset on stih416 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>
Diffstat (limited to 'drivers/reset')
-rw-r--r--drivers/reset/sti/reset-stih416.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/reset/sti/reset-stih416.c b/drivers/reset/sti/reset-stih416.c
index fe3bf02bdc8c..5fc987076a90 100644
--- a/drivers/reset/sti/reset-stih416.c
+++ b/drivers/reset/sti/reset-stih416.c
@@ -104,6 +104,7 @@ static const struct syscfg_reset_channel_data stih416_softresets[] = {
[STIH416_COMPO_A_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 4),
[STIH416_VP8_DEC_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 10),
[STIH416_VTG_MAIN_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 16),
+ [STIH416_KEYSCAN_SOFTRESET] = STIH416_SRST_LPM(LPM_SYSCFG_1, 8),
};
static struct syscfg_reset_controller_data stih416_powerdown_controller = {