From patchwork Sat Nov 11 20:49:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 164165 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp413401vqg; Sat, 11 Nov 2023 12:49:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IGwNyw73drVnyVS55+VH8MdylRZpQNnEZkYItzof/+mzPiH33RY+0iz0pe7rJ2a5ggdw3SM X-Received: by 2002:a05:6a21:3283:b0:181:219f:4a76 with SMTP id yt3-20020a056a21328300b00181219f4a76mr4152412pzb.38.1699735780265; Sat, 11 Nov 2023 12:49:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699735780; cv=none; d=google.com; s=arc-20160816; b=AH4lSAug1gCBihDq6uhaYn3eawVXzW00WYJflE3WfpcTBKfi8Jp4O2X91bqtneQyum P4mz0Hjfi49HIT4yjyNROoLZ68CiITyDOFeVO6HmELLZ1IB3McGjxKseXY8/KN2Cebs2 E169hK+lnhrFgJ3BUzny+lkWZ9sz5QwVur+wRruqDx3656cw0FD/4FVidzvkrNeIH5hR qjuxkDLX0FFexvGfvc1fBB+WuDnpzbwIsOK7xB4yH2/bUzjmrGmjfac0yfuNXky1C5y1 WjCQgwLn6WDOHPTk/ejFbBr6zIsk4khNuLZiRhB1NDuPCwW5NH4kkNZNvAD+PSGsc1TJ 6+yA== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Dw1ndMUKXNlOHoymKchXozvXFQJ/Nc6du3K0pUpN4dE=; fh=8I17DER8Ydf8nM0FgDq6lmOMQ6elL1e1ZH5w9SNY+Jo=; b=Qp8+go1d0MQVTtbbbD488to5gIIA6uXHDigM0iLiKChHeWyDw8DVKqPDtXCPVx9MqK vhOcScjKebNXNXr3orsEQbDNzeLszmQ8k7dXk4PS1z9Dzqiey2wAASXu75csKUBoVn7x fqt+RKgtGbZ+lBCmnD4VIc0FRUlT99LdS98ec7t0LNwrE7yygOyIPYsXmycZdt3GgDPY WLtXvZZ2ikDWn3xCwrJhccD2sCydnKFMcbedM5G7IovRyLHA08lmm8cOSkzShapP43YC qVQ7a2GOjtEbqgKRYhwbCRIqtJqjgztGoCZ3kG50QLBKb4WnYgMRU7T74ZPYIeecWLce KTWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Knht1UNn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id x8-20020a056a00188800b006c0035ff9dasi2504130pfh.198.2023.11.11.12.49.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 12:49:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Knht1UNn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 8A03C80C5FB7; Sat, 11 Nov 2023 12:49:39 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229728AbjKKUte (ORCPT + 29 others); Sat, 11 Nov 2023 15:49:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229672AbjKKUta (ORCPT ); Sat, 11 Nov 2023 15:49:30 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BEB72D73 for ; Sat, 11 Nov 2023 12:49:27 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40790b0a224so23886145e9.0 for ; Sat, 11 Nov 2023 12:49:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699735766; x=1700340566; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Dw1ndMUKXNlOHoymKchXozvXFQJ/Nc6du3K0pUpN4dE=; b=Knht1UNnnReKyyOUyIxQYPEiqrYAMZTAS8ABU8k4wryRg2P4WLUuVSYQNs9qCbmClg eodUBLtzMI84C+U9JtcgWq0JjAiriuUP851fx/jSXZxIw3JjyIKi/CP7IuwNqzN5PQIf WPk0njd+uzxtoHA2p660/JL5MLihqyRlkunZlIsWLU4FFWEMOtm75+6ouHcIyeN/a4z7 OcKQ8tEqiVAv6PiJBu9MOQzvXXSAVekfNtZHbDwwWTsEaka54hRYcf1KHpwWuaSTv5mp VoXCBBZCxC6taKZq9rv2lEGozfAP/B9dJJaG9chVBfcb4irhpG1Wqfifz0dHoHeD+Sd9 o96A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699735766; x=1700340566; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Dw1ndMUKXNlOHoymKchXozvXFQJ/Nc6du3K0pUpN4dE=; b=XaDnfxv95QdZWXq4FERwuXQXQ6IEyX3VI4fyzWae75GAIe7STPB/aFkqdPPI433heH CFDLMz00OLG4QN+tIeHEIlzikMU+prsl3NcawgCXxadaANlZidGQc1YWFsqhgaMYbw69 ZY2G1VJcpmafSn+BYmKEpESgzjxXySjg4F/Ar0CxQWmoyYcKi+eWM9cPlwo9qw12MTSx WmAOq1JJddShnXN/Ba8zqetroArLqHfJ4sx/hsw8CEpyfpflVwe3mE4Q8C1x37clbtno xPqKjKkmpopYCBx3fqmtbKy05/hWIJKq0znZBscbdDnQ0+cdHGHpBCJHuHiGqteB9LGz j+OA== X-Gm-Message-State: AOJu0YxI2ZfgwUvgmRmcqgkdw95ntCe9/b0o4ytXDhYJVe/2S0jBx3YA j7aZaTpbua/I7w6qp++1GA79Lg== X-Received: by 2002:a05:600c:4689:b0:408:37aa:4766 with SMTP id p9-20020a05600c468900b0040837aa4766mr2219387wmo.5.1699735766179; Sat, 11 Nov 2023 12:49:26 -0800 (PST) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id t9-20020a05600c198900b00407752bd834sm3121226wmq.1.2023.11.11.12.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 12:49:25 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Jassi Brar , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Krzysztof Kozlowski , Rob Herring Subject: [PATCH v5 2/3] dt-bindings: mailbox: qcom,apcs-kpss-global: use fallbacks Date: Sat, 11 Nov 2023 21:49:15 +0100 Message-Id: <20231111204916.35835-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231111204916.35835-1-krzysztof.kozlowski@linaro.org> References: <20231111204916.35835-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 11 Nov 2023 12:49:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782302145570971073 X-GMAIL-MSGID: 1782302145570971073 Rework the compatibles and group devices which have similar interface (same from Linux driver point of view) as compatible. This allows smaller of_device_id table in the Linux driver and smaller allOf:if:then: constraints. Signed-off-by: Krzysztof Kozlowski Acked-by: Rob Herring --- .../mailbox/qcom,apcs-kpss-global.yaml | 61 +++++++++++++------ 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml index a22c8640dc0e..79eb523b8436 100644 --- a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml +++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml @@ -23,6 +23,24 @@ properties: - qcom,ipq8074-apcs-apps-global - qcom,ipq9574-apcs-apps-global - const: qcom,ipq6018-apcs-apps-global + - items: + - enum: + - qcom,qcs404-apcs-apps-global + - const: qcom,msm8916-apcs-kpss-global + - const: syscon + - items: + - enum: + - qcom,msm8976-apcs-kpss-global + - const: qcom,msm8994-apcs-kpss-global + - const: syscon + - items: + - enum: + - qcom,msm8998-apcs-hmss-global + - qcom,sdm660-apcs-hmss-global + - qcom,sm4250-apcs-hmss-global + - qcom,sm6115-apcs-hmss-global + - qcom,sm6125-apcs-hmss-global + - const: qcom,msm8994-apcs-kpss-global - items: - enum: - qcom,sc7180-apss-shared @@ -34,21 +52,14 @@ properties: - qcom,msm8916-apcs-kpss-global - qcom,msm8939-apcs-kpss-global - qcom,msm8953-apcs-kpss-global - - qcom,msm8976-apcs-kpss-global - qcom,msm8994-apcs-kpss-global - - qcom,qcs404-apcs-apps-global - qcom,sdx55-apcs-gcc - const: syscon - enum: - qcom,ipq6018-apcs-apps-global - qcom,msm8996-apcs-hmss-global - - qcom,msm8998-apcs-hmss-global - qcom,qcm2290-apcs-hmss-global - - qcom,sdm660-apcs-hmss-global - qcom,sdm845-apss-shared - - qcom,sm4250-apcs-hmss-global - - qcom,sm6115-apcs-hmss-global - - qcom,sm6125-apcs-hmss-global reg: maxItems: 1 @@ -79,10 +90,9 @@ allOf: - if: properties: compatible: - enum: - - qcom,msm8916-apcs-kpss-global - - qcom,msm8939-apcs-kpss-global - - qcom,qcs404-apcs-apps-global + contains: + enum: + - qcom,msm8916-apcs-kpss-global then: properties: clocks: @@ -94,6 +104,25 @@ allOf: - const: pll - const: aux + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8939-apcs-kpss-global + then: + properties: + clocks: + items: + - description: primary pll parent of the clock driver + - description: auxiliary parent + - description: reference clock + clock-names: + items: + - const: pll + - const: aux + - const: ref + - if: properties: compatible: @@ -112,6 +141,7 @@ allOf: - const: ref - const: pll - const: aux + - if: properties: compatible: @@ -136,16 +166,10 @@ allOf: compatible: enum: - qcom,msm8953-apcs-kpss-global - - qcom,msm8976-apcs-kpss-global - qcom,msm8994-apcs-kpss-global - qcom,msm8996-apcs-hmss-global - - qcom,msm8998-apcs-hmss-global - qcom,qcm2290-apcs-hmss-global - - qcom,sdm660-apcs-hmss-global - qcom,sdm845-apss-shared - - qcom,sm4250-apcs-hmss-global - - qcom,sm6115-apcs-hmss-global - - qcom,sm6125-apcs-hmss-global then: properties: clocks: false @@ -191,7 +215,8 @@ examples: #define GCC_APSS_AHB_CLK_SRC 1 #define GCC_GPLL0_AO_OUT_MAIN 123 apcs: mailbox@b011000 { - compatible = "qcom,qcs404-apcs-apps-global", "syscon"; + compatible = "qcom,qcs404-apcs-apps-global", + "qcom,msm8916-apcs-kpss-global", "syscon"; reg = <0x0b011000 0x1000>; #mbox-cells = <1>; clocks = <&apcs_hfpll>, <&gcc GCC_GPLL0_AO_OUT_MAIN>;