]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
driver: reset: sti: add keyscan for stih415
authorGabriel FERNANDEZ <gabriel.fernandez@st.com>
Fri, 11 Apr 2014 15:07:00 +0000 (17:07 +0200)
committerMaxime Coquelin <maxime.coquelin@st.com>
Wed, 21 May 2014 12:26:57 +0000 (14:26 +0200)
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>
drivers/reset/sti/reset-stih415.c
include/dt-bindings/reset-controller/stih415-resets.h

index e6f6c41abe12d2cee4720d72313fc03c5dde4582..c93fd260447e552ef22b5c6f12e42df1c3ff5a92 100644 (file)
@@ -73,6 +73,7 @@ static const struct syscfg_reset_channel_data stih415_softresets[] = {
        [STIH415_USB0_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 9),
        [STIH415_USB1_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 10),
        [STIH415_USB2_SOFTRESET] = STIH415_SRST_REAR(SYSCFG_376, 11),
+       [STIH415_KEYSCAN_SOFTRESET] = STIH415_SRST_LPM(LPM_SYSCFG_1, 8),
 };
 
 static struct syscfg_reset_controller_data stih415_powerdown_controller = {
index c2f8a66913c529995291752ebae773987bbbefad..c2329fe29cf6e0c9e455cb593d96d5444db0bbef 100644 (file)
@@ -22,5 +22,6 @@
 #define STIH415_USB0_SOFTRESET         3
 #define STIH415_USB1_SOFTRESET         4
 #define STIH415_USB2_SOFTRESET         5
+#define STIH415_KEYSCAN_SOFTRESET      6
 
 #endif /* _DT_BINDINGS_RESET_CONTROLLER_STIH415 */