From patchwork Tue Jun 1 22:49:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 451441 Delivered-To: patch@linaro.org Received: by 2002:a02:c735:0:0:0:0:0 with SMTP id h21csp29258jao; Tue, 1 Jun 2021 15:49:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQ08dmKlgBDzcPmyyQmf+MeBK/nIbCbGQlTBqRvxC0x54vFxXb/RJG4jw6HAmPKqG8j1Pm X-Received: by 2002:a17:907:2165:: with SMTP id rl5mr8037885ejb.98.1622587767141; Tue, 01 Jun 2021 15:49:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622587767; cv=none; d=google.com; s=arc-20160816; b=eY11NnLZrb9gJ8ruHZLxhTgErYoV1izCNOSOrQV1t0hjIia+1OwgK64C+QMDKk7K54 6M+jqHbOmQ2xK3DuVvShDubwWAKAmzBj5zb9lJRPzs4AzAV21GdKSdYcwsyOb9AC9AVo 0+aJ+nFedltQ0XsEt+/91jjFBfKXIIqSXgG+big/Dz2caqlggKOmKCwKx9qNhuUcBzNx nO21kk8wXn5kG3e7wzMZqwhvvwboyKw2aPnnZ2Qm/Yf4spjj3ctTjQvyt3lJxE0jvnFA 4Hnu+jbjxSCagfqxW0bALzcMm6V6Y/8yH+Hw+zgSJt1pKzSa9XD9wx/yIwLMg+BVa4QE 0jwQ== 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=3yKw8nYWgrGRxIfcbQDn5ZDr3xh5PgwZScxg3WpCiaM=; b=VX9MkU3kdg/wI8Yf7CPdIvDiB8mwyKxhIvexnWrSG6pDJnzgrMzUxvJM0dLKHDX9I1 Q3LQxheaaqSfq++etf4adikCWTG9g1ee9cKhmB9r+eAmdFKlC52Ly8Rc+ndUSE+hlneS WOwN/sZ1lybm5BYzMigtqEiZG44rkJFSTv5TGuV58x5CjJONyu6RNeiQJ3KELBe/UBJd OUISof4OiY0quBZpOpnGnMU300RT1fXDoL/EDnTwXKRT/Ls+O3J1C2Z6y8PyoVAdMKIE k1oUpfrdaOsN+F+iGcWWrlPnl/Bu6o46ZV/9ppTq5BgQ6YovBeZa7wnYjhIFMGrdlgw2 wrow== 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 gn33si13968508ejc.269.2021.06.01.15.49.26; Tue, 01 Jun 2021 15:49:27 -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 S235034AbhFAWvE (ORCPT + 7 others); Tue, 1 Jun 2021 18:51:04 -0400 Received: from foss.arm.com ([217.140.110.172]:59798 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235080AbhFAWvC (ORCPT ); Tue, 1 Jun 2021 18:51:02 -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 222511042; Tue, 1 Jun 2021 15:49:19 -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 0661B3F719; Tue, 1 Jun 2021 15:49:17 -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 v2 7/8] dt-bindings: firmware: amlogic, scpi: Convert to json schema Date: Tue, 1 Jun 2021 23:49:03 +0100 Message-Id: <20210601224904.917990-8-sudeep.holla@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210601224904.917990-1-sudeep.holla@arm.com> References: <20210601224904.917990-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 | 32 +++++++++++++++++++ 2 files changed, 32 insertions(+), 15 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 b44a5a7040fc..59eea4e0fbed 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: | @@ -62,6 +66,10 @@ description: | oneOf: - const: arm,scpi-sensors - const: arm,scpi-power-domains + - items: + - enum: + - amlogic,meson-gxbb-scpi-sensors + - const: arm,scpi-sensors "^clocks(-[0-9a-f]+)?$": type: object @@ -282,4 +290,28 @@ description: | }; }; + - | + firmware { + scpi { + compatible = "amlogic,meson-gxbb-scpi", "arm,scpi-pre-1.0"; + mboxes = <&mailbox 1 &mailbox 2>; + shmem = <&cpu_scp_lpri &cpu_scp_hpri>; + + clocks { + compatible = "arm,scpi-clocks"; + + scpi_dvfs1: clocks-0 { + compatible = "arm,scpi-dvfs-clocks"; + #clock-cells = <1>; + clock-indices = <0>; + clock-output-names = "vcpu"; + }; + }; + + scpi_sensors1: sensors { + compatible = "amlogic,meson-gxbb-scpi-sensors", "arm,scpi-sensors"; + #thermal-sensor-cells = <1>; + }; + }; + }; ...