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: 70368 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp57416wrt; Wed, 15 Mar 2023 11:39:20 -0700 (PDT) X-Google-Smtp-Source: AK7set8TJvFR3NlVodzd9CDctL4OlDugE1I/yZ5kiAtNOwdp6Hvvg2Ae5ckPtNjl3prMV/cUEAgZ X-Received: by 2002:a62:790c:0:b0:622:b10a:67f2 with SMTP id u12-20020a62790c000000b00622b10a67f2mr429274pfc.24.1678905559769; Wed, 15 Mar 2023 11:39:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678905559; cv=none; d=google.com; s=arc-20160816; b=Xn0DRGaDoCkH7YJN18IzQNquoJu0jLjFnfOt4e8bPmL+Cs4479DHBdl/D81JsK0RLo LKnkjEvM7dqQLZD6jAO/fxsjmAOelebJ3ILvV6z7UvFNQMcmOTYdFwGKLMk2l05mzAiu rnQi4Tte+If6Tp02lpgrsFPx7AajHLDrTQ8yZlEdemppuUa30N8xTDBMEHVY/aaWI+zF 0kZ08NU6kvz5aHCSxNEDo9rQIa9s8gVUgHFLO82C0rVIPwqH06kCxwpIrvrBAZdhKfVD WYAEKRLtRMEJdG1JBdgQgeU+3Qiq8xfDBVqiJIU49eq9lgdVoqgHlHnmk0u3bwV5/+9X q3PA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=lUa8//lyKnSdOFUjOl9afhkYQARVR2uYtRvHFtnhi3o=; b=UvF6ecQZCnehFmrsEg2GGssuyXcgd/XuhcNianWvULUVn0eFtJrNcDJQf3Eqd/ZRHl h/EvEQRtn48CRUDKSziBobyImFxYQPGlFtzBT9QinvtxOlBn8hu8aXqmyZmKcmSHX1AX cueBiHqroezyxvbkUyDb2Ljdyvi2yajVxMAly7SzavadnBplNxtBikAOQLAYUZxxPdGt rz5hiK0+W+7NOObzvL2BvHr4VDATRiwtA2GBfTQPgoTqKR+rd2ffKUUqLUQLq1gkMHKi fTpFEPwyTGs26pH+2qiDj583zn9X24dHOuQ7nm+T6VF2W9vNOpqRKJiwBupv5i7AUGyl WEpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eKFUyQaN; 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 y12-20020a63fa0c000000b004fc2f2d9cb9si5439450pgh.126.2023.03.15.11.39.05; Wed, 15 Mar 2023 11:39:19 -0700 (PDT) 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=eKFUyQaN; 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 S231246AbjCOSck (ORCPT + 99 others); Wed, 15 Mar 2023 14:32:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44860 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229546AbjCOSci (ORCPT ); Wed, 15 Mar 2023 14:32:38 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 484FC8C81D for ; Wed, 15 Mar 2023 11:32:37 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id o8so5480998lfo.0 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=BPq9QW6ueYmifISnWYTiyNNZg0kGqwvWJa8tJBFhv3sM5/CymIWptdEUxMNEJCpglu Zn6qtc/4wzgZTEvnyQstA5i+bGltQNATUaIC5ZBzHBmNgo1c10ga6q28TDz2YjfuO9o0 2A4OQgjpfsItWJ/XXYf6tk4evoVjRSqqfErWGUfA1IJSeIn5ROkUtH5w8avc5JBpfblM vJZee/jL8efhoV3S+u/XdNOU0WyJN9oKwUapce1zuCkjBrlIpcSIZaEuueTQ7UCT2q+j OPlRoEtsQWwQyPtbWiUOWISkeVE5ioG7calmPbuy50AFR9tCLuZAt0yFSj/9jnDJz2gz /GSA== X-Gm-Message-State: AO0yUKXjZgR4ff1ZV42nV9pmlqXtd3UCeo848HZc/idiAmye4ZiIYbxN JC9so6xtDM7M6xtJfNc3o5VZBQ== 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 X-Spam-Status: No, score=-0.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_HTTP,RCVD_IN_SORBS_SOCKS,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no 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?1760460076035823682?= X-GMAIL-MSGID: =?utf-8?q?1760460076035823682?= 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 Reviewed-by: Krzysztof Kozlowski --- .../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: