* [PATCH] reset: uniphier: Add SCSSI reset control for each channel
@ 2019-11-29 4:19 Kunihiko Hayashi
2019-12-02 13:06 ` Philipp Zabel
2019-12-03 14:01 ` Philipp Zabel
0 siblings, 2 replies; 5+ messages in thread
From: Kunihiko Hayashi @ 2019-11-29 4:19 UTC (permalink / raw)
To: Philipp Zabel, Masahiro Yamada
Cc: Jassi Brar, Masami Hiramatsu, Kunihiko Hayashi, linux-kernel,
linux-arm-kernel
SCSSI has reset controls for each channel in the SoCs newer than Pro4,
so this adds missing reset controls for channel 1, 2 and 3. And more, this
moves MCSSI reset ID after SCSSI.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
drivers/reset/reset-uniphier.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index 74e589f..279e535 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -193,8 +193,8 @@ static const struct uniphier_reset_data uniphier_pro5_sd_reset_data[] = {
#define UNIPHIER_PERI_RESET_FI2C(id, ch) \
UNIPHIER_RESETX((id), 0x114, 24 + (ch))
-#define UNIPHIER_PERI_RESET_SCSSI(id) \
- UNIPHIER_RESETX((id), 0x110, 17)
+#define UNIPHIER_PERI_RESET_SCSSI(id, ch) \
+ UNIPHIER_RESETX((id), 0x110, 17 + (ch))
#define UNIPHIER_PERI_RESET_MCSSI(id) \
UNIPHIER_RESETX((id), 0x114, 14)
@@ -209,7 +209,7 @@ static const struct uniphier_reset_data uniphier_ld4_peri_reset_data[] = {
UNIPHIER_PERI_RESET_I2C(6, 2),
UNIPHIER_PERI_RESET_I2C(7, 3),
UNIPHIER_PERI_RESET_I2C(8, 4),
- UNIPHIER_PERI_RESET_SCSSI(11),
+ UNIPHIER_PERI_RESET_SCSSI(11, 0),
UNIPHIER_RESET_END,
};
@@ -225,8 +225,11 @@ static const struct uniphier_reset_data uniphier_pro4_peri_reset_data[] = {
UNIPHIER_PERI_RESET_FI2C(8, 4),
UNIPHIER_PERI_RESET_FI2C(9, 5),
UNIPHIER_PERI_RESET_FI2C(10, 6),
- UNIPHIER_PERI_RESET_SCSSI(11),
- UNIPHIER_PERI_RESET_MCSSI(12),
+ UNIPHIER_PERI_RESET_SCSSI(11, 0),
+ UNIPHIER_PERI_RESET_SCSSI(12, 1),
+ UNIPHIER_PERI_RESET_SCSSI(13, 2),
+ UNIPHIER_PERI_RESET_SCSSI(14, 3),
+ UNIPHIER_PERI_RESET_MCSSI(15),
UNIPHIER_RESET_END,
};
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] reset: uniphier: Add SCSSI reset control for each channel
2019-11-29 4:19 [PATCH] reset: uniphier: Add SCSSI reset control for each channel Kunihiko Hayashi
@ 2019-12-02 13:06 ` Philipp Zabel
2019-12-03 6:11 ` Kunihiko Hayashi
2019-12-03 14:01 ` Philipp Zabel
1 sibling, 1 reply; 5+ messages in thread
From: Philipp Zabel @ 2019-12-02 13:06 UTC (permalink / raw)
To: Kunihiko Hayashi, Masahiro Yamada
Cc: Jassi Brar, Masami Hiramatsu, linux-kernel, linux-arm-kernel
On Fri, 2019-11-29 at 13:19 +0900, Kunihiko Hayashi wrote:
> SCSSI has reset controls for each channel in the SoCs newer than Pro4,
> so this adds missing reset controls for channel 1, 2 and 3. And more, this
> moves MCSSI reset ID after SCSSI.
Just to be sure, there are no device trees in circulation that already
use the MCSSI reset?
regards
Philipp
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] reset: uniphier: Add SCSSI reset control for each channel
2019-12-02 13:06 ` Philipp Zabel
@ 2019-12-03 6:11 ` Kunihiko Hayashi
2019-12-03 6:40 ` Masahiro Yamada
0 siblings, 1 reply; 5+ messages in thread
From: Kunihiko Hayashi @ 2019-12-03 6:11 UTC (permalink / raw)
To: Philipp Zabel
Cc: Masahiro Yamada, Masami Hiramatsu, linux-kernel,
linux-arm-kernel, Jassi Brar
Hi Philipp,
On Mon, 2 Dec 2019 14:06:20 +0100 <p.zabel@pengutronix.de> wrote:
> On Fri, 2019-11-29 at 13:19 +0900, Kunihiko Hayashi wrote:
> > SCSSI has reset controls for each channel in the SoCs newer than Pro4,
> > so this adds missing reset controls for channel 1, 2 and 3. And more, this
> > moves MCSSI reset ID after SCSSI.
>
> Just to be sure, there are no device trees in circulation that already
> use the MCSSI reset?
Yes, currently no device trees refer to MCSSI reset,
so I think MCSSI reset ID can be moved.
Thank you,
---
Best Regards,
Kunihiko Hayashi
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] reset: uniphier: Add SCSSI reset control for each channel
2019-12-03 6:11 ` Kunihiko Hayashi
@ 2019-12-03 6:40 ` Masahiro Yamada
0 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2019-12-03 6:40 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: Jassi Brar, Masami Hiramatsu, linux-arm-kernel, Philipp Zabel,
Linux Kernel Mailing List
On Tue, Dec 3, 2019 at 3:14 PM Kunihiko Hayashi
<hayashi.kunihiko@socionext.com> wrote:
>
> Hi Philipp,
>
> On Mon, 2 Dec 2019 14:06:20 +0100 <p.zabel@pengutronix.de> wrote:
>
> > On Fri, 2019-11-29 at 13:19 +0900, Kunihiko Hayashi wrote:
> > > SCSSI has reset controls for each channel in the SoCs newer than Pro4,
> > > so this adds missing reset controls for channel 1, 2 and 3. And more, this
> > > moves MCSSI reset ID after SCSSI.
> >
> > Just to be sure, there are no device trees in circulation that already
> > use the MCSSI reset?
>
> Yes, currently no device trees refer to MCSSI reset,
> so I think MCSSI reset ID can be moved.
>
> Thank you,
>
> ---
> Best Regards,
> Kunihiko Hayashi
>
Fixes: 6b39fd590aeb ("reset: uniphier: add reset control support for SPI")
Assuming you tested it this time,
Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
--
Best Regards
Masahiro Yamada
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] reset: uniphier: Add SCSSI reset control for each channel
2019-11-29 4:19 [PATCH] reset: uniphier: Add SCSSI reset control for each channel Kunihiko Hayashi
2019-12-02 13:06 ` Philipp Zabel
@ 2019-12-03 14:01 ` Philipp Zabel
1 sibling, 0 replies; 5+ messages in thread
From: Philipp Zabel @ 2019-12-03 14:01 UTC (permalink / raw)
To: Kunihiko Hayashi, Masahiro Yamada
Cc: Jassi Brar, Masami Hiramatsu, linux-kernel, linux-arm-kernel
On Fri, 2019-11-29 at 13:19 +0900, Kunihiko Hayashi wrote:
> SCSSI has reset controls for each channel in the SoCs newer than Pro4,
> so this adds missing reset controls for channel 1, 2 and 3. And more, this
> moves MCSSI reset ID after SCSSI.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Applied to reset/next with Masahiro's Acked-by and Fixes tags.
regards
Philipp
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-12-03 14:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-29 4:19 [PATCH] reset: uniphier: Add SCSSI reset control for each channel Kunihiko Hayashi
2019-12-02 13:06 ` Philipp Zabel
2019-12-03 6:11 ` Kunihiko Hayashi
2019-12-03 6:40 ` Masahiro Yamada
2019-12-03 14:01 ` Philipp Zabel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).