* [PATCH 2/3] reset: sti: Add support for resetting co-processors
2015-10-26 10:56 [PATCH 1/3] ARM: STi: Add DT defines for co-processor reset lines Lee Jones
@ 2015-10-26 10:56 ` Lee Jones
2015-10-26 10:56 ` [PATCH 3/3] reset: sti: Provide ops .status() call-back Lee Jones
2016-01-12 13:34 ` [PATCH 1/3] ARM: STi: Add DT defines for co-processor reset lines Lee Jones
2 siblings, 0 replies; 8+ messages in thread
From: Lee Jones @ 2015-10-26 10:56 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/reset/sti/reset-stih407.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/reset/sti/reset-stih407.c b/drivers/reset/sti/reset-stih407.c
index d83db5d7..5c2d68a 100644
--- a/drivers/reset/sti/reset-stih407.c
+++ b/drivers/reset/sti/reset-stih407.c
@@ -52,6 +52,7 @@ static const struct syscfg_reset_channel_data stih407_powerdowns[] = {
};
/* Reset Generator control 0/1 */
+#define SYSCFG_5128 0x200
#define SYSCFG_5131 0x20c
#define SYSCFG_5132 0x210
@@ -96,6 +97,10 @@ static const struct syscfg_reset_channel_data stih407_softresets[] = {
[STIH407_ERAM_HVA_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5132, 1),
[STIH407_LPM_SOFTRESET] = STIH407_SRST_SBC(SYSCFG_4002, 2),
[STIH407_KEYSCAN_SOFTRESET] = STIH407_SRST_LPM(LPM_SYSCFG_1, 8),
+ [STIH407_ST231_AUD_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 26),
+ [STIH407_ST231_DMU_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 27),
+ [STIH407_ST231_GP0_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5131, 28),
+ [STIH407_ST231_GP1_SOFTRESET] = STIH407_SRST_CORE(SYSCFG_5128, 2),
};
/* PicoPHY reset/control */
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/3] reset: sti: Provide ops .status() call-back
2015-10-26 10:56 [PATCH 1/3] ARM: STi: Add DT defines for co-processor reset lines Lee Jones
2015-10-26 10:56 ` [PATCH 2/3] reset: sti: Add support for resetting co-processors Lee Jones
@ 2015-10-26 10:56 ` Lee Jones
2016-01-12 13:34 ` [PATCH 1/3] ARM: STi: Add DT defines for co-processor reset lines Lee Jones
2 siblings, 0 replies; 8+ messages in thread
From: Lee Jones @ 2015-10-26 10:56 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/reset/sti/reset-syscfg.c | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/drivers/reset/sti/reset-syscfg.c b/drivers/reset/sti/reset-syscfg.c
index a145cc0..4453412 100644
--- a/drivers/reset/sti/reset-syscfg.c
+++ b/drivers/reset/sti/reset-syscfg.c
@@ -110,10 +110,33 @@ static int syscfg_reset_dev(struct reset_controller_dev *rcdev,
return syscfg_reset_deassert(rcdev, idx);
}
+static int syscfg_reset_status(struct reset_controller_dev *rcdev,
+ unsigned long idx)
+{
+ struct syscfg_reset_controller *rst = to_syscfg_reset_controller(rcdev);
+ const struct syscfg_reset_channel *ch;
+ u32 ret_val = 0;
+ int err;
+
+ if (idx >= rcdev->nr_resets)
+ return -EINVAL;
+
+ ch = &rst->channels[idx];
+ if (ch->ack)
+ err = regmap_field_read(ch->ack, &ret_val);
+ else
+ err = regmap_field_read(ch->reset, &ret_val);
+ if (err)
+ return err;
+
+ return rst->active_low ? !ret_val : !!ret_val;
+}
+
static struct reset_control_ops syscfg_reset_ops = {
.reset = syscfg_reset_dev,
.assert = syscfg_reset_assert,
.deassert = syscfg_reset_deassert,
+ .status = syscfg_reset_status,
};
static int syscfg_reset_controller_register(struct device *dev,
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 1/3] ARM: STi: Add DT defines for co-processor reset lines
2015-10-26 10:56 [PATCH 1/3] ARM: STi: Add DT defines for co-processor reset lines Lee Jones
2015-10-26 10:56 ` [PATCH 2/3] reset: sti: Add support for resetting co-processors Lee Jones
2015-10-26 10:56 ` [PATCH 3/3] reset: sti: Provide ops .status() call-back Lee Jones
@ 2016-01-12 13:34 ` Lee Jones
2016-01-12 13:41 ` Philipp Zabel
2 siblings, 1 reply; 8+ messages in thread
From: Lee Jones @ 2016-01-12 13:34 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 26 Oct 2015, Lee Jones wrote:
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> include/dt-bindings/reset-controller/stih407-resets.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/include/dt-bindings/reset-controller/stih407-resets.h b/include/dt-bindings/reset-controller/stih407-resets.h
> index 02d4328..4ab3a1c 100644
> --- a/include/dt-bindings/reset-controller/stih407-resets.h
> +++ b/include/dt-bindings/reset-controller/stih407-resets.h
> @@ -52,6 +52,10 @@
> #define STIH407_KEYSCAN_SOFTRESET 26
> #define STIH407_USB2_PORT0_SOFTRESET 27
> #define STIH407_USB2_PORT1_SOFTRESET 28
> +#define STIH407_ST231_AUD_SOFTRESET 29
> +#define STIH407_ST231_DMU_SOFTRESET 30
> +#define STIH407_ST231_GP0_SOFTRESET 31
> +#define STIH407_ST231_GP1_SOFTRESET 32
>
> /* Picophy reset defines */
> #define STIH407_PICOPHY0_RESET 0
Has anyone seen this patch?
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/3] ARM: STi: Add DT defines for co-processor reset lines
2016-01-12 13:34 ` [PATCH 1/3] ARM: STi: Add DT defines for co-processor reset lines Lee Jones
@ 2016-01-12 13:41 ` Philipp Zabel
2016-01-12 14:26 ` Lee Jones
0 siblings, 1 reply; 8+ messages in thread
From: Philipp Zabel @ 2016-01-12 13:41 UTC (permalink / raw)
To: linux-arm-kernel
Hi Lee,
Am Dienstag, den 12.01.2016, 13:34 +0000 schrieb Lee Jones:
> On Mon, 26 Oct 2015, Lee Jones wrote:
>
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > ---
> > include/dt-bindings/reset-controller/stih407-resets.h | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/include/dt-bindings/reset-controller/stih407-resets.h b/include/dt-bindings/reset-controller/stih407-resets.h
> > index 02d4328..4ab3a1c 100644
> > --- a/include/dt-bindings/reset-controller/stih407-resets.h
> > +++ b/include/dt-bindings/reset-controller/stih407-resets.h
> > @@ -52,6 +52,10 @@
> > #define STIH407_KEYSCAN_SOFTRESET 26
> > #define STIH407_USB2_PORT0_SOFTRESET 27
> > #define STIH407_USB2_PORT1_SOFTRESET 28
> > +#define STIH407_ST231_AUD_SOFTRESET 29
> > +#define STIH407_ST231_DMU_SOFTRESET 30
> > +#define STIH407_ST231_GP0_SOFTRESET 31
> > +#define STIH407_ST231_GP1_SOFTRESET 32
> >
> > /* Picophy reset defines */
> > #define STIH407_PICOPHY0_RESET 0
>
> Has anyone seen this patch?
c9bfec0032fb, sorry I missed 4.4.
regards
Philipp
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/3] ARM: STi: Add DT defines for co-processor reset lines
2016-01-12 13:41 ` Philipp Zabel
@ 2016-01-12 14:26 ` Lee Jones
2016-01-12 15:56 ` Philipp Zabel
0 siblings, 1 reply; 8+ messages in thread
From: Lee Jones @ 2016-01-12 14:26 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 12 Jan 2016, Philipp Zabel wrote:
> Hi Lee,
>
> Am Dienstag, den 12.01.2016, 13:34 +0000 schrieb Lee Jones:
> > On Mon, 26 Oct 2015, Lee Jones wrote:
> >
> > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > ---
> > > include/dt-bindings/reset-controller/stih407-resets.h | 4 ++++
> > > 1 file changed, 4 insertions(+)
> > >
> > > diff --git a/include/dt-bindings/reset-controller/stih407-resets.h b/include/dt-bindings/reset-controller/stih407-resets.h
> > > index 02d4328..4ab3a1c 100644
> > > --- a/include/dt-bindings/reset-controller/stih407-resets.h
> > > +++ b/include/dt-bindings/reset-controller/stih407-resets.h
> > > @@ -52,6 +52,10 @@
> > > #define STIH407_KEYSCAN_SOFTRESET 26
> > > #define STIH407_USB2_PORT0_SOFTRESET 27
> > > #define STIH407_USB2_PORT1_SOFTRESET 28
> > > +#define STIH407_ST231_AUD_SOFTRESET 29
> > > +#define STIH407_ST231_DMU_SOFTRESET 30
> > > +#define STIH407_ST231_GP0_SOFTRESET 31
> > > +#define STIH407_ST231_GP1_SOFTRESET 32
> > >
> > > /* Picophy reset defines */
> > > #define STIH407_PICOPHY0_RESET 0
> >
> > Has anyone seen this patch?
>
> c9bfec0032fb, sorry I missed 4.4.
What about v4.5? The merge window has only just opened.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/3] ARM: STi: Add DT defines for co-processor reset lines
2016-01-12 14:26 ` Lee Jones
@ 2016-01-12 15:56 ` Philipp Zabel
2016-01-12 16:25 ` Lee Jones
0 siblings, 1 reply; 8+ messages in thread
From: Philipp Zabel @ 2016-01-12 15:56 UTC (permalink / raw)
To: linux-arm-kernel
Am Dienstag, den 12.01.2016, 14:26 +0000 schrieb Lee Jones:
> On Tue, 12 Jan 2016, Philipp Zabel wrote:
>
> > Hi Lee,
> >
> > Am Dienstag, den 12.01.2016, 13:34 +0000 schrieb Lee Jones:
> > > On Mon, 26 Oct 2015, Lee Jones wrote:
> > >
> > > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > > ---
> > > > include/dt-bindings/reset-controller/stih407-resets.h | 4 ++++
> > > > 1 file changed, 4 insertions(+)
> > > >
> > > > diff --git a/include/dt-bindings/reset-controller/stih407-resets.h b/include/dt-bindings/reset-controller/stih407-resets.h
> > > > index 02d4328..4ab3a1c 100644
> > > > --- a/include/dt-bindings/reset-controller/stih407-resets.h
> > > > +++ b/include/dt-bindings/reset-controller/stih407-resets.h
> > > > @@ -52,6 +52,10 @@
> > > > #define STIH407_KEYSCAN_SOFTRESET 26
> > > > #define STIH407_USB2_PORT0_SOFTRESET 27
> > > > #define STIH407_USB2_PORT1_SOFTRESET 28
> > > > +#define STIH407_ST231_AUD_SOFTRESET 29
> > > > +#define STIH407_ST231_DMU_SOFTRESET 30
> > > > +#define STIH407_ST231_GP0_SOFTRESET 31
> > > > +#define STIH407_ST231_GP1_SOFTRESET 32
> > > >
> > > > /* Picophy reset defines */
> > > > #define STIH407_PICOPHY0_RESET 0
> > >
> > > Has anyone seen this patch?
> >
> > c9bfec0032fb, sorry I missed 4.4.
>
> What about v4.5? The merge window has only just opened.
It's sitting in arm-soc/for-next, so it should hit mainline during this
merge window.
regards
Philipp
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/3] ARM: STi: Add DT defines for co-processor reset lines
2016-01-12 15:56 ` Philipp Zabel
@ 2016-01-12 16:25 ` Lee Jones
0 siblings, 0 replies; 8+ messages in thread
From: Lee Jones @ 2016-01-12 16:25 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 12 Jan 2016, Philipp Zabel wrote:
> Am Dienstag, den 12.01.2016, 14:26 +0000 schrieb Lee Jones:
> > On Tue, 12 Jan 2016, Philipp Zabel wrote:
> >
> > > Hi Lee,
> > >
> > > Am Dienstag, den 12.01.2016, 13:34 +0000 schrieb Lee Jones:
> > > > On Mon, 26 Oct 2015, Lee Jones wrote:
> > > >
> > > > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > > > ---
> > > > > include/dt-bindings/reset-controller/stih407-resets.h | 4 ++++
> > > > > 1 file changed, 4 insertions(+)
> > > > >
> > > > > diff --git a/include/dt-bindings/reset-controller/stih407-resets.h b/include/dt-bindings/reset-controller/stih407-resets.h
> > > > > index 02d4328..4ab3a1c 100644
> > > > > --- a/include/dt-bindings/reset-controller/stih407-resets.h
> > > > > +++ b/include/dt-bindings/reset-controller/stih407-resets.h
> > > > > @@ -52,6 +52,10 @@
> > > > > #define STIH407_KEYSCAN_SOFTRESET 26
> > > > > #define STIH407_USB2_PORT0_SOFTRESET 27
> > > > > #define STIH407_USB2_PORT1_SOFTRESET 28
> > > > > +#define STIH407_ST231_AUD_SOFTRESET 29
> > > > > +#define STIH407_ST231_DMU_SOFTRESET 30
> > > > > +#define STIH407_ST231_GP0_SOFTRESET 31
> > > > > +#define STIH407_ST231_GP1_SOFTRESET 32
> > > > >
> > > > > /* Picophy reset defines */
> > > > > #define STIH407_PICOPHY0_RESET 0
> > > >
> > > > Has anyone seen this patch?
> > >
> > > c9bfec0032fb, sorry I missed 4.4.
> >
> > What about v4.5? The merge window has only just opened.
>
> It's sitting in arm-soc/for-next, so it should hit mainline during this
> merge window.
Wonderful, thanks.
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 8+ messages in thread