From patchwork Fri Sep 20 21:52:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 174169 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3032614ill; Fri, 20 Sep 2019 14:53:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqwvUZxaAavPIa9te7LT0AdoQxgty4wdoMT3Fz4ZtdjS5q6LB3tqKABWS3Zp4Gjk+uebQ0bw X-Received: by 2002:a05:6402:290:: with SMTP id l16mr21922766edv.178.1569016424567; Fri, 20 Sep 2019 14:53:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569016424; cv=none; d=google.com; s=arc-20160816; b=CfSBU7cjSboSFvEOSPu9rIp+6anwYB0sK9cF33BsYFkM0ki2qKB+e0Ch2aPT5WtKTD j45QFD3bCObZRPGKH0xDsXOC45HJgVH2vQDxzOACE0Brx/8SdUVLKiRTza8mkZcP+C+/ GXMuJLKIZ/+7tnPyJYJQ113tnM5dXNdrO9vlf4lExesjiPK5DfUNOIOvrYm9SZjZbu// 9HtVDLJoT+TA+9AuwM+f0frGSFKvNvOfzanaHb0xqTDa1ESBlEHWGB78IO7yHtAQgdIa KpehiUffO/FPqcT1zxU5x4hRRo2Jm1CzoGeYKJcC2SU61M5Kb8NXJxXgBvdMN7matIrx nr/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=EisBycQfg22rkqlbD/WfJdnqHrhEo+fDOE2xHm2q2PU=; b=om+Kr/1l6Y2MWHjOl+FidX13FT+zElrHfYHi5wSuECGMYVYsZ19xHv2B3qXUM0kA9x 3oT9pNrxWh6UO1kuB7uqcbkqkqp9TkRbwVBw9mzoamfHLonm2szh6rAEGs24cqSz/I9B 9N5rYO5EQzw4n6duHrkPCZsRMpE4qwl2tz2/XOGEkx2aN50zshYT12R9ojJqNWEWy/hR DYsklR4Ca9vRrvpaC5ktyf4jmYcQOY5/WA2iFENcwRa35K99mlCOVr/C2MO0s/Q5yO7T tvHvk1LOvwgtGz2ISrhTz+pHHly/IfHjqt+NFLdaQLdez5KR/O1NZ/RPkH7qn3nrY7rp YAyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cgaqhj0g; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 2si1860705ejq.243.2019.09.20.14.53.44; Fri, 20 Sep 2019 14:53:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cgaqhj0g; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-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 S1728688AbfITVw6 (ORCPT + 8 others); Fri, 20 Sep 2019 17:52:58 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:40773 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728803AbfITVw5 (ORCPT ); Fri, 20 Sep 2019 17:52:57 -0400 Received: by mail-pf1-f196.google.com with SMTP id x127so5391351pfb.7 for ; Fri, 20 Sep 2019 14:52:56 -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:in-reply-to:references :in-reply-to:references; bh=EisBycQfg22rkqlbD/WfJdnqHrhEo+fDOE2xHm2q2PU=; b=cgaqhj0gUrKqsx+oAGu8MgcFUf6Io7Cz60RPQmsT0FNbIP/mhtP6lRNvFzCPqbb8Uk EmeLkdbsmqyoV3UBufEATqAvgdNXReHWx9EGzBpF4PtXS+dXW8pulSeUgdxWXBBCDxD3 tQDKQQ0M9M1owHUyZ7L8Siq5LqQGlL7Iaiqbo9G1uxjAJ94HJf7+PHDtSj6/dhq8Tl1s ut1QkejBvaezdJKDQQvnYRsmozS2LVp2xsPTXLC8zQGo24yANgPViXQhSnud+WUyxvYF BPTJpJWLijVr/mAzy/ZIMYrtedDfxYdhjO77n48EutUmaikbyXlED0JxugzYkZiYj3nk X9uA== 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:in-reply-to :references:in-reply-to:references; bh=EisBycQfg22rkqlbD/WfJdnqHrhEo+fDOE2xHm2q2PU=; b=cnddy5ssZFeijUuNJ14Rcfjnmmf0NyosLWIYLq7v2Dq1J5J/fSEbZj8+m2AagGirFC G2ZpG/DsSBUufr3w1l6IaJ2f1eXmfwairdadG+K0iO7ACkXUEGwmKlAK21G0MtG7Xgx0 9X8MMRbMLuzb9YBIe3bFbiZ4L/ErAN8RY8Ou8huiDqzi3VGvo2e2EgnoBPi5ILkajzsq 00ady8nMEJ20y8jT/MPxohkosYf5rj66fwNlgQ5MnX9zsME4MKw86TE+tOvBAreiMyec SFG/9fsfEjW1703EKgfHCAYVoXE5D8raEvBfd2Z19dhiE1KagOlhfWX1x2vGv2X8eplv GZmg== X-Gm-Message-State: APjAAAWCJyMhRfQG6cNYQVS5n9qplnEa8I2G9Vlz11q9BIFT6dhT4cO4 XeZN6kQMg3R6lUmOZKMbIghjxQ== X-Received: by 2002:aa7:8c19:: with SMTP id c25mr19340570pfd.150.1569016375721; Fri, 20 Sep 2019 14:52:55 -0700 (PDT) Received: from localhost (wsip-98-175-107-49.sd.sd.cox.net. [98.175.107.49]) by smtp.gmail.com with ESMTPSA id h4sm2798527pgg.81.2019.09.20.14.52.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Sep 2019 14:52:55 -0700 (PDT) From: Amit Kucheria To: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, edubezval@gmail.com, agross@kernel.org, masneyb@onstation.org, swboyd@chromium.org, Daniel Lezcano , Mark Rutland , Rob Herring , Zhang Rui Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v4 07/15] dt-bindings: thermal: tsens: Convert over to a yaml schema Date: Fri, 20 Sep 2019 14:52:22 -0700 Message-Id: <805a2ae9c95f41dc733ccc80346941998e1b230c.1569015835.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Older IP only supports the 'uplow' interrupt, but newer IP supports 'uplow' and 'critical' interrupts. Document interrupt support in the tsens driver by converting over to a YAML schema. Suggested-by: Stephen Boyd Signed-off-by: Amit Kucheria --- .../bindings/thermal/qcom-tsens.txt | 55 ------ .../bindings/thermal/qcom-tsens.yaml | 168 ++++++++++++++++++ MAINTAINERS | 1 + 3 files changed, 169 insertions(+), 55 deletions(-) delete mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.yaml -- 2.17.1 Reviewed-by: Rob Herring diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt deleted file mode 100644 index 673cc1831ee9..000000000000 --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt +++ /dev/null @@ -1,55 +0,0 @@ -* QCOM SoC Temperature Sensor (TSENS) - -Required properties: -- compatible: - Must be one of the following: - - "qcom,msm8916-tsens" (MSM8916) - - "qcom,msm8974-tsens" (MSM8974) - - "qcom,msm8996-tsens" (MSM8996) - - "qcom,qcs404-tsens", "qcom,tsens-v1" (QCS404) - - "qcom,msm8998-tsens", "qcom,tsens-v2" (MSM8998) - - "qcom,sdm845-tsens", "qcom,tsens-v2" (SDM845) - The generic "qcom,tsens-v2" property must be used as a fallback for any SoC - with version 2 of the TSENS IP. MSM8996 is the only exception because the - generic property did not exist when support was added. - Similarly, the generic "qcom,tsens-v1" property must be used as a fallback for - any SoC with version 1 of the TSENS IP. - -- reg: Address range of the thermal registers. - New platforms containing v2.x.y of the TSENS IP must specify the SROT and TM - register spaces separately, with order being TM before SROT. - See Example 2, below. - -- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description. -- #qcom,sensors: Number of sensors in tsens block -- Refer to Documentation/devicetree/bindings/nvmem/nvmem.txt to know how to specify -nvmem cells - -Example 1 (legacy support before a fallback tsens-v2 property was introduced): -tsens: thermal-sensor@900000 { - compatible = "qcom,msm8916-tsens"; - reg = <0x4a8000 0x2000>; - nvmem-cells = <&tsens_caldata>, <&tsens_calsel>; - nvmem-cell-names = "caldata", "calsel"; - #thermal-sensor-cells = <1>; - }; - -Example 2 (for any platform containing v2 of the TSENS IP): -tsens0: thermal-sensor@c263000 { - compatible = "qcom,sdm845-tsens", "qcom,tsens-v2"; - reg = <0xc263000 0x1ff>, /* TM */ - <0xc222000 0x1ff>; /* SROT */ - #qcom,sensors = <13>; - #thermal-sensor-cells = <1>; - }; - -Example 3 (for any platform containing v1 of the TSENS IP): -tsens: thermal-sensor@4a9000 { - compatible = "qcom,qcs404-tsens", "qcom,tsens-v1"; - reg = <0x004a9000 0x1000>, /* TM */ - <0x004a8000 0x1000>; /* SROT */ - nvmem-cells = <&tsens_caldata>; - nvmem-cell-names = "calib"; - #qcom,sensors = <10>; - #thermal-sensor-cells = <1>; - }; diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml new file mode 100644 index 000000000000..23afc7bf5a44 --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.yaml @@ -0,0 +1,168 @@ +# SPDX-License-Identifier: (GPL-2.0 OR MIT) +# Copyright 2019 Linaro Ltd. +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/thermal/qcom-tsens.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: QCOM SoC Temperature Sensor (TSENS) + +maintainers: + - Amit Kucheria + +description: | + QCOM SoCs have TSENS IP to allow temperature measurement. There are currently + three distinct major versions of the IP that is supported by a single driver. + The IP versions are named v0.1, v1 and v2 in the driver, where v0.1 captures + everything before v1 when there was no versioning information. + +properties: + compatible: + oneOf: + - description: v0.1 of TSENS + items: + - enum: + - qcom,msm8916-tsens + - qcom,msm8974-tsens + - const: qcom,tsens-v0_1 + + - description: v1 of TSENS + items: + - enum: + - qcom,qcs404-tsens + - const: qcom,tsens-v1 + + - description: v2 of TSENS + items: + - enum: + - qcom,msm8996-tsens + - qcom,msm8998-tsens + - qcom,sdm845-tsens + - const: qcom,tsens-v2 + + reg: + maxItems: 2 + items: + - description: TM registers + - description: SROT registers + + nvmem-cells: + minItems: 1 + maxItems: 2 + description: + Reference to an nvmem node for the calibration data + + nvmem-cells-names: + minItems: 1 + maxItems: 2 + items: + - enum: + - caldata + - calsel + + "#qcom,sensors": + allOf: + - $ref: /schemas/types.yaml#/definitions/uint32 + - minimum: 1 + - maximum: 16 + description: + Number of sensors enabled on this platform + + "#thermal-sensor-cells": + const: 1 + description: + Number of cells required to uniquely identify the thermal sensors. Since + we have multiple sensors this is set to 1 + +allOf: + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8916-tsens + - qcom,msm8974-tsens + - qcom,qcs404-tsens + - qcom,tsens-v0_1 + - qcom,tsens-v1 + then: + properties: + interrupts: + items: + - description: Combined interrupt if upper or lower threshold crossed + interrupt-names: + items: + - const: uplow + + else: + properties: + interrupts: + items: + - description: Combined interrupt if upper or lower threshold crossed + - description: Interrupt if critical threshold crossed + interrupt-names: + items: + - const: uplow + - const: critical + +required: + - compatible + - reg + - "#qcom,sensors" + - interrupts + - interrupt-names + - "#thermal-sensor-cells" + +examples: + - | + #include + // Example 1 (legacy: for pre v1 IP): + tsens1: thermal-sensor@900000 { + compatible = "qcom,msm8916-tsens", "qcom,tsens-v0_1"; + reg = <0x4a9000 0x1000>, /* TM */ + <0x4a8000 0x1000>; /* SROT */ + + nvmem-cells = <&tsens_caldata>, <&tsens_calsel>; + nvmem-cell-names = "caldata", "calsel"; + + interrupts = ; + interrupt-names = "uplow"; + + #qcom,sensors = <5>; + #thermal-sensor-cells = <1>; + }; + + - | + #include + // Example 2 (for any platform containing v1 of the TSENS IP): + tsens2: thermal-sensor@4a9000 { + compatible = "qcom,qcs404-tsens", "qcom,tsens-v1"; + reg = <0x004a9000 0x1000>, /* TM */ + <0x004a8000 0x1000>; /* SROT */ + + nvmem-cells = <&tsens_caldata>; + nvmem-cell-names = "calib"; + + interrupts = ; + interrupt-names = "uplow"; + + #qcom,sensors = <10>; + #thermal-sensor-cells = <1>; + }; + + - | + #include + // Example 3 (for any platform containing v2 of the TSENS IP): + tsens3: thermal-sensor@c263000 { + compatible = "qcom,sdm845-tsens", "qcom,tsens-v2"; + reg = <0xc263000 0x1ff>, + <0xc222000 0x1ff>; + + interrupts = , + ; + interrupt-names = "uplow", "critical"; + + #qcom,sensors = <13>; + #thermal-sensor-cells = <1>; + }; +... diff --git a/MAINTAINERS b/MAINTAINERS index e7a47b5210fd..ff757a4a060c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13360,6 +13360,7 @@ L: linux-pm@vger.kernel.org L: linux-arm-msm@vger.kernel.org S: Maintained F: drivers/thermal/qcom/ +F: Documentation/devicetree/bindings/thermal/qcom-tsens.yaml QUALCOMM VENUS VIDEO ACCELERATOR DRIVER M: Stanimir Varbanov