From patchwork Thu Feb 2 16:18:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 52079 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp334395wrn; Thu, 2 Feb 2023 08:22:17 -0800 (PST) X-Google-Smtp-Source: AK7set9h7MuKt4UZpQd9j+CoAvMO3U5rEMivQ50s0QTc3Eh+91dExM6EFDncUWFserT645TlqXSS X-Received: by 2002:a17:906:5054:b0:889:5686:486a with SMTP id e20-20020a170906505400b008895686486amr7525207ejk.30.1675354937721; Thu, 02 Feb 2023 08:22:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675354937; cv=none; d=google.com; s=arc-20160816; b=NTxWrLhtsWkP4l9tPMa9TEi660XDAmgZWDNMz88H5FL4WlRXULDkH4CCkSeCrkuMZa WqGyjG0UfXwLQCQMjW93V2r6OLg2+Vc33ipUyc7f8NG+y0IjRVfFkIF4F6oJJHuXcCvu Oq7zqmBhpkTzo9p7IlEksaaiOc0bEznrnxgpYNCn1n/woA0OuBeq1wd7ot5XuZ7FWzYt Xf6LkSUkV8KWlm9uSA2PnSHvNY6nHraD4OOrfrpui5iEvJAng8ci+crp+S1V2G8JJSf1 MBtIiF3PfOxdZJzJeP2KkgdCjBe/zlo0IUeThyqO4Tj9EU8n9o3dYzMtnQfhm4K4FJyo F7Zw== 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=InCMd7d3rDvyvxG0lrJq3ckZX1j24uW1L0pdJpej8Jg=; b=Mf2b5WlsZq3klvVNQ/4FYy6ccoJ+lNAGQ4Qxjm08Q8FN02KGZa1mW9EF1rTt6r/7c1 tIlmky1vHEpKky7SvXQbYfxQQIlkrqWmUqmbijquSYZCo64LRNeFuuhxkGNPFlHJqhSB Nzk8IkMKbY9rCmVWMUMJov+6q+iBDxoXBGOHNkadCs3u73LWmRWtmVBhqpdckjnEcRj7 HQ0eWxbb7dv2Kt/wWlNrb3xlcFJH9HGc/ByBwmL3NfYrdzWeEwp1kLHj2mpgXDW7pXiH O64pP1flFSP1/DeQGzke/yYkRZujJ1/zs4G+QFosm1+8TSPBCKYpEs2OG89QIEh4e81U eUGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SoAnuGhE; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mi10-20020a1709071a8a00b008861cf89683si15873245ejc.833.2023.02.02.08.21.53; Thu, 02 Feb 2023 08:22:17 -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; dkim=pass header.i=@linaro.org header.s=google header.b=SoAnuGhE; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232591AbjBBQT6 (ORCPT + 99 others); Thu, 2 Feb 2023 11:19:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232771AbjBBQTl (ORCPT ); Thu, 2 Feb 2023 11:19:41 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D04A96ACAD for ; Thu, 2 Feb 2023 08:19:38 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id k8-20020a05600c1c8800b003dc57ea0dfeso4131466wms.0 for ; Thu, 02 Feb 2023 08:19:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=InCMd7d3rDvyvxG0lrJq3ckZX1j24uW1L0pdJpej8Jg=; b=SoAnuGhEAB/7UN45UWN4515akWCbP3rRTCBdMD6ZK7mAOK21bG3hVSP+JaM32hbOVZ /Qb3RVHfwjvs+8pnVJ5g8naLs3rccfhxnj9HNnt2d3rutXzACMPqtUz3ik6GAdcVYYll zboWei6d3zsJ69kRfnVDPAjgDmBUdmxWcfUHWHU8c++z0EDT3KqiRVfLVPKGmYZREF6m tRzgYapHVWEd3Fj5NWExs7S2OommVVDxcIlpcuwlFhRqxd2zxn6DeSFZtl8jk8VgFFs6 7xIDnYMDkEV+jrd/V/DzwFGYp7JlBgH8i7IO1rwdBAFbaOUNfeky+U3619G648tHiYhJ zYAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=InCMd7d3rDvyvxG0lrJq3ckZX1j24uW1L0pdJpej8Jg=; b=t2fJ8HDMUD0UmMrIRje3bK3OBx46/ld7UqU3UNuBbs9APelcOvggswMiaaVW8I+z86 rd4M+scgOSZNDK8DAIhtxoYbWgSWPHXcBVhiCyxmdH6/arBNWbtYPBzOqvvYGCekAhrx io2A6372RbDvtEkn9S8cciImmJKXAs1uFpcGZOz0xldju9t0Gvk9z8ums4N6Yn8U0Uua o6dbH2VRSNhDeF+4I2KEkFFu0nhXb6tzjKxUtwUrAmmDtPx4Nr1jRHwQNDWunGdiT696 wfi6J44kIiLc1Bs5ezLHMd2T634NxQVCFllwJ0ekIdOH3CUMXDY4LHaqGn0N0GpLDMUo jbIA== X-Gm-Message-State: AO0yUKVW5BqpkWaCNM+bfmTV9CRGKR8EdLgXJZEX97/WLypIxnwtUuw1 IX3qx9u4dssui9qa7vhmDjnQaQ== X-Received: by 2002:a05:600c:5118:b0:3dc:1dc3:7a05 with SMTP id o24-20020a05600c511800b003dc1dc37a05mr6403019wms.10.1675354777424; Thu, 02 Feb 2023 08:19:37 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id h16-20020a05600c351000b003dc521f336esm212416wmq.14.2023.02.02.08.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Feb 2023 08:19:37 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Jassi Brar , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 01/13] dt-bindings: mailbox: qcom,apcs-kpss-global: use fallbacks Date: Thu, 2 Feb 2023 17:18:44 +0100 Message-Id: <20230202161856.385825-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230202161856.385825-1-krzysztof.kozlowski@linaro.org> References: <20230202161856.385825-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_NONE, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756736979150316082?= X-GMAIL-MSGID: =?utf-8?q?1756736979150316082?= 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 --- .../mailbox/qcom,apcs-kpss-global.yaml | 66 +++++++++++-------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml index 943f9472ae10..c38bbdd9d7db 100644 --- a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml +++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml @@ -18,27 +18,44 @@ properties: oneOf: - items: - enum: - - qcom,ipq6018-apcs-apps-global - qcom,ipq8074-apcs-apps-global + - const: qcom,ipq6018-apcs-apps-global + - items: + - enum: + - qcom,msm8939-apcs-kpss-global + - qcom,qcs404-apcs-apps-global + - const: qcom,msm8916-apcs-kpss-global + - const: syscon + - items: + - enum: - qcom,msm8976-apcs-kpss-global - - qcom,msm8996-apcs-hmss-global + - qcom,msm8994-apcs-kpss-global + - const: qcom,msm8953-apcs-kpss-global + - const: syscon + - items: + - enum: - qcom,msm8998-apcs-hmss-global - qcom,qcm2290-apcs-hmss-global - - qcom,sc7180-apss-shared - - qcom,sc8180x-apss-shared - qcom,sdm660-apcs-hmss-global - - qcom,sdm845-apss-shared - qcom,sm4250-apcs-hmss-global - - qcom,sm6125-apcs-hmss-global - qcom,sm6115-apcs-hmss-global + - qcom,sm6125-apcs-hmss-global + - const: qcom,msm8953-apcs-kpss-global + - items: + - enum: + - qcom,sc7180-apss-shared + - qcom,sc8180x-apss-shared - qcom,sm8150-apss-shared + - const: qcom,sdm845-apss-shared + - items: + - enum: + - qcom,ipq6018-apcs-apps-global + - qcom,msm8996-apcs-hmss-global + - qcom,sdm845-apss-shared - items: - enum: - qcom,msm8916-apcs-kpss-global - - qcom,msm8939-apcs-kpss-global - qcom,msm8953-apcs-kpss-global - - qcom,msm8994-apcs-kpss-global - - qcom,qcs404-apcs-apps-global - const: syscon reg: maxItems: 1 @@ -69,17 +86,11 @@ allOf: - if: properties: compatible: - enum: - - qcom,msm8916-apcs-kpss-global - - qcom,msm8994-apcs-kpss-global - - qcom,msm8996-apcs-hmss-global - - qcom,msm8998-apcs-hmss-global - - qcom,qcs404-apcs-apps-global - - qcom,sc7180-apss-shared - - qcom,sdm660-apcs-hmss-global - - qcom,sdm845-apss-shared - - qcom,sm6125-apcs-hmss-global - - qcom,sm8150-apss-shared + contains: + enum: + - qcom,msm8916-apcs-kpss-global + - qcom,msm8953-apcs-kpss-global + - qcom,sdm845-apss-shared then: properties: clocks: @@ -110,9 +121,9 @@ allOf: - if: properties: compatible: - enum: - - qcom,ipq6018-apcs-apps-global - - qcom,ipq8074-apcs-apps-global + contains: + enum: + - qcom,ipq6018-apcs-apps-global then: properties: clocks: @@ -126,9 +137,9 @@ allOf: - if: properties: compatible: - enum: - - qcom,ipq6018-apcs-apps-global - - qcom,ipq8074-apcs-apps-global + contains: + enum: + - qcom,ipq6018-apcs-apps-global then: properties: '#clock-cells': @@ -163,7 +174,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>;