From patchwork Wed Mar 15 18:32:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 664244 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 39BC5C6FD1D for ; Wed, 15 Mar 2023 18:32:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231244AbjCOSck (ORCPT ); Wed, 15 Mar 2023 14:32:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230134AbjCOScj (ORCPT ); Wed, 15 Mar 2023 14:32:39 -0400 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4BD418C83A for ; Wed, 15 Mar 2023 11:32:37 -0700 (PDT) Received: by mail-lf1-x130.google.com with SMTP id j11so25421907lfg.13 for ; Wed, 15 Mar 2023 11:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678905155; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=lUa8//lyKnSdOFUjOl9afhkYQARVR2uYtRvHFtnhi3o=; b=eKFUyQaNYExzyKv2KyBxlWlFlntkR3/ausD8bBmO1R162fNhYqgy6EvoyyBXfU1yTG rUUc8nN1cfP9Qg4Vn26/KLh2rkK3bM8zcTOX5aJN1LajWV6ai+QM2INZFXK+P5nnP9xP oJUpO8aJE7hqqh2jdHYOAYAHB6jqtOiFzK2rkdtpvDUt/wHp7cSol30MNdiVaNpQudom RC2r95g0EqBL2e7TOCcVczzlU8tx4WqZWiBDxGArLvL0tbJm9VrZycctKGzGaWF6wWe+ t6VX/sCQTiocGjflq/IOz0gREie/gtiaTFoiok4MuJzLRnrbDnNCYOtNwSiBY4KHp4BL YaHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678905155; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lUa8//lyKnSdOFUjOl9afhkYQARVR2uYtRvHFtnhi3o=; b=dTxSU9Twt4UqqPEEfVycdVS3pgeGsfOl4JBuh1A9EpPlkJv0PxTlQwd8BckSfmWlfO mSLXQTQCEv44tr23HN3FFl7fuppWNB5NbFGDydg3VFnBtoo3B1zG67WIx3Oyxsgis3+8 DifD9OsOiYKd616imQgqzInF+orVshV/iNoxGlWxDsZBEqwksxkRWZYcWlnFMgRU54xp //+DEe2VfPgLPDg1G7jAce+O9QX8xZRyeqbmBn1xTgU2oODFs3Hgt+rL24ih8OrvhCTF UvoFk2MuEVnS+tbcRwvSmmOqsa82GyZlF858kJ9H2kNH3/+MN85e6rRkIFLLDPGU5I7X j9oQ== X-Gm-Message-State: AO0yUKVwYe9EBzpitz2xetS8ngho8vdf7pZXeI+LUUeXBhCw95HMFvqt F+V9KYYNahjW8R88enfmVOdtPurkp5YxvBz9iwk= X-Google-Smtp-Source: AK7set/J+tOaVF7js9psDTI0PrQjsCzzhIunhHjs7+U0fO5D3KKmiLApCLY1PjhSfTHqjx4pOZ8beQ== X-Received: by 2002:a05:6512:408:b0:4db:3877:817a with SMTP id u8-20020a056512040800b004db3877817amr2558622lfk.28.1678905155551; Wed, 15 Mar 2023 11:32:35 -0700 (PDT) Received: from localhost.localdomain (abyj16.neoplus.adsl.tpnet.pl. [83.9.29.16]) by smtp.gmail.com with ESMTPSA id i10-20020a056512006a00b004d0b1327b75sm911033lfo.61.2023.03.15.11.32.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 11:32:35 -0700 (PDT) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org Cc: marijn.suijten@somainline.org, Konrad Dybcio , Mathieu Poirier , Rob Herring , Krzysztof Kozlowski , Bhupesh Sharma , linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dt-bindings: remoteproc: qcom: sm6115-pas: Add QCM2290 Date: Wed, 15 Mar 2023 19:32:31 +0100 Message-Id: <20230315183231.3562580-1-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org QCM2290 is more or less a fork of the same design that SM6115 is based on. As a result, the ADSP and modem found on it are identical. Add compatibles for the QCM2290 with SM6115 fallbacks so as not to require any driver changes. Change the allOf:if:properties clauses to look for the presence of SM6115 compatibles and not an exact match. Note that QCM2290 lacks a CDSP. Signed-off-by: Konrad Dybcio --- .../bindings/remoteproc/qcom,sm6115-pas.yaml | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml b/Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml index f5d1fa9f45f1..95a76b98f693 100644 --- a/Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml +++ b/Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml @@ -15,10 +15,19 @@ description: properties: compatible: - enum: - - qcom,sm6115-adsp-pas - - qcom,sm6115-cdsp-pas - - qcom,sm6115-mpss-pas + oneOf: + - enum: + - qcom,sm6115-adsp-pas + - qcom,sm6115-cdsp-pas + - qcom,sm6115-mpss-pas + + - items: + - const: qcom,qcm2290-adsp-pas + - const: qcom,sm6115-adsp-pas + + - items: + - const: qcom,qcm2290-mpss-pas + - const: qcom,sm6115-mpss-pas reg: maxItems: 1 @@ -50,9 +59,10 @@ allOf: - if: properties: compatible: - enum: - - qcom,sm6115-adsp-pas - - qcom,sm6115-cdsp-pas + contains: + enum: + - qcom,sm6115-adsp-pas + - qcom,sm6115-cdsp-pas then: properties: interrupts: @@ -69,9 +79,10 @@ allOf: - if: properties: compatible: - enum: - - qcom,sm6115-cdsp-pas - - qcom,sm6115-mpss-pas + contains: + enum: + - qcom,sm6115-cdsp-pas + - qcom,sm6115-mpss-pas then: properties: power-domains: @@ -84,8 +95,9 @@ allOf: - if: properties: compatible: - enum: - - qcom,sm6115-adsp-pas + contains: + enum: + - qcom,sm6115-adsp-pas then: properties: power-domains: