From patchwork Sat Jul 23 09:09:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 592944 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 83A0FC3F2D4 for ; Sat, 23 Jul 2022 09:09:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236974AbiGWJJu (ORCPT ); Sat, 23 Jul 2022 05:09:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237083AbiGWJJt (ORCPT ); Sat, 23 Jul 2022 05:09:49 -0400 Received: from mail-lf1-x135.google.com (mail-lf1-x135.google.com [IPv6:2a00:1450:4864:20::135]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 185565D598 for ; Sat, 23 Jul 2022 02:09:47 -0700 (PDT) Received: by mail-lf1-x135.google.com with SMTP id d17so8940310lfa.12 for ; Sat, 23 Jul 2022 02:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7GNDO2wV++3CS7hKS3KK9Ui+AR2lPsXYWnoRN/5ZAjU=; b=gSGPHaNbDj72a8bkDxRiaJLLL1mZseO85fpUg/p6Tn4P+alTLCGuB7KNfzj1z5Nioo RsZCAvdl4jmDn15XSsbOdvMkMzhMr1uEnGhIGz8dtToDenEMEHLTX22LD2pRzWuDe5OJ +M6eYOoCFKNhiAMqaH/qLmubKfIyqfyIOdnwxKG4gVHCBxgN3KyS44XdgBnBFg5V3eZ1 i58HRNgADApv6n/biQtFHbEjYHcrueWGgvmLGKhXaTAvqawsBy9rq/kiTu1WhQrmnWXw 7V4Qtwm/qqeMCOfdJyauRj4e45s0dOUBF+J7afoB6X5fVBFl7PK1uvSE0AmcLngb/9RS oSWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7GNDO2wV++3CS7hKS3KK9Ui+AR2lPsXYWnoRN/5ZAjU=; b=15qyZfBOxAQv7fXB6H9O7idwNKBg5BdfV/h7pKrPfjggodBEe62KtvwbT6sNn5dEFD gFojbimU1ptp78ZOQj1nX0hfY1SntO5GuBxZGm6rn9scxLOPZ4biZoI90qeAgK+ikfRc 7ZvgnNjThhTfWKfT9fkVDwzpOHxOCilCgQwz6Nbl6bk4QLDBZ7iuRDmW4zW9eX8aRDbU 5GVbATHP276S6xhR0yyhOrSYZ0b8lyPosoBZ9fE7H/fp31tDpukFmTHMCZT6Ffm4t+Sa kaTnsxyUO9E92bj7HpmkfUHP2cTDdDcE/1f6qA44YQ9jjmRIrleNLypkkbY/sBIR+8lu deuQ== X-Gm-Message-State: AJIora/RhqZEdclWCTHdXP9YBzf7Bu6XcJlGJhp3Y+7+DAEf6FhxWEPs 4HDdK8Y/Uq74x4h2eVTqpIZ13w== X-Google-Smtp-Source: AGRyM1ukMuBXLJ5/gcwoG2xjDcuwEQY7mRbPGj+ueSqE0hGilNRYHuFkWc039LAfokYembPbjXkPhQ== X-Received: by 2002:ac2:53a8:0:b0:486:777f:a1b6 with SMTP id j8-20020ac253a8000000b00486777fa1b6mr1509368lfh.298.1658567384527; Sat, 23 Jul 2022 02:09:44 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id s29-20020a05651c049d00b0025d6a975c47sm1537636ljc.94.2022.07.23.02.09.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jul 2022 02:09:43 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Doug Anderson Subject: [PATCH 1/3] dt-bindings: arm: qcom: stop describing individual boards Date: Sat, 23 Jul 2022 12:09:40 +0300 Message-Id: <20220723090942.1637676-2-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220723090942.1637676-1-dmitry.baryshkov@linaro.org> References: <20220723090942.1637676-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Describing each compatible board in DT schema seems wrong to me. It means that each new board is incompatible by default, until added to the DT schema. If any of the vendors for whatever reasons tries to validate their new device's DT, they will be stuck with it being incompatible with arm/qcom.yaml until the file is expanded to include such devices. Rework simple cases by dropping individual board compatible strings and replacing them with the empty schema. Signed-off-by: Dmitry Baryshkov --- .../devicetree/bindings/arm/qcom.yaml | 203 ++++-------------- 1 file changed, 39 insertions(+), 164 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml index fb1d00bcc847..d4d945a43178 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml @@ -107,60 +107,39 @@ properties: compatible: oneOf: - items: - - enum: - - qcom,apq8016-sbc + - {} - const: qcom,apq8016 - items: - - enum: - - asus,sparrow - - lg,lenok + - {} - const: qcom,apq8026 - items: - - enum: - - asus,nexus7-flo - - lg,nexus4-mako - - sony,xperia-yuga - - qcom,apq8064-cm-qs600 - - qcom,apq8064-ifc6410 + - {} - const: qcom,apq8064 - items: - - enum: - - qcom,apq8074-dragonboard + - {} - const: qcom,apq8074 - items: - - enum: - - qcom,apq8060-dragonboard - - qcom,msm8660-surf + - {} - const: qcom,msm8660 - items: - - enum: - - qcom,apq8084-mtp - - qcom,apq8084-sbc + - {} - const: qcom,apq8084 - items: - - enum: - - samsung,s3ve3g + - {} - const: qcom,msm8226 - items: - - enum: - - qcom,msm8960-cdp + - {} - const: qcom,msm8960 - items: - - enum: - - fairphone,fp2 - - lge,hammerhead - - samsung,klte - - sony,xperia-amami - - sony,xperia-castor - - sony,xperia-honami + - {} - const: qcom,msm8974 - items: @@ -169,16 +148,7 @@ properties: - const: qcom,msm8916 - items: - - enum: - - alcatel,idol347 - - asus,z00l - - huawei,g7 - - longcheer,l8910 - - samsung,a3u-eur - - samsung,a5u-eur - - samsung,j5 - - samsung,serranove - - wingtech,wt88047 + - {} - const: qcom,msm8916 - items: @@ -187,26 +157,15 @@ properties: - const: qcom,msm8916 - items: - - enum: - - lg,bullhead - - microsoft,talkman - - xiaomi,libra + - {} - const: qcom,msm8992 - items: - - enum: - - sony,karin_windy + - {} - const: qcom,apq8094 - items: - - enum: - - huawei,angler - - microsoft,cityman - - sony,ivy-row - - sony,karin-row - - sony,satsuki-row - - sony,sumire-row - - sony,suzuran-row + - {} - const: qcom,msm8994 - items: @@ -217,49 +176,23 @@ properties: - const: qcom,apq8096 - items: - - enum: - - qcom,msm8996-mtp - - sony,dora-row - - sony,kagura-row - - sony,keyaki-row - - xiaomi,gemini - - xiaomi,natrium - - xiaomi,scorpio + - {} - const: qcom,msm8996 - items: - - enum: - - asus,novago-tp370ql - - fxtec,pro1 - - hp,envy-x2 - - lenovo,miix-630 - - oneplus,cheeseburger - - oneplus,dumpling - - qcom,msm8998-mtp - - sony,xperia-lilac - - sony,xperia-maple - - sony,xperia-poplar + - {} - const: qcom,msm8998 - items: - - enum: - - qcom,ipq4019-ap-dk01.1-c1 - - qcom,ipq4019-ap-dk04.1-c3 - - qcom,ipq4019-ap-dk07.1-c1 - - qcom,ipq4019-ap-dk07.1-c2 - - qcom,ipq4019-dk04.1-c1 + - {} - const: qcom,ipq4019 - items: - - enum: - - qcom,ipq8064-ap148 + - {} - const: qcom,ipq8064 - items: - - enum: - - qcom,ipq8074-hk01 - - qcom,ipq8074-hk10-c1 - - qcom,ipq8074-hk10-c2 + - {} - const: qcom,ipq8074 - description: Qualcomm Technologies, Inc. SC7180 IDP @@ -576,146 +509,88 @@ properties: - const: qcom,sc7280 - items: - - enum: - - lenovo,flex-5g - - microsoft,surface-prox - - qcom,sc8180x-primus + - {} - const: qcom,sc8180x - items: - - enum: - - lenovo,thinkpad-x13s - - qcom,sc8280xp-crd - - qcom,sc8280xp-qrd + - {} - const: qcom,sc8280xp - items: - - enum: - - sony,discovery-row - - sony,kirin-row - - sony,pioneer-row - - sony,voyager-row + - {} - const: qcom,sdm630 - items: - - enum: - - inforce,ifc6560 + - {} - const: qcom,sda660 - items: - - enum: - - fairphone,fp3 + - {} - const: qcom,sdm632 - items: - - enum: - - sony,mermaid-row + - {} - const: qcom,sdm636 - items: - - enum: - - xiaomi,lavender + - {} - const: qcom,sdm660 - items: - - enum: - - qcom,sdx55-mtp - - qcom,sdx55-telit-fn980-tlb - - qcom,sdx55-t55 + - {} - const: qcom,sdx55 - items: - - enum: - - qcom,sdx65-mtp + - {} - const: qcom,sdx65 - items: - - enum: - - qcom,ipq6018-cp01 - - qcom,ipq6018-cp01-c1 + - {} - const: qcom,ipq6018 - items: - - enum: - - qcom,qcs404-evb-1000 - - qcom,qcs404-evb-4000 + - {} - const: qcom,qcs404-evb - const: qcom,qcs404 - items: - - enum: - - qcom,sa8155p-adp + - {} - const: qcom,sa8155p - items: - - enum: - - qcom,sa8295p-adp + - {} - const: qcom,sa8540p - items: - - enum: - - lenovo,yoga-c630 - - lg,judyln - - lg,judyp - - oneplus,enchilada - - oneplus,fajita - - qcom,sdm845-mtp - - shift,axolotl - - samsung,w737 - - sony,akari-row - - sony,akatsuki-row - - sony,apollo-row - - thundercomm,db845c - - xiaomi,beryllium - - xiaomi,polaris + - {} - const: qcom,sdm845 - items: - - enum: - - sony,pdx201 + - {} - const: qcom,sm6125 - items: - - enum: - - sony,pdx213 + - {} - const: qcom,sm6350 - items: - - enum: - - fairphone,fp4 + - {} - const: qcom,sm7225 - items: - - enum: - - microsoft,surface-duo - - qcom,sm8150-hdk - - qcom,sm8150-mtp - - sony,bahamut-generic - - sony,griffin-generic + - {} - const: qcom,sm8150 - items: - - enum: - - qcom,qrb5165-rb5 - - qcom,sm8250-hdk - - qcom,sm8250-mtp - - sony,pdx203-generic - - sony,pdx206-generic + - {} - const: qcom,sm8250 - items: - - enum: - - microsoft,surface-duo2 - - qcom,sm8350-hdk - - qcom,sm8350-mtp - - sony,pdx214-generic - - sony,pdx215-generic + - {} - const: qcom,sm8350 - items: - - enum: - - qcom,sm8450-hdk - - qcom,sm8450-qrd + - {} - const: qcom,sm8450 additionalProperties: true From patchwork Sat Jul 23 09:09:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 592945 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 DC4EBC43334 for ; Sat, 23 Jul 2022 09:09:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237101AbiGWJJt (ORCPT ); Sat, 23 Jul 2022 05:09:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236974AbiGWJJs (ORCPT ); Sat, 23 Jul 2022 05:09:48 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1FB625FACE for ; Sat, 23 Jul 2022 02:09:47 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id bp17so11118268lfb.3 for ; Sat, 23 Jul 2022 02:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q8lBqyEx6SGHmbE+vfXkQ2O8ysfEUB+r1LK9cuMZdXY=; b=GwdeW4U3zgHBxbPUoxEy2XpZQCEGQQXWjy2QUugJTEAgH0DHOMOw/TyCqQ5U9tnnqN xm68fJUFWXVdAquAM0qzt4XkXB0qnMhKV6SMuYZC645GB1K3kWhGpQWmygZwKccRQW5D wy3DvkNKRofHjk3kSgpOUQNs9E4uHIXf6wmDfeJuhGOWgqAHsITNgKffajeEMyHXKI/I QQjY6pMtVjLI7nEzSijemiCGDirXQkY52zUYc7i4c2i4k0T5oJIIuxAMmk838CsjnvRe z03qKNBc33oQ3uO/3WWB5/E3jS8Q0sXANCNsZupZzJqU7s2NhS98kGoGdVYnUUMJaraH L9ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q8lBqyEx6SGHmbE+vfXkQ2O8ysfEUB+r1LK9cuMZdXY=; b=JqdjSJoZ4XZqfuY2dYOAVIbFkRaTXBDdGTIzo9rPBlFUvkLluftyerEKRasW12oPJc Fj/VAU8ADhkJhyDbwWqmkSqsbrwbbRi9ek3ltAZVEzlrlQ+L7B9S4eHpK9fJ0oAb9Mdy +J6aglHqjpfqmlJuexdqMHtQ+FrYH+McnZClObRmwDnMkquTvZ/iqqmdKyhg83QQaFjM 02rJ/gujSb0fjtxhIsb32j9m+v1v3utjmkqV/1dMQ2QdmjHxXf9hfgEc1svZkfWxIe0S QB/NGf+W+yfhxtSMPXG0sKMvdb3H3HdHCp6+1ljdGNKHBSXhiWVfSjIMVBBdzeGkYrJq 0AeQ== X-Gm-Message-State: AJIora8e2ZDrnfMyMkbb6BXSH8g19fYCRsAjlSBP8d9klgdj9Q89I/20 6JeYtYP2IObz+jtPOrG6LsxoMQ== X-Google-Smtp-Source: AGRyM1uD0AFoTvurrkUJ7itQsHuNiQ6op58mdd1FtDNkisPuPdShrCsURia/YY01obutoN7dTmC40g== X-Received: by 2002:a05:6512:b8e:b0:489:dbf4:e6f5 with SMTP id b14-20020a0565120b8e00b00489dbf4e6f5mr1606424lfv.612.1658567385269; Sat, 23 Jul 2022 02:09:45 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id s29-20020a05651c049d00b0025d6a975c47sm1537636ljc.94.2022.07.23.02.09.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Jul 2022 02:09:44 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, Doug Anderson Subject: [PATCH 2/3] dt-bindings: arm: qcom: merge simple platform definitions Date: Sat, 23 Jul 2022 12:09:41 +0300 Message-Id: <20220723090942.1637676-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220723090942.1637676-1-dmitry.baryshkov@linaro.org> References: <20220723090942.1637676-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Merge most existing Qualcomm platform definitions, which consist of empty schema plus single SoC string. Signed-off-by: Dmitry Baryshkov --- .../devicetree/bindings/arm/qcom.yaml | 188 ++++-------------- 1 file changed, 39 insertions(+), 149 deletions(-) diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml index d4d945a43178..809d3de18194 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml @@ -108,66 +108,56 @@ properties: oneOf: - items: - {} - - const: qcom,apq8016 - - - items: - - {} - - const: qcom,apq8026 - - - items: - - {} - - const: qcom,apq8064 - - - items: - - {} - - const: qcom,apq8074 - - - items: - - {} - - const: qcom,msm8660 - - - items: - - {} - - const: qcom,apq8084 - - - items: - - {} - - const: qcom,msm8226 - - - items: - - {} - - const: qcom,msm8960 - - - items: - - {} - - const: qcom,msm8974 + - enum: + - qcom,apq8016 + - qcom,apq8026 + - qcom,apq8064 + - qcom,apq8074 + - qcom,apq8084 + - qcom,apq8094 + - qcom,ipq4019 + - qcom,ipq6018 + - qcom,ipq8064 + - qcom,ipq8074 + - qcom,msm8226 + - qcom,msm8660 + - qcom,msm8916 + - qcom,msm8960 + - qcom,msm8974 + - qcom,msm8992 + - qcom,msm8994 + - qcom,msm8996 + - qcom,msm8998 + - qcom,sa8155p + - qcom,sa8540p + - qcom,sc8180x + - qcom,sc8280xp + - qcom,sda660 + - qcom,sdm630 + - qcom,sdm632 + - qcom,sdm636 + - qcom,sdm660 + - qcom,sdm845 + - qcom,sdx55 + - qcom,sdx65 + - qcom,sm6125 + - qcom,sm6350 + - qcom,sm7225 + - qcom,sm8150 + - qcom,sm8250 + - qcom,sm8350 + - qcom,sm8450 - items: - const: qcom,msm8916-mtp - const: qcom,msm8916-mtp/1 - const: qcom,msm8916 - - items: - - {} - - const: qcom,msm8916 - - items: - const: longcheer,l8150 - const: qcom,msm8916-v1-qrd/9-v1 - const: qcom,msm8916 - - items: - - {} - - const: qcom,msm8992 - - - items: - - {} - - const: qcom,apq8094 - - - items: - - {} - - const: qcom,msm8994 - - items: - enum: - arrow,apq8096-db820c @@ -175,26 +165,6 @@ properties: - const: qcom,apq8096-sbc - const: qcom,apq8096 - - items: - - {} - - const: qcom,msm8996 - - - items: - - {} - - const: qcom,msm8998 - - - items: - - {} - - const: qcom,ipq4019 - - - items: - - {} - - const: qcom,ipq8064 - - - items: - - {} - - const: qcom,ipq8074 - - description: Qualcomm Technologies, Inc. SC7180 IDP items: - enum: @@ -508,91 +478,11 @@ properties: - const: google,villager - const: qcom,sc7280 - - items: - - {} - - const: qcom,sc8180x - - - items: - - {} - - const: qcom,sc8280xp - - - items: - - {} - - const: qcom,sdm630 - - - items: - - {} - - const: qcom,sda660 - - - items: - - {} - - const: qcom,sdm632 - - - items: - - {} - - const: qcom,sdm636 - - - items: - - {} - - const: qcom,sdm660 - - - items: - - {} - - const: qcom,sdx55 - - - items: - - {} - - const: qcom,sdx65 - - - items: - - {} - - const: qcom,ipq6018 - - items: - {} - const: qcom,qcs404-evb - const: qcom,qcs404 - - items: - - {} - - const: qcom,sa8155p - - - items: - - {} - - const: qcom,sa8540p - - - items: - - {} - - const: qcom,sdm845 - - - items: - - {} - - const: qcom,sm6125 - - - items: - - {} - - const: qcom,sm6350 - - - items: - - {} - - const: qcom,sm7225 - - - items: - - {} - - const: qcom,sm8150 - - - items: - - {} - - const: qcom,sm8250 - - - items: - - {} - - const: qcom,sm8350 - - - items: - - {} - - const: qcom,sm8450 - additionalProperties: true ...