From patchwork Thu Nov 10 19:56:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 18302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp349988wru; Thu, 10 Nov 2022 12:05:37 -0800 (PST) X-Google-Smtp-Source: AMsMyM7FKchhfAtljNCPdFLIUfpxH9USrJBAZ+C1lpkp3PoSijvVFZQbPSFFACpkdzxpMlO5iHpb X-Received: by 2002:a05:6402:2b90:b0:461:de5e:ba52 with SMTP id fj16-20020a0564022b9000b00461de5eba52mr3259287edb.177.1668110737343; Thu, 10 Nov 2022 12:05:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668110737; cv=none; d=google.com; s=arc-20160816; b=g+cwOmu9k7y2ThIMPIo2irG129F5yDa2ZJPmkKTNmu6CD3guBrUFRS329BfqVozH94 HaE7is7VFiIjY6ZxVhJoYZmPoSmfQ/+pl+wCwW/lbFAQkiP5LCkA8SBIDJE0n5+0tzT4 bdtv5iv7H6riyRbfEYjnRPYaD9gdbO/8WJWOJEYL5Zb2cBC+oaUZ+qloG3O49ZG16fZd q+GWDORxajsFGXku+2bmjUzAUMMwt/IHbBmEdaLhINILrcqQKcpCI7z/xWpDPvW6MVqd 7sHBzqWvj40YSi2tsjVtmavKaiDYLNF7/H9UMpUkuB7KqXmig0oA9UTzBH4rSDKso9sm jvgg== 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=ocUEjaXvalO2lDp0ra2nIWRh/qi3vcvKb/fRj0kfIXs=; b=w6mcOnAn13VF3z4eldN+KlEi3sMcWvaRBft13UaSfIhyUjo+0goBqSTZeCz6tz9o2P SpR/pzN/5Bp6Ksnki3BKCjRIpbHwLzhXaTEehv47+mLbyd8SCAnomVQsSqHbBd5HhlE8 BRHpP6e6G1lYRGVrmItPwEbytQxxBh5ujMT7zcRrqcFCcCVvtyJdlwnS/ddanIJKPJnG 3DroInDctXcgDP5QLKUNXxLXyFx3k/eHMpyhnRoycjBj18BQy6k6xy7r1dEOHcJtXjnr VGjgCdENrCWh3pUEC3/hSbEhw99yNjsm9izdcWR0EWHQ9n5Tl7BDZEZyq9LqgeB4MOeP 6JOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iO0BMOiK; 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 b14-20020a056402278e00b00458ac23f0b8si466977ede.399.2022.11.10.12.05.13; Thu, 10 Nov 2022 12:05:37 -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=iO0BMOiK; 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 S231311AbiKJT4n (ORCPT + 99 others); Thu, 10 Nov 2022 14:56:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231320AbiKJT43 (ORCPT ); Thu, 10 Nov 2022 14:56:29 -0500 Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26130DE80 for ; Thu, 10 Nov 2022 11:56:28 -0800 (PST) Received: by mail-il1-x131.google.com with SMTP id m15so1564374ilq.2 for ; Thu, 10 Nov 2022 11:56:28 -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=ocUEjaXvalO2lDp0ra2nIWRh/qi3vcvKb/fRj0kfIXs=; b=iO0BMOiKTGpHVZQMg6F9oQUWAqh31KTlX5fuYl3NviTrB6Kei0Xho18Y7D4Be1OVbe +DgWY6VYuK3jIljAx6cdNWxzNdGRAA2TlrpRDGOrRG3W0AmtM8cbxxNshFQJbrfWOCVc 3qWf/AA59DPimGQwSAXaf/sF4980VjIAEN1ZOf048/Bf+NVyFru/JoEFDxM8OaqReW7v bgOvGYgbgvRo4e9J2wD5VabDpZ9RbE46BQZ1D8jRtz8kpGG7pmxJ0PgdV4yIgEPbnpre 6sz3Fx9QAWwJ355ZoLF9zcR0Cwv1tG675ND1A9WAGG+j7ABm/tReyAUHSHzyxGH/AB7G wJLQ== 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=ocUEjaXvalO2lDp0ra2nIWRh/qi3vcvKb/fRj0kfIXs=; b=hXpcDg/DgSx0E8z1B190Cg6XyCmAvKdDmbUtn9pvN7+UZNwAAX4cNiiuMRDH5qxNSw vWmIl73hwnYvJ2h4nsVpg1d25OnyAfzWWkgHchWcy2+hHON9c8rimSF5s4ugU0y4cKyV 3gA486Rx0OPyLSvCsEx3pskmjjjEYeKoAhIl1SjbOGirzE7D9yiSxnOnGMQf1IPONL0d /q1tpcoUhw+JQJ9SvxBRn3jYFLrmjjFn/iOUkx5LelVfWaRpGU6VnNwYgnJ1sSLnSKnF r1XdOV1t+kWnxy18C/qi1dQIFGv5JbuRBhKJrNXA7MjZ5P2XpZOLkDZnl9Ea/r4qny57 FsKw== X-Gm-Message-State: ACrzQf3dUelYO7GudbnoyVtOS1j0jYgwok2Gv6cpk7EZlh2HveIH8lqQ o5CODpRX8aYlKK3th4506A4R3g== X-Received: by 2002:a05:6e02:1a08:b0:2ff:dc4b:a4c0 with SMTP id s8-20020a056e021a0800b002ffdc4ba4c0mr3468201ild.221.1668110187502; Thu, 10 Nov 2022 11:56:27 -0800 (PST) Received: from presto.localdomain ([98.61.227.136]) by smtp.gmail.com with ESMTPSA id l2-20020a6b3e02000000b006bbddd49984sm28602ioa.9.2022.11.10.11.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Nov 2022 11:56:26 -0800 (PST) From: Alex Elder To: robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: andersson@kernel.org, konrad.dybcio@linaro.org, agross@kernel.org, elder@kernel.org, linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 2/2] dt-bindings: net: qcom,ipa: restate a requirement Date: Thu, 10 Nov 2022 13:56:18 -0600 Message-Id: <20221110195619.1276302-3-elder@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221110195619.1276302-1-elder@linaro.org> References: <20221110195619.1276302-1-elder@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=unavailable 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?1749140884407354157?= X-GMAIL-MSGID: =?utf-8?q?1749140884407354157?= Either the AP or modem loads GSI firmware. If the modem-init property is present, the modem loads it. Otherwise, the AP loads it, and in that case the memory-region property must be defined. Currently this requirement is expressed as one or the other of the modem-init or the memory-region property being required. But it's harmless for the memory-region to be present if the modem is loading firmware (it'll just be ignored). Restate the requirement so that the memory-region property is required only if modem-init is not present. Signed-off-by: Alex Elder Reviewed-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/net/qcom,ipa.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml index 2d253ef488188..e752b76192df0 100644 --- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml @@ -155,12 +155,15 @@ required: - interconnects - qcom,smem-states -# Either modem-init is present, or memory-region must be present. -oneOf: - - required: +# If modem-init is not present, the AP loads GSI firmware, and +# memory-region must be specified +if: + not: + required: - modem-init - - required: - - memory-region +then: + required: + - memory-region additionalProperties: false