[PATCH v4] dt-bindings: ata: Add UniPhier controller binding

[PATCH v4] dt-bindings: ata: Add UniPhier controller binding

[Kunihiko Hayashi]

Add UniPhier SATA controller compatible string to the platform binding.
This controller needs three reset controls for Pro4 SoC, or two reset
controls for PXs2 and PXs3 SoCs.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 .../bindings/ata/ahci-platform.yaml           | 49 +++++++++++++++++--
 1 file changed, 45 insertions(+), 4 deletions(-)

Changes since v3:
- Fix the position of resets and allOf properties
- Add reset descriptions
- Separate if conditions for two resets, three resets, and others

Changes since v2:
- Add compatible strings to select property
- Add minItems and change maxItems for resets
- Move condition schema under allOf property
- Change resets to "required" for uniphier-*-ahci

Changes since v1:
- Restrict resets property changes with compatible strings
- Fix maxItems from two to three

diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.yaml b/Documentation/devicetree/bindings/ata/ahci-platform.yaml
index 7dc2a2e8f598..358617115bb8 100644
--- a/Documentation/devicetree/bindings/ata/ahci-platform.yaml
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.yaml
@@ -30,12 +30,12 @@ select:
           - marvell,armada-3700-ahci
           - marvell,armada-8k-ahci
           - marvell,berlin2q-ahci
+          - socionext,uniphier-pro4-ahci
+          - socionext,uniphier-pxs2-ahci
+          - socionext,uniphier-pxs3-ahci
   required:
     - compatible
 
-allOf:
-  - $ref: "ahci-common.yaml#"
-
 properties:
   compatible:
     oneOf:
@@ -45,6 +45,9 @@ properties:
               - marvell,armada-8k-ahci
               - marvell,berlin2-ahci
               - marvell,berlin2q-ahci
+              - socionext,uniphier-pro4-ahci
+              - socionext,uniphier-pxs2-ahci
+              - socionext,uniphier-pxs3-ahci
           - const: generic-ahci
       - enum:
           - cavium,octeon-7130-ahci
@@ -74,7 +77,8 @@ properties:
     maxItems: 1
 
   resets:
-    maxItems: 1
+    minItems: 1
+    maxItems: 3
 
 patternProperties:
   "^sata-port@[0-9a-f]+$":
@@ -91,6 +95,43 @@ required:
   - reg
   - interrupts
 
+allOf:
+  - $ref: ahci-common.yaml#
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: socionext,uniphier-pro4-ahci
+    then:
+      properties:
+        resets:
+          items:
+            - description: reset line for the parent
+            - description: reset line for the glue logic
+            - description: reset line for the controller
+      required:
+        - resets
+    else:
+      if:
+        properties:
+          compatible:
+            contains:
+              enum:
+                - socionext,uniphier-pxs2-ahci
+                - socionext,uniphier-pxs3-ahci
+      then:
+        properties:
+          resets:
+            items:
+              - description: reset for the glue logic
+              - description: reset for the controller
+        required:
+          - resets
+      else:
+        properties:
+          resets:
+            maxItems: 1
+
 unevaluatedProperties: false
 
 examples:
-- 
2.25.1

Re: [PATCH v4] dt-bindings: ata: Add UniPhier controller binding

[Krzysztof Kozlowski]

On 22/02/2023 16:59, Kunihiko Hayashi wrote:
> Add UniPhier SATA controller compatible string to the platform binding.
> This controller needs three reset controls for Pro4 SoC, or two reset
> controls for PXs2 and PXs3 SoCs.
> 
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
>  .../bindings/ata/ahci-platform.yaml           | 49 +++++++++++++++++--
>  1 file changed, 45 insertions(+), 4 deletions(-)
> 
> Changes since v3:


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof

Re: [PATCH v4] dt-bindings: ata: Add UniPhier controller binding

[Damien Le Moal]

