[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <53732EAB.1050709@st.com>
Date: Wed, 14 May 2014 10:51:55 +0200
From: Maxime Coquelin <maxime.coquelin@...com>
To: Gabriel FERNANDEZ <gabriel.fernandez@...com>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Rob Herring <robh+dt@...nel.org>,
Pawel Moll <pawel.moll@....com>,
Mark Rutland <mark.rutland@....com>,
Ian Campbell <ijc+devicetree@...lion.org.uk>,
Kumar Gala <galak@...eaurora.org>,
Rob Landley <rob@...dley.net>,
Russell King <linux@....linux.org.uk>,
Grant Likely <grant.likely@...aro.org>,
Philipp Zabel <p.zabel@...gutronix.de>,
Arnd Bergmann <arnd@...db.de>, olof Johansson <olof@...om.net>
Cc: <devicetree@...r.kernel.org>, <kernel@...inux.com>,
<linux-doc@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
Gabriel Fernandez <gabriel.fernandez@...aro.org>,
<linux-input@...r.kernel.org>, Lee Jones <lee.jones@...aro.org>,
<linux-arm-kernel@...ts.infradead.org>,
Giuseppe Condorelli <giuseppe.condorelli@...com>
Subject: Re: [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@...com>
> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@...aro.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 */
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists