From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23BFAC433FE for ; Wed, 30 Mar 2022 09:16:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244695AbiC3JSK (ORCPT ); Wed, 30 Mar 2022 05:18:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244719AbiC3JR6 (ORCPT ); Wed, 30 Mar 2022 05:17:58 -0400 Received: from mx.socionext.com (mx.socionext.com [202.248.49.38]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D020F252A6; Wed, 30 Mar 2022 02:16:12 -0700 (PDT) Received: from unknown (HELO kinkan2-ex.css.socionext.com) ([172.31.9.52]) by mx.socionext.com with ESMTP; 30 Mar 2022 18:16:11 +0900 Received: from mail.mfilter.local (m-filter-1 [10.213.24.61]) by kinkan2-ex.css.socionext.com (Postfix) with ESMTP id E3D2D2058443; Wed, 30 Mar 2022 18:16:11 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Wed, 30 Mar 2022 18:16:11 +0900 Received: from [10.212.182.122] (unknown [10.212.182.122]) by kinkan2.css.socionext.com (Postfix) with ESMTP id AE3D5B62B7; Wed, 30 Mar 2022 18:16:10 +0900 (JST) Subject: Re: [PATCH v2 5/5] dt-bindings: phy: uniphier: Clean up clock-names and reset-names using compatible string To: Krzysztof Kozlowski , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski Cc: Masami Hiramatsu , linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <1648617651-9004-1-git-send-email-hayashi.kunihiko@socionext.com> <1648617651-9004-6-git-send-email-hayashi.kunihiko@socionext.com> From: Kunihiko Hayashi Message-ID: <076c1292-053e-759d-3e6f-c262093d9d1c@socionext.com> Date: Wed, 30 Mar 2022 18:16:10 +0900 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Krzysztof, On 2022/03/30 17:13, Krzysztof Kozlowski wrote: > On 30/03/2022 07:20, Kunihiko Hayashi wrote: >> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clock-names >> and reset-names that can be taken by the compatible string. >> >> The order of clock-names and reset-names doesn't change here. >> >> Signed-off-by: Kunihiko Hayashi >> --- >> .../phy/socionext,uniphier-ahci-phy.yaml | 73 ++++++++++++------ >> .../phy/socionext,uniphier-pcie-phy.yaml | 37 ++++++--- >> .../phy/socionext,uniphier-usb3hs-phy.yaml | 75 +++++++++++++----- >> .../phy/socionext,uniphier-usb3ss-phy.yaml | 77 ++++++++++++++----- >> 4 files changed, 188 insertions(+), 74 deletions(-) >> >> diff --git >> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml >> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml >> index 14f7579e7daa..61d9306e1852 100644 >> --- >> a/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml >> +++ >> b/Documentation/devicetree/bindings/phy/socionext,uniphier-ahci-phy.yaml >> @@ -30,33 +30,62 @@ properties: >> minItems: 1 >> maxItems: 2 >> >> - clock-names: >> - oneOf: >> - - items: # for PXs2 >> - - const: link >> - - items: # for Pro4 >> - - const: link >> - - const: gio >> - - items: # for others >> - - const: link >> - - const: phy >> + clock-names: true >> >> resets: >> minItems: 2 >> maxItems: 6 >> >> - reset-names: >> - oneOf: >> - - items: # for Pro4 >> - - const: link >> - - const: gio >> - - const: phy >> - - const: pm >> - - const: tx >> - - const: rx >> - - items: # for others >> - - const: link >> - - const: phy >> + reset-names: true >> + >> +allOf: >> + - if: >> + properties: >> + compatible: >> + contains: >> + const: socionext,uniphier-pro4-ahci-phy >> + then: >> + properties: >> + clock-names: >> + items: >> + - const: link >> + - const: gio >> + reset-names: >> + items: >> + - const: link >> + - const: gio >> + - const: phy >> + - const: pm >> + - const: tx >> + - const: rx > > Constrain also everywhere clocks and resets, so here should be: > resets: > minItems: 6 > maxItems: 6 If I put the constraint here, it would conflict with the original one. Should I also replace the original resets resets: minItems: 2 maxItems: 6 with "resets: true"? Thank you, --- Best Regards Kunihiko Hayashi