2017-08-10 07:27:06

by Katsuhiro Suzuki

[permalink] [raw]
Subject: [PATCH 1/3] reset: uniphier: add audio systems reset control

Add reset lines for audio subsystem (AIO) and
SoC internal audio codec (EVEA) on UniPhier LD11/LD20 SoCs.

Signed-off-by: Katsuhiro Suzuki <[email protected]>
---
drivers/reset/reset-uniphier.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index 954b2c4e6ca7..90c52a96f775 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -93,6 +93,8 @@ static const struct uniphier_reset_data uniphier_ld11_sys_reset_data[] = {
UNIPHIER_RESETX(2, 0x200c, 0), /* NAND */
UNIPHIER_RESETX(4, 0x200c, 2), /* eMMC */
UNIPHIER_RESETX(8, 0x200c, 8), /* STDMAC (HSC, MIO) */
+ UNIPHIER_RESETX(40, 0x2008, 0), /* AIO */
+ UNIPHIER_RESETX(41, 0x2008, 1), /* EVEA */
UNIPHIER_RESET_END,
};

@@ -105,6 +107,8 @@ 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(40, 0x2008, 0), /* AIO */
+ UNIPHIER_RESETX(41, 0x2008, 1), /* EVEA */
UNIPHIER_RESET_END,
};

--
2.13.2


2017-08-10 07:27:18

by Katsuhiro Suzuki

[permalink] [raw]
Subject: [PATCH 3/3] reset: uniphier: add analog amplifiers reset control

Add a reset line for analog signal amplifier core (ADAMV) on
UniPhier LD11/LD20 SoCs.

Signed-off-by: Katsuhiro Suzuki <[email protected]>
---
drivers/reset/reset-uniphier.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)

diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index f60c137c17cb..cda4a78a58e2 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -196,6 +196,12 @@ static const struct uniphier_reset_data uniphier_pro4_peri_reset_data[] = {
UNIPHIER_RESET_END,
};

+/* Analog signal amplifiers reset data */
+static const struct uniphier_reset_data uniphier_ld11_adamv_reset_data[] = {
+ UNIPHIER_RESETX(100, 0x10, 6), /* EVEA */
+ UNIPHIER_RESET_END,
+};
+
/* core implementaton */
struct uniphier_reset_priv {
struct reset_controller_dev rcdev;
@@ -415,6 +421,15 @@ static const struct of_device_id uniphier_reset_match[] = {
.compatible = "socionext,uniphier-ld20-peri-reset",
.data = uniphier_pro4_peri_reset_data,
},
+ /* Analog signal amplifiers reset */
+ {
+ .compatible = "socionext,uniphier-ld11-adamv-reset",
+ .data = uniphier_ld11_adamv_reset_data,
+ },
+ {
+ .compatible = "socionext,uniphier-ld20-adamv-reset",
+ .data = uniphier_ld11_adamv_reset_data,
+ },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, uniphier_reset_match);
--
2.13.2

2017-08-10 07:27:30

by Katsuhiro Suzuki

[permalink] [raw]
Subject: [PATCH 2/3] reset: uniphier: add video input subsystem reset control

Add a reset line for video input subsystem (EXIV) on
UniPhier LD11/LD20 SoCs.

Signed-off-by: Katsuhiro Suzuki <[email protected]>
---
drivers/reset/reset-uniphier.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
index 90c52a96f775..f60c137c17cb 100644
--- a/drivers/reset/reset-uniphier.c
+++ b/drivers/reset/reset-uniphier.c
@@ -95,6 +95,7 @@ static const struct uniphier_reset_data uniphier_ld11_sys_reset_data[] = {
UNIPHIER_RESETX(8, 0x200c, 8), /* STDMAC (HSC, MIO) */
UNIPHIER_RESETX(40, 0x2008, 0), /* AIO */
UNIPHIER_RESETX(41, 0x2008, 1), /* EVEA */
+ UNIPHIER_RESETX(42, 0x2010, 2), /* EXIV */
UNIPHIER_RESET_END,
};

