Message ID | 20230222155906.19403-1-hayashi.kunihiko@socionext.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp663975wrd; Wed, 22 Feb 2023 08:12:55 -0800 (PST) X-Google-Smtp-Source: AK7set+dJQvrFr7Hsh69mxpq1Hlyy5DYswWbE7uGv1kJsxagG5t8TYz7RHD/9zig58x61uTIWNbV X-Received: by 2002:a17:90b:4f8a:b0:233:bc78:b48f with SMTP id qe10-20020a17090b4f8a00b00233bc78b48fmr10604430pjb.3.1677082374950; Wed, 22 Feb 2023 08:12:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677082374; cv=none; d=google.com; s=arc-20160816; b=eiCL3YKAHpdUxb8mQKgHpikbtjycjXtDOXGdO/riMugPssr1MemVyPZT5qGLU+3kLs h8Ps+I9SJV2xwkIYRLr9qa5yTEi9WMnXp8J2j819PEqiClqVJOo0t/fhFvFrsDyIN0VV xWBcf4uegygjhUqia+Qh35KBXwA9DNCcZ/Rd0sR0+2IUD+2+LoEAedxEPh0OQ8QlTR41 EssPSaSnTWXkqf6cyKQwuTNvs8a04eId4+Uc0XOBqGtb2nY87R0OdaR5QFdyLsQAyZtr OIBNBXc/Pc+u8bfctm2tkbC1LIlQMyiQtVyzrBbeZICddBguV+RbawcSAlAh8qEsbmY0 TYaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=aMNjFpP4OOx9H2Fh/7ZZHgRhaZcENrZJ1HPLOR32bNk=; b=XvDDmcIZB5G7KBI0v3K3Gw/5+hDREUt3xGXlYeSss0lKGGIRFGZliEQHJzdRa20igj BMyfR0iZGrU3n9Y1y0IXLEZYWY0RHOwLcTVLpA/kz8C2eMXt8cMAHjPGZVqDnvpKQBEt 9Qinm7geiBq30M+iU8nj74IMctMcqU8GJe+hNuLWt6L5Gi75DwyW4A+NUi0KZARiAacb XklKqKGsVoaKet16IYSXGEFtXQ3qJK6cgWwnLSZtZZq+CCfFodXpHFmh90Dqn/cj5xTF T/Z2vVnBVkh1G7EAt3tum2SJpbt5+OwtFqvYvN0G/C+fm0/M1b55uWBXP05g1kQLfpVA g+Qw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h191-20020a6383c8000000b004fc23f82c7csi19934825pge.191.2023.02.22.08.12.41; Wed, 22 Feb 2023 08:12:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232070AbjBVP7V (ORCPT <rfc822;chinmaygameti@gmail.com> + 99 others); Wed, 22 Feb 2023 10:59:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230434AbjBVP7T (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 22 Feb 2023 10:59:19 -0500 Received: from mx.socionext.com (mx.socionext.com [202.248.49.38]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8A1FF21950; Wed, 22 Feb 2023 07:59:17 -0800 (PST) Received: from unknown (HELO iyokan2-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 23 Feb 2023 00:59:16 +0900 Received: from mail.mfilter.local (mail-arc02.css.socionext.com [10.213.46.40]) by iyokan2-ex.css.socionext.com (Postfix) with ESMTP id C853A2058B4F; Thu, 23 Feb 2023 00:59:16 +0900 (JST) Received: from kinkan2.css.socionext.com ([172.31.9.51]) by m-FILTER with ESMTP; Thu, 23 Feb 2023 00:59:16 +0900 Received: from plum.e01.socionext.com (unknown [10.212.243.119]) by kinkan2.css.socionext.com (Postfix) with ESMTP id 03D6DC34A; Thu, 23 Feb 2023 00:59:16 +0900 (JST) From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> To: Damien Le Moal <damien.lemoal@opensource.wdc.com>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Hans de Goede <hdegoede@redhat.com>, Jens Axboe <axboe@kernel.dk> Cc: linux-ide@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Subject: [PATCH v4] dt-bindings: ata: Add UniPhier controller binding Date: Thu, 23 Feb 2023 00:59:06 +0900 Message-Id: <20230222155906.19403-1-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758328743600843626?= X-GMAIL-MSGID: =?utf-8?q?1758548328244863600?= |
Series |
[v4] dt-bindings: ata: Add UniPhier controller binding
|
|
Commit Message
Kunihiko Hayashi
Feb. 22, 2023, 3:59 p.m. UTC
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
Comments
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
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:
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
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.
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 >
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
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 >
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
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
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 !
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: