From patchwork Wed Mar 11 21:47:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 11432861 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9642092C for ; Wed, 11 Mar 2020 21:47:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BEA7820746 for ; Wed, 11 Mar 2020 21:47:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Ngnn9tY0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729504AbgCKVrG (ORCPT ); Wed, 11 Mar 2020 17:47:06 -0400 Received: from mail-yw1-f66.google.com ([209.85.161.66]:34939 "EHLO mail-yw1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729462AbgCKVrG (ORCPT ); Wed, 11 Mar 2020 17:47:06 -0400 Received: by mail-yw1-f66.google.com with SMTP id d79so3584372ywd.2 for ; Wed, 11 Mar 2020 14:47:05 -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:mime-version :content-transfer-encoding; bh=AYTqu7o88DhiQCN4tNkQrXf0r9/tf9NCCJPXItwuqG0=; b=Ngnn9tY0dNnZN3nx9YvjEIWeBi8S2tWsNnj6rddIzFEA7Pdc0YM+0/mn7AgMx2HzaM vH+fK37OmyXoLOzYM0c0QBYbMydrSYfkjzL7zyLKZKbSWxciXJXu4X69DEYa1xoBA1kI zXZ/ltNeG0iSFUUR1yOiawNUwcfxT+JtZRH38OsizyvJcFnaaoWsMDDoUfblTFlTkXxZ djGsqYjvvGUOwWZ0+elKdmtWF+YWQCCl/7I/lVEsPie5q0nWXmMmqVBhaHCwsp59k/wf ccFmBsQo4tO9gLMOLsi+Y8+DIWEy/uX/7WJC1k8Am6IvmNmV8Z55+1SPIZLjdeul1o20 3EQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AYTqu7o88DhiQCN4tNkQrXf0r9/tf9NCCJPXItwuqG0=; b=q3Mhhk/IkMi0/kLnHP3bfgarkjBypeYeNquI3DLxOwgsmcMXPSr2sZ++IGTxyxCdKU fyTh9iiClW3+YGyZC38mITr3FaEFoygtPXc0tlUPiOplx+xC2draSDNO075m4W5jfquX vkU+bSPDo76G/rUoL8NiKEPDtbg1RNRUmEpAixM6d+MUYrJX9CvrTQqoqXa5CWsrb2je wPGoNzociDMLNAR7NM/Trw7PB/FCyMjkRw54WRJ/fEgS6JYLFT4I1IM0JcN5dqMSg7Mo WWrCsZuM4h9IjiRiSyJY2qxtCShD0w9S6HI2Y4OUI6eskjxvYKLeNJqeZN8eypdvuj3B 2EcA== X-Gm-Message-State: ANhLgQ0iyd5xCEK9JW0Jmf97c7CMqWvv1rDdaKXtPzej9M6xyKihywG6 UhrAU0OOVjOaam27uDh/gx/1Ag== X-Google-Smtp-Source: ADFU+vvzcODWsXeejF0XDQuX8AJzozF15nlzc98C1kAuaKrLgndz7qyCgTRl1U+b0E9iTGo8BTSQKw== X-Received: by 2002:a25:2688:: with SMTP id m130mr5423645ybm.408.1583963225161; Wed, 11 Mar 2020 14:47:05 -0700 (PDT) Received: from localhost.localdomain (c-73-185-129-58.hsd1.mn.comcast.net. [73.185.129.58]) by smtp.gmail.com with ESMTPSA id h139sm21100965ywa.35.2020.03.11.14.47.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2020 14:47:04 -0700 (PDT) From: Alex Elder To: Rob Herring , Mark Rutland , "David S . Miller" Cc: Bjorn Andersson , Andy Gross , linux-arm-msm@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] dt-bindings: soc: qcom: fix IPA binding Date: Wed, 11 Mar 2020 16:47:00 -0500 Message-Id: <20200311214700.700-1-elder@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The definitions for the "qcom,smem-states" and "qcom,smem-state-names" properties need to list their "$ref" under an "allOf" keyword. In addition, fix two problems in the example at the end: - Use #include for header files that define needed symbolic values - Terminate the line that includes the "ipa-shared" register space name with a comma rather than a semicolon Finally, update some white space in the example for better alignment. Signed-off-by: Alex Elder --- The IPA driver (including "qcom,ipa.yaml") landed in the net-next tree last week, so this patch is built upon that. This probably means this patch should be taken through net-next as well, but I'll leave that to the maintainers to work out. -Alex .../devicetree/bindings/net/qcom,ipa.yaml | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml index 91d08f2c7791..140f15245654 100644 --- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml @@ -87,14 +87,16 @@ properties: - const: config qcom,smem-states: - $ref: /schemas/types.yaml#/definitions/phandle-array + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle-array description: State bits used in by the AP to signal the modem. items: - description: Whether the "ipa-clock-enabled" state bit is valid - description: Whether the IPA clock is enabled (if valid) qcom,smem-state-names: - $ref: /schemas/types.yaml#/definitions/string-array + allOf: + - $ref: /schemas/types.yaml#/definitions/string-array description: The names of the state bits used for SMP2P output items: - const: ipa-clock-enabled-valid @@ -139,6 +141,10 @@ oneOf: examples: - | + #include + #include + #include + smp2p-mpss { compatible = "qcom,smp2p"; ipa_smp2p_out: ipa-ap-to-modem { @@ -162,17 +168,17 @@ examples: <0 0x1e47000 0 0x2000>, <0 0x1e04000 0 0x2c000>; reg-names = "ipa-reg", - "ipa-shared"; - "gsi"; + "ipa-shared", + "gsi"; interrupts-extended = <&intc 0 311 IRQ_TYPE_EDGE_RISING>, - <&intc 0 432 IRQ_TYPE_LEVEL_HIGH>, - <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, - <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>; + <&intc 0 432 IRQ_TYPE_LEVEL_HIGH>, + <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>; interrupt-names = "ipa", - "gsi", - "ipa-clock-query", - "ipa-setup-ready"; + "gsi", + "ipa-clock-query", + "ipa-setup-ready"; clocks = <&rpmhcc RPMH_IPA_CLK>; clock-names = "core"; @@ -182,11 +188,11 @@ examples: <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_IMEM>, <&rsc_hlos MASTER_APPSS_PROC &rsc_hlos SLAVE_IPA_CFG>; interconnect-names = "memory", - "imem", - "config"; + "imem", + "config"; qcom,smem-states = <&ipa_smp2p_out 0>, - <&ipa_smp2p_out 1>; + <&ipa_smp2p_out 1>; qcom,smem-state-names = "ipa-clock-enabled-valid", "ipa-clock-enabled"; };