On 2/23/23 00:59, Kunihiko Hayashi wrote:
> Add UniPhier SATA controller compatible string to the platform binding.
> This controller needs three reset controls for Pro4 SoC, or two reset
> controls for PXs2 and PXs3 SoCs.
> 
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>

Rob,

Are you OK with this patch ? I can take it for 6.4.

> ---
>  .../bindings/ata/ahci-platform.yaml           | 49 +++++++++++++++++--
>  1 file changed, 45 insertions(+), 4 deletions(-)
> 
> Changes since v3:
> - Fix the position of resets and allOf properties
> - Add reset descriptions
> - Separate if conditions for two resets, three resets, and others
> 
> Changes since v2:
> - Add compatible strings to select property
> - Add minItems and change maxItems for resets
> - Move condition schema under allOf property
> - Change resets to "required" for uniphier-*-ahci
> 
> Changes since v1:
> - Restrict resets property changes with compatible strings
> - Fix maxItems from two to three
> 
> diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.yaml b/Documentation/devicetree/bindings/ata/ahci-platform.yaml
> index 7dc2a2e8f598..358617115bb8 100644
> --- a/Documentation/devicetree/bindings/ata/ahci-platform.yaml
> +++ b/Documentation/devicetree/bindings/ata/ahci-platform.yaml
> @@ -30,12 +30,12 @@ select:
>            - marvell,armada-3700-ahci
>            - marvell,armada-8k-ahci
>            - marvell,berlin2q-ahci
> +          - socionext,uniphier-pro4-ahci
> +          - socionext,uniphier-pxs2-ahci
> +          - socionext,uniphier-pxs3-ahci
>    required:
>      - compatible
>  
> -allOf:
> -  - $ref: "ahci-common.yaml#"
> -
>  properties:
>    compatible:
>      oneOf:
> @@ -45,6 +45,9 @@ properties:
>                - marvell,armada-8k-ahci
>                - marvell,berlin2-ahci
>                - marvell,berlin2q-ahci
> +              - socionext,uniphier-pro4-ahci
> +              - socionext,uniphier-pxs2-ahci
> +              - socionext,uniphier-pxs3-ahci
>            - const: generic-ahci
>        - enum:
>            - cavium,octeon-7130-ahci
> @@ -74,7 +77,8 @@ properties:
>      maxItems: 1
>  
>    resets:
> -    maxItems: 1
> +    minItems: 1
> +    maxItems: 3
>  
>  patternProperties:
>    "^sata-port@[0-9a-f]+$":
> @@ -91,6 +95,43 @@ required:
>    - reg
>    - interrupts
>  
> +allOf:
> +  - $ref: ahci-common.yaml#
> +  - if:
> +      properties:
> +        compatible:
> +          contains:
> +            const: socionext,uniphier-pro4-ahci
> +    then:
> +      properties:
> +        resets:
> +          items:
> +            - description: reset line for the parent
> +            - description: reset line for the glue logic
> +            - description: reset line for the controller
> +      required:
> +        - resets
> +    else:
> +      if:
> +        properties:
> +          compatible:
> +            contains:
> +              enum:
> +                - socionext,uniphier-pxs2-ahci
> +                - socionext,uniphier-pxs3-ahci
> +      then:
> +        properties:
> +          resets:
> +            items:
> +              - description: reset for the glue logic
> +              - description: reset for the controller
> +        required:
> +          - resets
> +      else:
> +        properties:
> +          resets:
> +            maxItems: 1
> +
>  unevaluatedProperties: false
>  
>  examples:

-- 
Damien Le Moal
Western Digital Research

Re: [PATCH v4] dt-bindings: ata: Add UniPhier controller binding

[Krzysztof Kozlowski]

On 06/03/2023 02:22, Damien Le Moal wrote:
> On 2/23/23 00:59, Kunihiko Hayashi wrote:
>> Add UniPhier SATA controller compatible string to the platform binding.
>> This controller needs three reset controls for Pro4 SoC, or two reset
>> controls for PXs2 and PXs3 SoCs.
>>
>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> 
> Rob,
> 
> Are you OK with this patch ? I can take it for 6.4.
> 