@@ -109,6 +110,7 @@ static const struct uniphier_reset_data uniphier_ld20_sys_reset_data[] = {
UNIPHIER_RESETX(19, 0x200c, 15), /* USB30-PHY3 */
UNIPHIER_RESETX(40, 0x2008, 0), /* AIO */
UNIPHIER_RESETX(41, 0x2008, 1), /* EVEA */
+ UNIPHIER_RESETX(42, 0x2010, 2), /* EXIV */
UNIPHIER_RESET_END,
};

--
2.13.2

2017-08-10 10:37:43

by Philipp Zabel

[permalink] [raw]
Subject: Re: [PATCH 3/3] reset: uniphier: add analog amplifiers reset control

Hi Katsuhiro,

On Thu, 2017-08-10 at 16:27 +0900, Katsuhiro Suzuki wrote:
> Add a reset line for analog signal amplifier core (ADAMV) on
> UniPhier LD11/LD20 SoCs.
>
> > Signed-off-by: Katsuhiro Suzuki <[email protected]>
> ---
>  drivers/reset/reset-uniphier.c | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
>
> diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
> index f60c137c17cb..cda4a78a58e2 100644
> --- a/drivers/reset/reset-uniphier.c
> +++ b/drivers/reset/reset-uniphier.c
> @@ -196,6 +196,12 @@ static const struct uniphier_reset_data uniphier_pro4_peri_reset_data[] = {
> >   UNIPHIER_RESET_END,
>  };
>  
> +/* Analog signal amplifiers reset data */
> +static const struct uniphier_reset_data uniphier_ld11_adamv_reset_data[] = {
> > + UNIPHIER_RESETX(100, 0x10, 6), /* EVEA */
> > + UNIPHIER_RESET_END,
> +};
> +
>  /* core implementaton */
>  struct uniphier_reset_priv {
> >   struct reset_controller_dev rcdev;
> @@ -415,6 +421,15 @@ static const struct of_device_id uniphier_reset_match[] = {
> >   .compatible = "socionext,uniphier-ld20-peri-reset",
> >   .data = uniphier_pro4_peri_reset_data,
> >   },
> > + /* Analog signal amplifiers reset */
> > + {
> > + .compatible = "socionext,uniphier-ld11-adamv-reset",
> > + .data = uniphier_ld11_adamv_reset_data,
> > + },
> > + {
> > + .compatible = "socionext,uniphier-ld20-adamv-reset",
> > + .data = uniphier_ld11_adamv_reset_data,
> > + },
> >   { /* sentinel */ }
>  };
>  MODULE_DEVICE_TABLE(of, uniphier_reset_match);

Please add a patch to describe the new compatible values in
Documentation/devicetree/bindings/reset/uniphier-reset.txt.

regards
Philipp

2017-08-10 11:08:56

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 1/3] reset: uniphier: add audio systems reset control

2017-08-10 16:27 GMT+09:00 Katsuhiro Suzuki <[email protected]>:
> Add reset lines for audio subsystem (AIO) and
> SoC internal audio codec (EVEA) on UniPhier LD11/LD20 SoCs.
>
> Signed-off-by: Katsuhiro Suzuki <[email protected]>


Acked-by: Masahiro Yamada <[email protected]>




--
Best Regards
Masahiro Yamada

2017-08-10 11:09:16

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 2/3] reset: uniphier: add video input subsystem reset control

2017-08-10 16:27 GMT+09:00 Katsuhiro Suzuki <[email protected]>:
> Add a reset line for video input subsystem (EXIV) on
> UniPhier LD11/LD20 SoCs.
>
> Signed-off-by: Katsuhiro Suzuki <[email protected]>


Acked-by: Masahiro Yamada <[email protected]>


--
Best Regards
Masahiro Yamada

2017-08-10 11:11:59

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 3/3] reset: uniphier: add analog amplifiers reset control

