From patchwork Fri Jun 4 20:57:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 454174 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp750829jae; Fri, 4 Jun 2021 13:57:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGPw0SAiqzNYCCX0eBMumjJSiLEWaavVT10yQF8t0o5qC3S4LiLcc/OUumgRRq5NBl5y8Y X-Received: by 2002:a17:906:d1ce:: with SMTP id bs14mr6188205ejb.183.1622840254028; Fri, 04 Jun 2021 13:57:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622840254; cv=none; d=google.com; s=arc-20160816; b=weX8bi7QRZL1ruQxjhrKNdpvstG9zF55afhwnYomfuxdQP825oibd/Nef/EEHsO64t 6uNmJdAbKAtzedkDpXIQWfFQBRqBLnED+9XLYYWr9CHo61YDel7l0zutUonyIT1r+UDB 3jTRzmhbfP/ajnpI0IWny59uXDFGqgCx6X/7EfuYyBNH6eN96B+zFJRUVLzZsUks3up3 hym7RLPCnGapXwe+1VAtY2whxhDfLL2kxp+qoY5thfjRMu+x3BFewHddsIZ2LQ2dVF2I WP9xagSM++DhQQ+wuHbAGqW0tAMv6h7bUXWnUVtsrT0Ygq6ppxK/gfbjFtt52ivA2UKl bs0g== 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; bh=PtuDjHXHivPy3l4kj1bXEdUMfyrEdc4VzcBHxdPARLE=; b=kRju/kXnhOF7PzUliAQmslvR8IROnrBLC53gou2Vn9jJIAsLJ5IcNYqv8HNeFLLW+L 1EtXKM9Utr6+ysIXm2hCM8cv9eNvEu2/1c2jf4BG8LBwhARWWW9phngHXfsjq90qKQqL 57D4emfMMrBfGkvhOxF+7gMsYda1nugGWnaQ/EYvpiL536sBY28qFRg7ERAc3/SGkl/f vMLIoA3NaSsHeegmKuP5jFNOzOUEML2UJ+SOvbv9Yo5V4CVRZ//Yd3LifqogrxYkv8l7 qZtpkoYfcB+TaaAYxsgvfqqyhlj5DSEeViW/V8ixXK1/1B4SRPyZkscqzt0FSsR4ghdX dBOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ho33si4947029ejc.1.2021.06.04.13.57.33; Fri, 04 Jun 2021 13:57:34 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231245AbhFDU7H (ORCPT + 7 others); Fri, 4 Jun 2021 16:59:07 -0400 Received: from foss.arm.com ([217.140.110.172]:48038 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230177AbhFDU7H (ORCPT ); Fri, 4 Jun 2021 16:59:07 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C77141478; Fri, 4 Jun 2021 13:57:20 -0700 (PDT) Received: from usa.arm.com (e103737-lin.cambridge.arm.com [10.1.197.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id AAFBF3F719; Fri, 4 Jun 2021 13:57:19 -0700 (PDT) From: Sudeep Holla To: devicetree@vger.kernel.org Cc: Sudeep Holla , linux-arm-kernel@lists.infradead.org, Rob Herring , Cristian Marussi , Kevin Hilman , Neil Armstrong , Jerome Brunet Subject: [PATCH v3 3/6] dt-bindings: firmware: amlogic, scpi: Convert to json schema Date: Fri, 4 Jun 2021 21:57:07 +0100 Message-Id: <20210604205710.1944363-4-sudeep.holla@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210604205710.1944363-1-sudeep.holla@arm.com> References: <20210604205710.1944363-1-sudeep.holla@arm.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Convert/merge the existing text format SCPI binding additions for amlogic,scpi into the common arm,scpi json scheme. Couple of things to note: "amlogic,meson-gxbb-scpi" is always used with "arm,scpi-pre-1.0" and "amlogic,meson-gxbb-scpi-sensors" is used always with "arm,scpi-sensors" Cc: Rob Herring Cc: Kevin Hilman Cc: Neil Armstrong Cc: Jerome Brunet Signed-off-by: Sudeep Holla --- .../devicetree/bindings/arm/amlogic,scpi.txt | 15 ------------ .../bindings/firmware/arm,scpi.yaml | 24 ++++++++++++++++++- 2 files changed, 23 insertions(+), 16 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/amlogic,scpi.txt -- 2.25.1 diff --git a/Documentation/devicetree/bindings/arm/amlogic,scpi.txt b/Documentation/devicetree/bindings/arm/amlogic,scpi.txt deleted file mode 100644 index ebfe302fb747..000000000000 --- a/Documentation/devicetree/bindings/arm/amlogic,scpi.txt +++ /dev/null @@ -1,15 +0,0 @@ -System Control and Power Interface (SCPI) Message Protocol -(in addition to the standard binding in [0]) ----------------------------------------------------------- -Required properties - -- compatible : should be "amlogic,meson-gxbb-scpi" - -Sensor bindings for the sensors based on SCPI Message Protocol --------------------------------------------------------------- -SCPI provides an API to access the various sensors on the SoC. - -Required properties: -- compatible : should be "amlogic,meson-gxbb-scpi-sensors". - -[0] Documentation/devicetree/bindings/arm/arm,scpi.txt diff --git a/Documentation/devicetree/bindings/firmware/arm,scpi.yaml b/Documentation/devicetree/bindings/firmware/arm,scpi.yaml index 6cb70e2008fc..ce429cf2bdc0 100644 --- a/Documentation/devicetree/bindings/firmware/arm,scpi.yaml +++ b/Documentation/devicetree/bindings/firmware/arm,scpi.yaml @@ -32,6 +32,10 @@ description: | oneOf: - const: arm,scpi # SCPI v1.0 and above - const: arm,scpi-pre-1.0 # Unversioned SCPI before v1.0 + - items: + - enum: + - amlogic,meson-gxbb-scpi + - const: arm,scpi-pre-1.0 mboxes: description: | @@ -84,7 +88,12 @@ additionalProperties: false properties: compatible: - const: arm,scpi-sensors + oneOf: + - const: arm,scpi-sensors + - items: + - enum: + - amlogic,meson-gxbb-scpi-sensors + - const: arm,scpi-sensors '#thermal-sensor-cells': const: 1 @@ -224,4 +233,17 @@ additionalProperties: false }; }; + - | + firmware { + scpi { + compatible = "amlogic,meson-gxbb-scpi", "arm,scpi-pre-1.0"; + mboxes = <&mailbox 1 &mailbox 2>; + shmem = <&cpu_scp_lpri &cpu_scp_hpri>; + + scpi_sensors1: sensors { + compatible = "amlogic,meson-gxbb-scpi-sensors", "arm,scpi-sensors"; + #thermal-sensor-cells = <1>; + }; + }; + }; ...