You got Review (which includes also "Ack"), what are you missing here?

Best regards,
Krzysztof

Re: [PATCH v4] dt-bindings: ata: Add UniPhier controller binding

[Damien Le Moal]

On 3/7/23 17:13, Krzysztof Kozlowski wrote:
> On 06/03/2023 02:22, Damien Le Moal wrote:
>> On 2/23/23 00:59, Kunihiko Hayashi wrote:
>>> Add UniPhier SATA controller compatible string to the platform binding.
>>> This controller needs three reset controls for Pro4 SoC, or two reset
>>> controls for PXs2 and PXs3 SoCs.
>>>
>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>
>> Rob,
>>
>> Are you OK with this patch ? I can take it for 6.4.
>>
> 
> You got Review (which includes also "Ack"), what are you missing here?

Just checking with Rob as he is the DT maintainer. Out of courtesy.
I will queue that patch then.

-- 
Damien Le Moal
Western Digital Research

Re: [PATCH v4] dt-bindings: ata: Add UniPhier controller binding

[Damien Le Moal]

On 3/7/23 17:13, Krzysztof Kozlowski wrote:
> On 06/03/2023 02:22, Damien Le Moal wrote:
>> On 2/23/23 00:59, Kunihiko Hayashi wrote:
>>> Add UniPhier SATA controller compatible string to the platform binding.
>>> This controller needs three reset controls for Pro4 SoC, or two reset
>>> controls for PXs2 and PXs3 SoCs.
>>>
>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>
>> Rob,
>>
>> Are you OK with this patch ? I can take it for 6.4.
>>
> 
> You got Review (which includes also "Ack"), what are you missing here?

By the way, I am not seeing/have not received any Ack. Hence why I checked with Rob.

> 
> Best regards,
> Krzysztof
> 

-- 
Damien Le Moal
Western Digital Research

Re: [PATCH v4] dt-bindings: ata: Add UniPhier controller binding

[Krzysztof Kozlowski]

On 07/03/2023 11:42, Damien Le Moal wrote:
> On 3/7/23 17:13, Krzysztof Kozlowski wrote:
>> On 06/03/2023 02:22, Damien Le Moal wrote:
>>> On 2/23/23 00:59, Kunihiko Hayashi wrote:
>>>> Add UniPhier SATA controller compatible string to the platform binding.
>>>> This controller needs three reset controls for Pro4 SoC, or two reset
>>>> controls for PXs2 and PXs3 SoCs.
>>>>
>>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>>
>>> Rob,
>>>
>>> Are you OK with this patch ? I can take it for 6.4.
>>>
>>
>> You got Review (which includes also "Ack"), what are you missing here?
> 
> By the way, I am not seeing/have not received any Ack. Hence why I checked with Rob.

You were on Cc... Did I end up in spam?

Best regards,
Krzysztof

Re: [PATCH v4] dt-bindings: ata: Add UniPhier controller binding

[Damien Le Moal]

On 3/8/23 00:52, Krzysztof Kozlowski wrote:
> On 07/03/2023 11:42, Damien Le Moal wrote:
>> On 3/7/23 17:13, Krzysztof Kozlowski wrote:
>>> On 06/03/2023 02:22, Damien Le Moal wrote:
>>>> On 2/23/23 00:59, Kunihiko Hayashi wrote:
>>>>> Add UniPhier SATA controller compatible string to the platform binding.
>>>>> This controller needs three reset controls for Pro4 SoC, or two reset
>>>>> controls for PXs2 and PXs3 SoCs.
>>>>>
>>>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>>>
>>>> Rob,
>>>>
>>>> Are you OK with this patch ? I can take it for 6.4.
>>>>
>>>
>>> You got Review (which includes also "Ack"), what are you missing here?
>>
>> By the way, I am not seeing/have not received any Ack. Hence why I checked with Rob.
> 
> You were on Cc... Did I end up in spam?