2017-08-10 19:37 GMT+09:00 Philipp Zabel <[email protected]>:
> Hi Katsuhiro,
>
> On Thu, 2017-08-10 at 16:27 +0900, Katsuhiro Suzuki wrote:
>> Add a reset line for analog signal amplifier core (ADAMV) on
>> UniPhier LD11/LD20 SoCs.
>>
>> > Signed-off-by: Katsuhiro Suzuki <[email protected]>
>> ---
>> drivers/reset/reset-uniphier.c | 15 +++++++++++++++
>> 1 file changed, 15 insertions(+)
>>
>> diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
>> index f60c137c17cb..cda4a78a58e2 100644
>> --- a/drivers/reset/reset-uniphier.c
>> +++ b/drivers/reset/reset-uniphier.c
>> @@ -196,6 +196,12 @@ static const struct uniphier_reset_data uniphier_pro4_peri_reset_data[] = {
>> > UNIPHIER_RESET_END,
>> };
>>
>> +/* Analog signal amplifiers reset data */
>> +static const struct uniphier_reset_data uniphier_ld11_adamv_reset_data[] = {
>> > + UNIPHIER_RESETX(100, 0x10, 6), /* EVEA */
>> > + UNIPHIER_RESET_END,
>> +};
>> +
>> /* core implementaton */
>> struct uniphier_reset_priv {
>> > struct reset_controller_dev rcdev;
>> @@ -415,6 +421,15 @@ static const struct of_device_id uniphier_reset_match[] = {
>> > .compatible = "socionext,uniphier-ld20-peri-reset",
>> > .data = uniphier_pro4_peri_reset_data,
>> > },
>> > + /* Analog signal amplifiers reset */
>> > + {
>> > + .compatible = "socionext,uniphier-ld11-adamv-reset",
>> > + .data = uniphier_ld11_adamv_reset_data,
>> > + },
>> > + {
>> > + .compatible = "socionext,uniphier-ld20-adamv-reset",
>> > + .data = uniphier_ld11_adamv_reset_data,
>> > + },
>> > { /* sentinel */ }
>> };
>> MODULE_DEVICE_TABLE(of, uniphier_reset_match);
>
> Please add a patch to describe the new compatible values in
> Documentation/devicetree/bindings/reset/uniphier-reset.txt.
>

The code change is OK with me.

Assuming you will update the binding,

Acked-by: Masahiro Yamada <[email protected]>





--
Best Regards
Masahiro Yamada

2017-08-10 11:24:08

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH 3/3] reset: uniphier: add analog amplifiers reset control

Hi.


2017-08-10 20:11 GMT+09:00 Masahiro Yamada <[email protected]>:
> 2017-08-10 19:37 GMT+09:00 Philipp Zabel <[email protected]>:
>> Hi Katsuhiro,
>>
>> On Thu, 2017-08-10 at 16:27 +0900, Katsuhiro Suzuki wrote:
>>> Add a reset line for analog signal amplifier core (ADAMV) on
>>> UniPhier LD11/LD20 SoCs.
>>>
>>> > Signed-off-by: Katsuhiro Suzuki <[email protected]>
>>> ---
>>> drivers/reset/reset-uniphier.c | 15 +++++++++++++++
>>> 1 file changed, 15 insertions(+)
>>>
>>> diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
>>> index f60c137c17cb..cda4a78a58e2 100644
>>> --- a/drivers/reset/reset-uniphier.c
>>> +++ b/drivers/reset/reset-uniphier.c
>>> @@ -196,6 +196,12 @@ static const struct uniphier_reset_data uniphier_pro4_peri_reset_data[] = {
>>> > UNIPHIER_RESET_END,
>>> };
>>>
>>> +/* Analog signal amplifiers reset data */
>>> +static const struct uniphier_reset_data uniphier_ld11_adamv_reset_data[] = {
>>> > + UNIPHIER_RESETX(100, 0x10, 6), /* EVEA */
>>> > + UNIPHIER_RESET_END,
>>> +};


I take back my Acked-by.


The reset line index is independent from others
because this block is a separate instance.

Are you OK with starting from the reset ID 100?





--
Best Regards
Masahiro Yamada

2017-08-11 04:23:34

by Katsuhiro Suzuki

[permalink] [raw]
Subject: Re: [PATCH 3/3] reset: uniphier: add analog amplifiers reset control

Hi Yamada-san,

