* [PATCH 0/2] reset: uniphier: add support for PCIe and SATA
@ 2018-03-30 9:44 Kunihiko Hayashi
2018-03-30 9:44 ` [PATCH 1/2] reset: uniphier: add PCIe reset control support Kunihiko Hayashi
2018-03-30 9:44 ` [PATCH 2/2] reset: uniphier: add SATA reset control support and change SATA-PHY ID Kunihiko Hayashi
0 siblings, 2 replies; 8+ messages in thread
From: Kunihiko Hayashi @ 2018-03-30 9:44 UTC (permalink / raw)
To: Philipp Zabel, Masahiro Yamada
Cc: linux-arm-kernel, linux-kernel, Kunihiko Hayashi
add reset lines for PCI-express and SATA controllers implemented on
UniPhier SoCs.
Kunihiko Hayashi (2):
reset: uniphier: add PCIe reset control support
reset: uniphier: add SATA reset control support and change SATA-PHY ID
drivers/reset/reset-uniphier.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
--
2.7.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] reset: uniphier: add PCIe reset control support
2018-03-30 9:44 [PATCH 0/2] reset: uniphier: add support for PCIe and SATA Kunihiko Hayashi
@ 2018-03-30 9:44 ` Kunihiko Hayashi
2018-04-02 3:39 ` Masahiro Yamada
2018-03-30 9:44 ` [PATCH 2/2] reset: uniphier: add SATA reset control support and change SATA-PHY ID Kunihiko Hayashi
1 sibling, 1 reply; 8+ messages in thread
From: Kunihiko Hayashi @ 2018-03-30 9:44 UTC (permalink / raw)
To: Philipp Zabel, Masahiro Yamada
Cc: linux-arm-kernel, linux-kernel, Kunihiko Hayashi
Add reset lines for PCIe controller on UniPhier SoCs. This adds support for
Pro5, LD20 and PXs3.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
drivers/reset/reset-uniphier.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index 360e06b..55ae0f1 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -73,6 +73,7 @@ static const struct uniphier_reset_data uniphier_pro5_sys_reset_data[] = {
UNIPHIER_RESETX(12, 0x2000, 6), /* GIO (PCIe, USB3) */
UNIPHIER_RESETX(14, 0x2000, 17), /* USB30 */
UNIPHIER_RESETX(15, 0x2004, 17), /* USB31 */
+ UNIPHIER_RESETX(24, 0x2008, 2), /* PCIe */
UNIPHIER_RESETX(40, 0x2000, 13), /* AIO */
UNIPHIER_RESET_END,
};
@@ -115,6 +116,7 @@ static const struct uniphier_reset_data uniphier_ld20_sys_reset_data[] = {
UNIPHIER_RESETX(17, 0x200c, 13), /* USB30-PHY1 */
UNIPHIER_RESETX(18, 0x200c, 14), /* USB30-PHY2 */
UNIPHIER_RESETX(19, 0x200c, 15), /* USB30-PHY3 */
+ UNIPHIER_RESETX(24, 0x200c, 4), /* PCIe */
UNIPHIER_RESETX(40, 0x2008, 0), /* AIO */
UNIPHIER_RESETX(41, 0x2008, 1), /* EVEA */
UNIPHIER_RESETX(42, 0x2010, 2), /* EXIV */
@@ -134,6 +136,7 @@ static const struct uniphier_reset_data uniphier_pxs3_sys_reset_data[] = {
UNIPHIER_RESETX(18, 0x200c, 20), /* USB30-PHY2 */
UNIPHIER_RESETX(20, 0x200c, 17), /* USB31-PHY0 */
UNIPHIER_RESETX(21, 0x200c, 19), /* USB31-PHY1 */
+ UNIPHIER_RESETX(24, 0x200c, 3), /* PCIe */
UNIPHIER_RESET_END,
};
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] reset: uniphier: add SATA reset control support and change SATA-PHY ID
2018-03-30 9:44 [PATCH 0/2] reset: uniphier: add support for PCIe and SATA Kunihiko Hayashi
2018-03-30 9:44 ` [PATCH 1/2] reset: uniphier: add PCIe reset control support Kunihiko Hayashi
@ 2018-03-30 9:44 ` Kunihiko Hayashi
2018-04-02 3:39 ` Masahiro Yamada
2018-04-03 8:18 ` Philipp Zabel
1 sibling, 2 replies; 8+ messages in thread
From: Kunihiko Hayashi @ 2018-03-30 9:44 UTC (permalink / raw)
To: Philipp Zabel, Masahiro Yamada
Cc: linux-arm-kernel, linux-kernel, Kunihiko Hayashi
Add reset lines for SATA controller on UniPhier SoCs.
This adds support for Pro4 and PXs3 in addition to PXs2.
And this changes the ID of the reset line for SATA-PHY on PXs2.
Since some SoCs have two controller instances with a common PHY, this moves
the ID of SATA-PHY for consistency.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
drivers/reset/reset-uniphier.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index 55ae0f1..90e6caf 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -63,6 +63,9 @@ static const struct uniphier_reset_data uniphier_pro4_sys_reset_data[] = {
UNIPHIER_RESETX(12, 0x2000, 6), /* GIO (Ether, SATA, USB3) */
UNIPHIER_RESETX(14, 0x2000, 17), /* USB30 */
UNIPHIER_RESETX(15, 0x2004, 17), /* USB31 */
+ UNIPHIER_RESETX(28, 0x2000, 18), /* SATA0 */
+ UNIPHIER_RESETX(29, 0x2004, 18), /* SATA1 */
+ UNIPHIER_RESETX(30, 0x2000, 19), /* SATA-PHY */
UNIPHIER_RESETX(40, 0x2000, 13), /* AIO */
UNIPHIER_RESET_END,
};
@@ -90,7 +93,7 @@ static const struct uniphier_reset_data uniphier_pxs2_sys_reset_data[] = {
UNIPHIER_RESETX(20, 0x2014, 5), /* USB31-PHY0 */
UNIPHIER_RESETX(21, 0x2014, 1), /* USB31-PHY1 */
UNIPHIER_RESETX(28, 0x2014, 12), /* SATA */
- UNIPHIER_RESET(29, 0x2014, 8), /* SATA-PHY (active high) */
+ UNIPHIER_RESET(30, 0x2014, 8), /* SATA-PHY (active high) */
UNIPHIER_RESETX(40, 0x2000, 13), /* AIO */
UNIPHIER_RESET_END,
};
@@ -137,6 +140,9 @@ static const struct uniphier_reset_data uniphier_pxs3_sys_reset_data[] = {
UNIPHIER_RESETX(20, 0x200c, 17), /* USB31-PHY0 */
UNIPHIER_RESETX(21, 0x200c, 19), /* USB31-PHY1 */
UNIPHIER_RESETX(24, 0x200c, 3), /* PCIe */
+ UNIPHIER_RESETX(28, 0x200c, 7), /* SATA0 */
+ UNIPHIER_RESETX(29, 0x200c, 8), /* SATA1 */
+ UNIPHIER_RESETX(30, 0x200c, 21), /* SATA-PHY */
UNIPHIER_RESET_END,
};
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] reset: uniphier: add PCIe reset control support
2018-03-30 9:44 ` [PATCH 1/2] reset: uniphier: add PCIe reset control support Kunihiko Hayashi
@ 2018-04-02 3:39 ` Masahiro Yamada
0 siblings, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2018-04-02 3:39 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: Philipp Zabel, linux-arm-kernel, Linux Kernel Mailing List
2018-03-30 18:44 GMT+09:00 Kunihiko Hayashi <hayashi.kunihiko@socionext.com>:
> Add reset lines for PCIe controller on UniPhier SoCs. This adds support for
> Pro5, LD20 and PXs3.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] reset: uniphier: add SATA reset control support and change SATA-PHY ID
2018-03-30 9:44 ` [PATCH 2/2] reset: uniphier: add SATA reset control support and change SATA-PHY ID Kunihiko Hayashi
@ 2018-04-02 3:39 ` Masahiro Yamada
2018-04-03 8:18 ` Philipp Zabel
1 sibling, 0 replies; 8+ messages in thread
From: Masahiro Yamada @ 2018-04-02 3:39 UTC (permalink / raw)
To: Kunihiko Hayashi
Cc: Philipp Zabel, linux-arm-kernel, Linux Kernel Mailing List
2018-03-30 18:44 GMT+09:00 Kunihiko Hayashi <hayashi.kunihiko@socionext.com>:
> Add reset lines for SATA controller on UniPhier SoCs.
> This adds support for Pro4 and PXs3 in addition to PXs2.
>
> And this changes the ID of the reset line for SATA-PHY on PXs2.
> Since some SoCs have two controller instances with a common PHY, this moves
> the ID of SATA-PHY for consistency.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] reset: uniphier: add SATA reset control support and change SATA-PHY ID
2018-03-30 9:44 ` [PATCH 2/2] reset: uniphier: add SATA reset control support and change SATA-PHY ID Kunihiko Hayashi
2018-04-02 3:39 ` Masahiro Yamada
@ 2018-04-03 8:18 ` Philipp Zabel
2018-04-03 8:35 ` Masahiro Yamada
1 sibling, 1 reply; 8+ messages in thread
From: Philipp Zabel @ 2018-04-03 8:18 UTC (permalink / raw)
To: Kunihiko Hayashi, Masahiro Yamada; +Cc: linux-arm-kernel, linux-kernel
On Fri, 2018-03-30 at 18:44 +0900, Kunihiko Hayashi wrote:
> Add reset lines for SATA controller on UniPhier SoCs.
> This adds support for Pro4 and PXs3 in addition to PXs2.
>
> And this changes the ID of the reset line for SATA-PHY on PXs2.
> Since some SoCs have two controller instances with a common PHY, this moves
> the ID of SATA-PHY for consistency.
>
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
> drivers/reset/reset-uniphier.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
> index 55ae0f1..90e6caf 100644
> --- a/drivers/reset/reset-uniphier.c
> +++ b/drivers/reset/reset-uniphier.c
> @@ -63,6 +63,9 @@ static const struct uniphier_reset_data uniphier_pro4_sys_reset_data[] = {
> UNIPHIER_RESETX(12, 0x2000, 6), /* GIO (Ether, SATA, USB3) */
> UNIPHIER_RESETX(14, 0x2000, 17), /* USB30 */
> UNIPHIER_RESETX(15, 0x2004, 17), /* USB31 */
> + UNIPHIER_RESETX(28, 0x2000, 18), /* SATA0 */
> + UNIPHIER_RESETX(29, 0x2004, 18), /* SATA1 */
> + UNIPHIER_RESETX(30, 0x2000, 19), /* SATA-PHY */
> UNIPHIER_RESETX(40, 0x2000, 13), /* AIO */
> UNIPHIER_RESET_END,
> };
> @@ -90,7 +93,7 @@ static const struct uniphier_reset_data uniphier_pxs2_sys_reset_data[] = {
> UNIPHIER_RESETX(20, 0x2014, 5), /* USB31-PHY0 */
> UNIPHIER_RESETX(21, 0x2014, 1), /* USB31-PHY1 */
> UNIPHIER_RESETX(28, 0x2014, 12), /* SATA */
> - UNIPHIER_RESET(29, 0x2014, 8), /* SATA-PHY (active high) */
> + UNIPHIER_RESET(30, 0x2014, 8), /* SATA-PHY (active high) */
This is a backwards incompatible change.
There is no DT in use that relies on this being 29 ?
regards
Philipp
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] reset: uniphier: add SATA reset control support and change SATA-PHY ID
2018-04-03 8:18 ` Philipp Zabel
@ 2018-04-03 8:35 ` Masahiro Yamada
2018-04-03 8:47 ` Philipp Zabel
0 siblings, 1 reply; 8+ messages in thread
From: Masahiro Yamada @ 2018-04-03 8:35 UTC (permalink / raw)
To: Philipp Zabel
Cc: Kunihiko Hayashi, linux-arm-kernel, Linux Kernel Mailing List
2018-04-03 17:18 GMT+09:00 Philipp Zabel <p.zabel@pengutronix.de>:
> On Fri, 2018-03-30 at 18:44 +0900, Kunihiko Hayashi wrote:
>> Add reset lines for SATA controller on UniPhier SoCs.
>> This adds support for Pro4 and PXs3 in addition to PXs2.
>>
>> And this changes the ID of the reset line for SATA-PHY on PXs2.
>> Since some SoCs have two controller instances with a common PHY, this moves
>> the ID of SATA-PHY for consistency.
>>
>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>> ---
>> drivers/reset/reset-uniphier.c | 8 +++++++-
>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
>> index 55ae0f1..90e6caf 100644
>> --- a/drivers/reset/reset-uniphier.c
>> +++ b/drivers/reset/reset-uniphier.c
>> @@ -63,6 +63,9 @@ static const struct uniphier_reset_data uniphier_pro4_sys_reset_data[] = {
>> UNIPHIER_RESETX(12, 0x2000, 6), /* GIO (Ether, SATA, USB3) */
>> UNIPHIER_RESETX(14, 0x2000, 17), /* USB30 */
>> UNIPHIER_RESETX(15, 0x2004, 17), /* USB31 */
>> + UNIPHIER_RESETX(28, 0x2000, 18), /* SATA0 */
>> + UNIPHIER_RESETX(29, 0x2004, 18), /* SATA1 */
>> + UNIPHIER_RESETX(30, 0x2000, 19), /* SATA-PHY */
>> UNIPHIER_RESETX(40, 0x2000, 13), /* AIO */
>> UNIPHIER_RESET_END,
>> };
>> @@ -90,7 +93,7 @@ static const struct uniphier_reset_data uniphier_pxs2_sys_reset_data[] = {
>> UNIPHIER_RESETX(20, 0x2014, 5), /* USB31-PHY0 */
>> UNIPHIER_RESETX(21, 0x2014, 1), /* USB31-PHY1 */
>> UNIPHIER_RESETX(28, 0x2014, 12), /* SATA */
>> - UNIPHIER_RESET(29, 0x2014, 8), /* SATA-PHY (active high) */
>> + UNIPHIER_RESET(30, 0x2014, 8), /* SATA-PHY (active high) */
>
> This is a backwards incompatible change.
> There is no DT in use that relies on this being 29 ?
Right. No user for this reset line ever.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] reset: uniphier: add SATA reset control support and change SATA-PHY ID
2018-04-03 8:35 ` Masahiro Yamada
@ 2018-04-03 8:47 ` Philipp Zabel
0 siblings, 0 replies; 8+ messages in thread
From: Philipp Zabel @ 2018-04-03 8:47 UTC (permalink / raw)
To: Masahiro Yamada
Cc: Kunihiko Hayashi, linux-arm-kernel, Linux Kernel Mailing List
On Tue, 2018-04-03 at 17:35 +0900, Masahiro Yamada wrote:
> 2018-04-03 17:18 GMT+09:00 Philipp Zabel <p.zabel@pengutronix.de>:
> > On Fri, 2018-03-30 at 18:44 +0900, Kunihiko Hayashi wrote:
> > > Add reset lines for SATA controller on UniPhier SoCs.
> > > This adds support for Pro4 and PXs3 in addition to PXs2.
> > >
> > > And this changes the ID of the reset line for SATA-PHY on PXs2.
> > > Since some SoCs have two controller instances with a common PHY, this moves
> > > the ID of SATA-PHY for consistency.
> > >
> > > Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> > > ---
> > > drivers/reset/reset-uniphier.c | 8 +++++++-
> > > 1 file changed, 7 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
> > > index 55ae0f1..90e6caf 100644
> > > --- a/drivers/reset/reset-uniphier.c
> > > +++ b/drivers/reset/reset-uniphier.c
> > > @@ -63,6 +63,9 @@ static const struct uniphier_reset_data uniphier_pro4_sys_reset_data[] = {
> > > UNIPHIER_RESETX(12, 0x2000, 6), /* GIO (Ether, SATA, USB3) */
> > > UNIPHIER_RESETX(14, 0x2000, 17), /* USB30 */
> > > UNIPHIER_RESETX(15, 0x2004, 17), /* USB31 */
> > > + UNIPHIER_RESETX(28, 0x2000, 18), /* SATA0 */
> > > + UNIPHIER_RESETX(29, 0x2004, 18), /* SATA1 */
> > > + UNIPHIER_RESETX(30, 0x2000, 19), /* SATA-PHY */
> > > UNIPHIER_RESETX(40, 0x2000, 13), /* AIO */
> > > UNIPHIER_RESET_END,
> > > };
> > > @@ -90,7 +93,7 @@ static const struct uniphier_reset_data uniphier_pxs2_sys_reset_data[] = {
> > > UNIPHIER_RESETX(20, 0x2014, 5), /* USB31-PHY0 */
> > > UNIPHIER_RESETX(21, 0x2014, 1), /* USB31-PHY1 */
> > > UNIPHIER_RESETX(28, 0x2014, 12), /* SATA */
> > > - UNIPHIER_RESET(29, 0x2014, 8), /* SATA-PHY (active high) */
> > > + UNIPHIER_RESET(30, 0x2014, 8), /* SATA-PHY (active high) */
> >
> > This is a backwards incompatible change.
> > There is no DT in use that relies on this being 29 ?
>
>
> Right. No user for this reset line ever.
Thank you, I have applied both patches to reset/next.
regards
Philipp
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-04-03 8:47 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-30 9:44 [PATCH 0/2] reset: uniphier: add support for PCIe and SATA Kunihiko Hayashi
2018-03-30 9:44 ` [PATCH 1/2] reset: uniphier: add PCIe reset control support Kunihiko Hayashi
2018-04-02 3:39 ` Masahiro Yamada
2018-03-30 9:44 ` [PATCH 2/2] reset: uniphier: add SATA reset control support and change SATA-PHY ID Kunihiko Hayashi
2018-04-02 3:39 ` Masahiro Yamada
2018-04-03 8:18 ` Philipp Zabel
2018-04-03 8:35 ` Masahiro Yamada
2018-04-03 8:47 ` 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).