I did get your review email, but I do not see any Ack with it. Was it a
different email ? I do check my spam folder from time to time but didn't see
anything in there that would not make me rich :)

> 
> Best regards,
> Krzysztof
> 

-- 
Damien Le Moal
Western Digital Research

Re: [PATCH v4] dt-bindings: ata: Add UniPhier controller binding

[Rob Herring]

On Wed, Mar 08, 2023 at 07:02:32AM +0900, Damien Le Moal wrote:
> On 3/8/23 00:52, Krzysztof Kozlowski wrote:
> > On 07/03/2023 11:42, Damien Le Moal wrote:
> >> On 3/7/23 17:13, Krzysztof Kozlowski wrote:
> >>> On 06/03/2023 02:22, Damien Le Moal wrote:
> >>>> On 2/23/23 00:59, Kunihiko Hayashi wrote:
> >>>>> Add UniPhier SATA controller compatible string to the platform binding.
> >>>>> This controller needs three reset controls for Pro4 SoC, or two reset
> >>>>> controls for PXs2 and PXs3 SoCs.
> >>>>>
> >>>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> >>>>
> >>>> Rob,
> >>>>
> >>>> Are you OK with this patch ? I can take it for 6.4.
> >>>>
> >>>
> >>> You got Review (which includes also "Ack"), what are you missing here?
> >>
> >> By the way, I am not seeing/have not received any Ack. Hence why I checked with Rob.
> > 
> > You were on Cc... Did I end up in spam?
> 
> I did get your review email, but I do not see any Ack with it. Was it a
> different email ? I do check my spam folder from time to time but didn't see
> anything in there that would not make me rich :)

Reviewed-by is more than an Acked-by, so if you have either one you can 
take it. And Krzysztof is also a DT maintainer, so no need to wait for 
me.

Rob

Re: [PATCH v4] dt-bindings: ata: Add UniPhier controller binding

[Damien Le Moal]

On 3/8/23 07:40, Rob Herring wrote:
> On Wed, Mar 08, 2023 at 07:02:32AM +0900, Damien Le Moal wrote:
>> On 3/8/23 00:52, Krzysztof Kozlowski wrote:
>>> On 07/03/2023 11:42, Damien Le Moal wrote:
>>>> On 3/7/23 17:13, Krzysztof Kozlowski wrote:
>>>>> On 06/03/2023 02:22, Damien Le Moal wrote:
>>>>>> On 2/23/23 00:59, Kunihiko Hayashi wrote:
>>>>>>> Add UniPhier SATA controller compatible string to the platform binding.
>>>>>>> This controller needs three reset controls for Pro4 SoC, or two reset
>>>>>>> controls for PXs2 and PXs3 SoCs.
>>>>>>>
>>>>>>> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
>>>>>>
>>>>>> Rob,
>>>>>>
>>>>>> Are you OK with this patch ? I can take it for 6.4.
>>>>>>
>>>>>
>>>>> You got Review (which includes also "Ack"), what are you missing here?
>>>>
>>>> By the way, I am not seeing/have not received any Ack. Hence why I checked with Rob.
>>>
>>> You were on Cc... Did I end up in spam?
>>
>> I did get your review email, but I do not see any Ack with it. Was it a
>> different email ? I do check my spam folder from time to time but didn't see
>> anything in there that would not make me rich :)
> 
> Reviewed-by is more than an Acked-by, so if you have either one you can 
> take it. And Krzysztof is also a DT maintainer, so no need to wait for 
> me.

Thanks for the clarification.

> 
> Rob

-- 
Damien Le Moal
Western Digital Research

Re: [PATCH v4] dt-bindings: ata: Add UniPhier controller binding

[Damien Le Moal]

On 2/23/23 00:59, Kunihiko Hayashi wrote:
> Add UniPhier SATA controller compatible string to the platform binding.
> This controller needs three reset controls for Pro4 SoC, or two reset
> controls for PXs2 and PXs3 SoCs.
> 
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>

Applied to for-6.4. Thanks !

-- 
Damien Le Moal
Western Digital Research