On 2017$BG/(B08$B7n(B10$BF|(B 20:23, Masahiro Yamada wrote:
> Hi.
>
>
> 2017-08-10 20:11 GMT+09:00 Masahiro Yamada <[email protected]>:
>> 2017-08-10 19:37 GMT+09:00 Philipp Zabel <[email protected]>:
>>> Hi Katsuhiro,
>>>
>>> On Thu, 2017-08-10 at 16:27 +0900, Katsuhiro Suzuki wrote:
>>>> Add a reset line for analog signal amplifier core (ADAMV) on
>>>> UniPhier LD11/LD20 SoCs.
>>>>
>>>>> Signed-off-by: Katsuhiro Suzuki <[email protected]>
>>>> ---
>>>> drivers/reset/reset-uniphier.c | 15 +++++++++++++++
>>>> 1 file changed, 15 insertions(+)
>>>>
>>>> diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
>>>> index f60c137c17cb..cda4a78a58e2 100644
>>>> --- a/drivers/reset/reset-uniphier.c
>>>> +++ b/drivers/reset/reset-uniphier.c
>>>> @@ -196,6 +196,12 @@ static const struct uniphier_reset_data uniphier_pro4_peri_reset_data[] = {
>>>>> UNIPHIER_RESET_END,
>>>> };
>>>>
>>>> +/* Analog signal amplifiers reset data */
>>>> +static const struct uniphier_reset_data uniphier_ld11_adamv_reset_data[] = {
>>>>> + UNIPHIER_RESETX(100, 0x10, 6), /* EVEA */
>>>>> + UNIPHIER_RESET_END,
>>>> +};
>
>
> I take back my Acked-by.
>
>
> The reset line index is independent from others
> because this block is a separate instance.
>
> Are you OK with starting from the reset ID 100?

It's my mistake. This ID can start with 0.
I will fix in next V2 series, thank you.

Regards,
--
Katsuhiro Suzuki

2017-08-11 04:56:38

by Katsuhiro Suzuki

[permalink] [raw]
Subject: Re: [PATCH 3/3] reset: uniphier: add analog amplifiers reset control

Hi Philipp,

On 2017$BG/(B08$B7n(B10$BF|(B 19:37, Philipp Zabel wrote:
> Hi Katsuhiro,
>
> On Thu, 2017-08-10 at 16:27 +0900, Katsuhiro Suzuki wrote:
>> Add a reset line for analog signal amplifier core (ADAMV) on
>> UniPhier LD11/LD20 SoCs.
>>
>>> Signed-off-by: Katsuhiro Suzuki <[email protected]>
>> ---
>> drivers/reset/reset-uniphier.c | 15 +++++++++++++++
>> 1 file changed, 15 insertions(+)
>>
>> diff --git a/drivers/reset/reset-uniphier.c b/drivers/reset/reset-uniphier.c
>> index f60c137c17cb..cda4a78a58e2 100644
>> --- a/drivers/reset/reset-uniphier.c
>> +++ b/drivers/reset/reset-uniphier.c
>> @@ -196,6 +196,12 @@ static const struct uniphier_reset_data uniphier_pro4_peri_reset_data[] = {
>>> UNIPHIER_RESET_END,
>> };
>>
>> +/* Analog signal amplifiers reset data */
>> +static const struct uniphier_reset_data uniphier_ld11_adamv_reset_data[] = {
>>> + UNIPHIER_RESETX(100, 0x10, 6), /* EVEA */
>>> + UNIPHIER_RESET_END,
>> +};
>> +
>> /* core implementaton */
>> struct uniphier_reset_priv {
>>> struct reset_controller_dev rcdev;
>> @@ -415,6 +421,15 @@ static const struct of_device_id uniphier_reset_match[] = {
>>> .compatible = "socionext,uniphier-ld20-peri-reset",
>>> .data = uniphier_pro4_peri_reset_data,
>>> },
>>> + /* Analog signal amplifiers reset */
>>> + {
>>> + .compatible = "socionext,uniphier-ld11-adamv-reset",
>>> + .data = uniphier_ld11_adamv_reset_data,
>>> + },
>>> + {
>>> + .compatible = "socionext,uniphier-ld20-adamv-reset",
>>> + .data = uniphier_ld11_adamv_reset_data,
>>> + },
>>> { /* sentinel */ }
>> };
>> MODULE_DEVICE_TABLE(of, uniphier_reset_match);
>
> Please add a patch to describe the new compatible values in
> Documentation/devicetree/bindings/reset/uniphier-reset.txt.
>

Thank you, I will add it and send V2 series.


Regards,
--
Katsuhiro Suzuki