From patchwork Wed Nov 25 15:09:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javi Merino X-Patchwork-Id: 7700031 X-Patchwork-Delegate: eduardo.valentin@ti.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D968ABF90C for ; Wed, 25 Nov 2015 15:12:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BDF2B2089B for ; Wed, 25 Nov 2015 15:12:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E2B1A2088D for ; Wed, 25 Nov 2015 15:12:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753153AbbKYPKj (ORCPT ); Wed, 25 Nov 2015 10:10:39 -0500 Received: from foss.arm.com ([217.140.101.70]:40284 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753128AbbKYPKg (ORCPT ); Wed, 25 Nov 2015 10:10:36 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5FB8F49; Wed, 25 Nov 2015 07:10:18 -0800 (PST) Received: from e104805-lin.cambridge.arm.com (e104805-lin.cambridge.arm.com [10.1.205.32]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 163DC3F2E5; Wed, 25 Nov 2015 07:10:33 -0800 (PST) From: Javi Merino To: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, rui.zang@intel.com, edubezval@gmail.com, Javi Merino , Zhang Rui , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , devicetree@vger.kernel.org Subject: [PATCH v3 2/4] devicetree: bindings: let thermal-sensor point to other thermal zones Date: Wed, 25 Nov 2015 15:09:44 +0000 Message-Id: <1448464186-26289-3-git-send-email-javi.merino@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448464186-26289-1-git-send-email-javi.merino@arm.com> References: <1448464186-26289-1-git-send-email-javi.merino@arm.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The thermal-sensor property of the thermal zone node accepts phandles to thermal sensors. However, thermal zones can be created as an aggregation of other thermal zones. Extend the thermal-sensors property to allow phandles to other thermal zones. This patch also adds an example that showcases how a board thermal zone can be created from the aggregation of the cpu, gpu and lcd thermal zones. Cc: Zhang Rui Cc: Eduardo Valentin Cc: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala Cc: devicetree@vger.kernel.org Signed-off-by: Javi Merino --- Notes: Hi devicetree, Is it ok to extend the definition of the thermal-sensors property like this? IOW are phandles strongly typed? .../devicetree/bindings/thermal/thermal.txt | 154 ++++++++++++++++++++- 1 file changed, 151 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt index 41b817f7b670..52b7e9ae3b4d 100644 --- a/Documentation/devicetree/bindings/thermal/thermal.txt +++ b/Documentation/devicetree/bindings/thermal/thermal.txt @@ -145,9 +145,12 @@ Required properties: Size: one cell - thermal-sensors: A list of thermal sensor phandles and sensor specifier - Type: list of used while monitoring the thermal zone. - phandles + sensor - specifier + Type: list of used while monitoring the thermal zone. The phandles + phandles + sensor can point to thermal sensors or other thermal zone + specifier nodes. If it points to other thermal zone + nodes you should omit the sensor specifier + and set #thermal-sensor-cells to 0 for the + thermal zone. - trips: A sub-node which is a container of only trip point nodes Type: sub-node required to describe the thermal zone. @@ -603,3 +606,148 @@ thermal-zones { The above example is a mix of previous examples, a sensor IP with several internal sensors used to monitor different zones, one of them is composed by several sensors and with different cooling devices. + +(e) Board thermal with stacked thermal zones + +Instead of setting up one thermal zone combining multiple thermal +zones and multiple trip points for each cooling device, we can create +a hierarchy of thermal zones. + +#include + +&i2c1 { + ... + /* + * An IC with several temperature sensor. + */ + adc_dummy: sensor@0x50 { + ... + #thermal-sensor-cells = <1>; /* sensor internal ID */ + }; +}; + +thermal-zones { + + cpu_thermal: cpu_thermal { + polling-delay-passive = <1000>; /* milliseconds */ + polling-delay = <2500>; /* milliseconds */ + + sustainable-power = <2500>; + + thermal-sensors = <&adc_dummy 0> + + trips { + cpu_trip: cpu-trip { + temperature = <60000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "passive"; + }; + }; + + cooling-maps { + map0 { + trip = <&cpu_trip>; + cooling-device = <&cpu0 0 2>; + }; + }; + }; + + gpu_thermal: gpu_thermal { + polling-delay-passive = <1000>; /* milliseconds */ + polling-delay = <2500>; /* milliseconds */ + + sustainable-power = <2500>; + + thermal-sensors = <&adc_dummy 2> + + trips { + gpu_trip: gpu-trip { + temperature = <55000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "passive"; + } + }; + + cooling-maps { + map0 { + trip = <&gpu_trip>; + cooling-device = <&gpu0 0 2>; + }; + }; + }; + + lcd_thermal: lcd_thermal { + polling-delay-passive = <1000>; /* milliseconds */ + polling-delay = <2500>; /* milliseconds */ + + sustainable-power = <2500>; + + thermal-sensors = <&adc_dummy 1> + + trips { + lcd_trip: lcp-trip { + temperature = <53000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "passive"; + }; + }; + + cooling-maps { + map0 { + trip = <&lcd_trip>; + cooling-device = <&lcd0 5 10>; + }; + }; + }; + + board_thermal: board-thermal { + polling-delay-passive = <1000>; /* milliseconds */ + polling-delay = <2500>; /* milliseconds */ + + thermal-sensors = <&cpu_thermal &gpu_thermal &lcd_thermal> + + sustainable-power = <2500>; + + trips { + warm_trip: warm-trip { + temperature = <62000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "passive"; + }; + crit_trip: crit-trip { + temperature = <68000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&warm_trip>; + cooling-device = <&cpu0 2 2>; + contribution = <55>; + }; + map1 { + trip = <&warm_trip>; + cooling-device = <&gpu0 2 2>; + contribution = <20>; + }; + map2 { + trip = <&lcd_trip>; + cooling-device = <&lcd0 7 10>; + contribution = <15>; + }; + }; + }; +}; + +The above example is a different take at example (d). We create one +thermal zone per sensor: cpu_thermal, gpu_thermal and lcd_thermal. +Each of which has its own trip point for each own cooling device. We +then define a board_thermal thermal zone that is a combination of all +the other thermal zones. If the board hits its warm_trip, then all +cooling devices are throttled. + +This example illustrates how we can throttle each device individually +if its too hot and at the same time have some control over the whole +system.