| Message ID | 1397228856-9218-3-git-send-email-gabriel.fernandez@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 */ >
Hi Maxime, Am Mittwoch, den 14.05.2014, 10:51 +0200 schrieb Maxime Coquelin: > 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? Yes, please do. For both of them, feel free to add my Acked-by: Philipp Zabel <p.zabel@pengutronix.de> best regards Philipp
Thanks Philipp. On 05/14/2014 11:15 AM, Philipp Zabel wrote: > Hi Maxime, > > Am Mittwoch, den 14.05.2014, 10:51 +0200 schrieb Maxime Coquelin: >> 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? > > Yes, please do. For both of them, feel free to add my > Acked-by: Philipp Zabel <p.zabel@pengutronix.de> > > best regards > Philipp >
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 */