lkml.org 
[lkml]   [2014]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [STLinux Kernel] [PATCH v4 2/7] driver: reset: sti: add keyscan for stih415
Hi Philipp,

I am preparing the arm_soc pull request for STi platforms.

In this series, there are DT patches depending on this reset patch
(same for patch 3).

Can I queue theses two reset patches in my pull request for arm_soc to
avoid compilation breakage?

Best regards,
Maxime

On 04/11/2014 05:07 PM, Gabriel FERNANDEZ wrote:
> Add keyscan reset on stih415 reset controller.
>
> Signed-off-by: Giuseppe Condorelli <giuseppe.condorelli@st.com>
> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org>
> ---
> drivers/reset/sti/reset-stih415.c | 1 +
> include/dt-bindings/reset-controller/stih415-resets.h | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/drivers/reset/sti/reset-stih415.c b/drivers/reset/sti/reset-stih415.c
> index e6f6c41..c93fd26 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[] = {
> [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 = {
> diff --git a/include/dt-bindings/reset-controller/stih415-resets.h b/include/dt-bindings/reset-controller/stih415-resets.h
> index c2f8a66..c2329fe 100644
> --- a/include/dt-bindings/reset-controller/stih415-resets.h
> +++ b/include/dt-bindings/reset-controller/stih415-resets.h
> @@ -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 */
>


\
 
 \ /
  Last update: 2014-05-14 11:21    [W:0.151 / U:0.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site