From patchwork Wed Aug 28 08:59:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 172352 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp453676ily; Wed, 28 Aug 2019 02:00:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqxu62JZCb7iB1RWhfvrndhnWp8nucg5FerfliccvT+yovF5zx4r1xZhUdXvlPLpboVambtZ X-Received: by 2002:aa7:9688:: with SMTP id f8mr3266171pfk.77.1566982808856; Wed, 28 Aug 2019 02:00:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566982808; cv=none; d=google.com; s=arc-20160816; b=Y2iUGTPoo47/H72h3kbQ4f51SUmq2sLRUYk8pY3NgxcM+27WNSNyiYkKFoq2TFqs+W 6VoJ7ZLBjJzluzDN6UtWUHlIepr4kZgj2STQDdjKc7fK23lpA6oB+jYsJucB7Plf0Qr1 wD/qyORsV7sn75kCKj5uLCR4adNBUGrJL8jAGL009z654YPEh1RiU6tmZg6kg8NhAVl+ R97dw2pB4R2Satc1ZaqtUvrw7ILAf8h5P7zi0TageoEYBZ9FqXU1IYm8P6aY0xf8keJk fQDrlRP2N2kNj6nLI+/8iobrcWwMqKseoRF1cEb+GZN4vmzyNScWlQd+0whOvMojmA/g AnCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=o6/WQ8OyBRP6X3I/ZtBD+hIUAEwLu2Ivn3M2czCngrU=; b=UbPHVCZJdFGhDvOswYstUShaOW8ebw2VEgnJlBxU4mrz1Y7+5QM+svxYc4SHJoQ1sF OKzhcqcrH4BDd3B2T9AycEypEy/Esx97jD8M/887tT4eFIIdMZNwcTzIttdDbbUVOSeD 2oSxBr/0/lcAmsNm0qgdMAWpZP2cpIgjDm1Ko3f1SpYARfqJ1Tam2A+ZiY+B1yISyaCU YbVx1YV9Oj3W0AM3EBJLvRAl2gF5yJaMdfLegV67ksWM3dXTUsZecc4YXtXOJNC02+gD 9TMbBdy2ET+sKz1f31dWwvFZRR30wswBmIYEbCZO3ZziNo4LspDV+j1zTlIO5Qm7UD+m yR3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jOhJ+LW0; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 q15si1434106pls.184.2019.08.28.02.00.08; Wed, 28 Aug 2019 02:00:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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=jOhJ+LW0; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1726259AbfH1JAI (ORCPT + 11 others); Wed, 28 Aug 2019 05:00:08 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:40256 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726272AbfH1JAH (ORCPT ); Wed, 28 Aug 2019 05:00:07 -0400 Received: by mail-lf1-f66.google.com with SMTP id u29so1467773lfk.7 for ; Wed, 28 Aug 2019 02:00: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=o6/WQ8OyBRP6X3I/ZtBD+hIUAEwLu2Ivn3M2czCngrU=; b=jOhJ+LW0AlXZCOi9+dlW1A5t220ThekSlY01z/TTaOIxpGotcmjjpX0zpGTnZ7488v wnMKLjfFAkdSXvEyo2nqQDI+hU/yvHDAvZQStY8dCqzv3K3zt+HVtA5+FMU0MQ57VEg2 dGrSmJaQf1KkvHB3OyZcHIjMwcm0uOEn95ipPyRuD0H5xGCK79t+q7aLSCAuwBv09UpB zpZobkbRpEyAtzx9zHvJAjpAJe1zUeRgeNLFAJHcRkJhySpXm+zn+v+shhVNJvNXsJjk N4Tu4o/9ok5rc1IqNtwPognHXXmQ8wnehAgzKG1Y1kYIyDcEb1bHX8wyL/3hxGw80cEz bErQ== 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=o6/WQ8OyBRP6X3I/ZtBD+hIUAEwLu2Ivn3M2czCngrU=; b=cYwMJr1YoPgtEtzZ0fCPntkW/RqKV4b5lznenN3xRD5g7d8gxKrUKy/tKiOzbARNU3 Nv2cHCB70BjdCucatM7LJ4vwTj5ErbN29IgEtkxPvh3TZh73dU+T7aZ/zoYVWE6p3ECf 25vvEqOowktf2k1ItKcFGT8g8AcX1I17vUViTTr94lyQcaF0J0M88tttejQF+iUsjHvy N9EU9HSwVxPh5sYhxROe7pnudejrYQqB58qYM2lsMQeUeO47D4QyplPCmx61nOo7z2Ob zbdmd2VpXXGznMWQEyHjAOUZD15+pi4zC+TsipHoztjxkxLQ1IcBavCiDN8T7+5im1BS 2mXw== X-Gm-Message-State: APjAAAVzPQX3ZRwIvel5Cj7MkWeyu/gS+B4VXvTPfjY9JZ22xsvKE7Kp 4/Vx7G+Tqwp0+qD3FHyF8ZUEgwZVj+4= X-Received: by 2002:a19:8017:: with SMTP id b23mr1853821lfd.132.1566982804638; Wed, 28 Aug 2019 02:00:04 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id c23sm449653ljf.105.2019.08.28.02.00.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 02:00:03 -0700 (PDT) From: Linus Walleij To: Zhang Rui , Eduardo Valentin , Daniel Lezcano Cc: linux-pm@vger.kernel.org, Linus Walleij , Vincent Guittot , Lee Jones Subject: [PATCH 1/3 v2] thermal: db8500: Finalize device tree conversion Date: Wed, 28 Aug 2019 10:59:57 +0200 Message-Id: <20190828085959.11510-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org At some point there was an attempt to convert the DB8500 thermal sensor to device tree: a probe path was added and the device tree was augmented for the Snowball board. The switchover was never completed: instead the thermal devices came from from the PRCMU MFD device and the probe on the Snowball was confused as another set of configuration appeared from the device tree. Move over to a device-tree only approach, as we fixed up the device trees. Cc: Vincent Guittot Acked-by: Lee Jones Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - No change, resending with the rest of the patches --- drivers/mfd/db8500-prcmu.c | 53 +------------------- drivers/thermal/Kconfig | 2 +- drivers/thermal/db8500_thermal.c | 30 +++++------ include/linux/platform_data/db8500_thermal.h | 29 ----------- 4 files changed, 17 insertions(+), 97 deletions(-) delete mode 100644 include/linux/platform_data/db8500_thermal.h -- 2.21.0 Reviewed-by: Daniel Lezcano diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index 3f21e26b8d36..a1e09bf06977 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -36,7 +36,6 @@ #include #include #include -#include #include "dbx500-prcmu-regs.h" /* Index of different voltages to be used when accessing AVSData */ @@ -2982,53 +2981,6 @@ static struct ux500_wdt_data db8500_wdt_pdata = { .timeout = 600, /* 10 minutes */ .has_28_bits_resolution = true, }; -/* - * Thermal Sensor - */ - -static struct resource db8500_thsens_resources[] = { - { - .name = "IRQ_HOTMON_LOW", - .start = IRQ_PRCMU_HOTMON_LOW, - .end = IRQ_PRCMU_HOTMON_LOW, - .flags = IORESOURCE_IRQ, - }, - { - .name = "IRQ_HOTMON_HIGH", - .start = IRQ_PRCMU_HOTMON_HIGH, - .end = IRQ_PRCMU_HOTMON_HIGH, - .flags = IORESOURCE_IRQ, - }, -}; - -static struct db8500_thsens_platform_data db8500_thsens_data = { - .trip_points[0] = { - .temp = 70000, - .type = THERMAL_TRIP_ACTIVE, - .cdev_name = { - [0] = "thermal-cpufreq-0", - }, - }, - .trip_points[1] = { - .temp = 75000, - .type = THERMAL_TRIP_ACTIVE, - .cdev_name = { - [0] = "thermal-cpufreq-0", - }, - }, - .trip_points[2] = { - .temp = 80000, - .type = THERMAL_TRIP_ACTIVE, - .cdev_name = { - [0] = "thermal-cpufreq-0", - }, - }, - .trip_points[3] = { - .temp = 85000, - .type = THERMAL_TRIP_CRITICAL, - }, - .num_trips = 4, -}; static const struct mfd_cell common_prcmu_devs[] = { { @@ -3052,10 +3004,7 @@ static const struct mfd_cell db8500_prcmu_devs[] = { }, { .name = "db8500-thermal", - .num_resources = ARRAY_SIZE(db8500_thsens_resources), - .resources = db8500_thsens_resources, - .platform_data = &db8500_thsens_data, - .pdata_size = sizeof(db8500_thsens_data), + .of_compatible = "stericsson,db8500-thermal", }, }; diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index 9966364a6deb..001a21abcc28 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -310,7 +310,7 @@ config DOVE_THERMAL config DB8500_THERMAL tristate "DB8500 thermal management" - depends on MFD_DB8500_PRCMU + depends on MFD_DB8500_PRCMU && OF default y help Adds DB8500 thermal management implementation according to the thermal diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c index b71a999d17d6..d650ae5fdf2a 100644 --- a/drivers/thermal/db8500_thermal.c +++ b/drivers/thermal/db8500_thermal.c @@ -13,13 +13,24 @@ #include #include #include -#include #include #include #include #define PRCMU_DEFAULT_MEASURE_TIME 0xFFF #define PRCMU_DEFAULT_LOW_TEMP 0 +#define COOLING_DEV_MAX 8 + +struct db8500_trip_point { + unsigned long temp; + enum thermal_trip_type type; + char cdev_name[COOLING_DEV_MAX][THERMAL_NAME_LENGTH]; +}; + +struct db8500_thsens_platform_data { + struct db8500_trip_point trip_points[THERMAL_MAX_TRIPS]; + int num_trips; +}; struct db8500_thermal_zone { struct thermal_zone_device *therm_dev; @@ -301,7 +312,6 @@ static void db8500_thermal_work(struct work_struct *work) dev_dbg(&pzone->therm_dev->device, "thermal work finished.\n"); } -#ifdef CONFIG_OF static struct db8500_thsens_platform_data* db8500_thermal_parse_dt(struct platform_device *pdev) { @@ -370,13 +380,6 @@ static struct db8500_thsens_platform_data* dev_err(&pdev->dev, "Parsing device tree data error.\n"); return NULL; } -#else -static inline struct db8500_thsens_platform_data* - db8500_thermal_parse_dt(struct platform_device *pdev) -{ - return NULL; -} -#endif static int db8500_thermal_probe(struct platform_device *pdev) { @@ -386,11 +389,10 @@ static int db8500_thermal_probe(struct platform_device *pdev) int low_irq, high_irq, ret = 0; unsigned long dft_low, dft_high; - if (np) - ptrips = db8500_thermal_parse_dt(pdev); - else - ptrips = dev_get_platdata(&pdev->dev); + if (!np) + return -EINVAL; + ptrips = db8500_thermal_parse_dt(pdev); if (!ptrips) return -EINVAL; @@ -498,13 +500,11 @@ static int db8500_thermal_resume(struct platform_device *pdev) return 0; } -#ifdef CONFIG_OF static const struct of_device_id db8500_thermal_match[] = { { .compatible = "stericsson,db8500-thermal" }, {}, }; MODULE_DEVICE_TABLE(of, db8500_thermal_match); -#endif static struct platform_driver db8500_thermal_driver = { .driver = { diff --git a/include/linux/platform_data/db8500_thermal.h b/include/linux/platform_data/db8500_thermal.h deleted file mode 100644 index 55e55750a165..000000000000 --- a/include/linux/platform_data/db8500_thermal.h +++ /dev/null @@ -1,29 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * db8500_thermal.h - DB8500 Thermal Management Implementation - * - * Copyright (C) 2012 ST-Ericsson - * Copyright (C) 2012 Linaro Ltd. - * - * Author: Hongbo Zhang - */ - -#ifndef _DB8500_THERMAL_H_ -#define _DB8500_THERMAL_H_ - -#include - -#define COOLING_DEV_MAX 8 - -struct db8500_trip_point { - unsigned long temp; - enum thermal_trip_type type; - char cdev_name[COOLING_DEV_MAX][THERMAL_NAME_LENGTH]; -}; - -struct db8500_thsens_platform_data { - struct db8500_trip_point trip_points[THERMAL_MAX_TRIPS]; - int num_trips; -}; - -#endif /* _DB8500_THERMAL_H_ */ From patchwork Wed Aug 28 08:59:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 172353 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp453710ily; Wed, 28 Aug 2019 02:00:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqyaB9/pKZ/S2QxfpfFIcwS/I9TMDtB6mvn1iG45wmj63kRYZ06xTKF1Z/2XTXIV2Shu6YG6 X-Received: by 2002:a62:8688:: with SMTP id x130mr3543202pfd.162.1566982811068; Wed, 28 Aug 2019 02:00:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566982811; cv=none; d=google.com; s=arc-20160816; b=A14RmFaf4aVQf1BltNN5cXYJ2UFLmltKhd0lbkndR2d8BIFIRn6t+HyTw8u60JmSFK +bp1yyguBSAoh0KxvpuC6ZFTSXFjazadbtQHZY4KqFLla7WhLrJcF1gjXA8z4lHfkT2/ 5yQvm+Srlc3tJ2FHWZAILBjd1KVQ+yx9qTgImkyQ9hDnFJ+BhgNLQW78thJ1oPVTLBIN pDcOIVXPs/Xnsj0Gnk7+I1gyy0fbXuDRxlQ9g/0q5mKrC9/bzCng+9z0CCr9MyOzTM38 jCInZ9Hbf35kpV2AvPVeQkdZ5YAW3tRaUEKTNkSCZgUrLr3eda1LhDQAorNvdtZQRtcg P2/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=kVhz1OO0ZxhBZubMddXQ3Emt8VJvFbqDjLyJ6vpWrIk=; b=lYJd5/7VFrceCC264cIOwdcKMFI0mR6NVx0ThBdKB5CSfRjW5i3+xvsmlH7g/fFlCJ YNlCUrSlpzMnuHGd4Pb6Z3o6fVAXX+u4iS8M4A8CUMUqVJDR+Mg6XzthS+ZaF07sKAJT UIgaFpM8e44Q2cNlhcdHRJZW9N0ppPyVhXZGTqjscaI6aaWRoUPs24nVhCADeM4fYY3t 8DF1gQaoYvnSYw/ckHLiqA3G9lWvLsRcG4WDXjObxnf+bR7lj6hsyowyeKjEi4e5CQHK 9J3FvQgwZQjhbqGAtSBOHdodQzJdh0R06Jq2ZQbxJ28Rg9wjtRjfjqBOBeveRHnD9duD R+yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="mrE67/FA"; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 q15si1434106pls.184.2019.08.28.02.00.10; Wed, 28 Aug 2019 02:00:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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="mrE67/FA"; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1726368AbfH1JAK (ORCPT + 11 others); Wed, 28 Aug 2019 05:00:10 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:46240 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726272AbfH1JAK (ORCPT ); Wed, 28 Aug 2019 05:00:10 -0400 Received: by mail-lf1-f65.google.com with SMTP id n19so1440287lfe.13 for ; Wed, 28 Aug 2019 02:00:08 -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 :mime-version:content-transfer-encoding; bh=kVhz1OO0ZxhBZubMddXQ3Emt8VJvFbqDjLyJ6vpWrIk=; b=mrE67/FATNYTkbwcyvOftkVNn3ekurlAE7PcNkTdGSxnIKJGmd5expXHgSP26S1Uji jGOMyBAFVge4mBggchTNvfHVV1DCAgTVxuy6IFmSWlBOvLNNVtyPrb9CLvjEmYKQ9W1e RxQ5ZCr/6V9DxgNqi4A3Q2lhSeck7hYL0EIj9Iyz3L9t8U74SmzyxJ9ga5FFCfEEheT+ Nh6KHmW9BTTr5OD/IS+8brdfNNWQh8QFr2A2E1Te48GiaiP2VJsuzXi0PYXGGFeyiCRq tho0LDtXnTayP40aOs76mHj/hNYMXIe4gjcQpwlZFq9mmqvAJLiOO/O4ACRwqLbX7/L+ ufwg== 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:mime-version:content-transfer-encoding; bh=kVhz1OO0ZxhBZubMddXQ3Emt8VJvFbqDjLyJ6vpWrIk=; b=k3AMmFHZk1+FC0wr70c53mInfXkLPsfxLFoHr4qzS1wevxOLWwYmm6q9OpxMvgN4/Q D7XMI1oUoctKSi0DLL1jTHhB7w6wALNDsF/ascIT54NoQNMD72RNgEzLUTnKMzQnjmf3 dz0Fwv1rT4QoOKw/Xux7DSucAVm2BlVERUZHF2YKFAkaH+9lfyl5lu7YLj9vdfZf6eMi IQOZ7d70Jq56FowJRJaBlesEuisAAi/RARxBQRLbwv/IEFfcH7Yfhb61w+DWSE7IUK1b tm68SGUg6Ki73saWeMmWvDpTFPvAGfvlTBJQk5mnFjRmMxfl8cKivL6sG/ZNFwHrPds3 b3gg== X-Gm-Message-State: APjAAAX1KvbM0n5reXsP0SYMJRJASQ9RGyLVXP712W1NDk8LY8n2sr1d c9uzD4H/f+YwgKNSv3+L51r8dPtBk3U= X-Received: by 2002:a19:bed4:: with SMTP id o203mr1844927lff.110.1566982807463; Wed, 28 Aug 2019 02:00:07 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id c23sm449653ljf.105.2019.08.28.02.00.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 02:00:06 -0700 (PDT) From: Linus Walleij To: Zhang Rui , Eduardo Valentin , Daniel Lezcano Cc: linux-pm@vger.kernel.org, Linus Walleij , Vincent Guittot Subject: [PATCH 2/3 v2] thermal: db8500: Use dev helper variable Date: Wed, 28 Aug 2019 10:59:58 +0200 Message-Id: <20190828085959.11510-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190828085959.11510-1-linus.walleij@linaro.org> References: <20190828085959.11510-1-linus.walleij@linaro.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The code gets easier to read like this. Cc: Vincent Guittot Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - No change, resending with the rest of the patches --- drivers/thermal/db8500_thermal.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) -- 2.21.0 Reviewed-by: Daniel Lezcano diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c index d650ae5fdf2a..d250bcf3c10c 100644 --- a/drivers/thermal/db8500_thermal.c +++ b/drivers/thermal/db8500_thermal.c @@ -313,16 +313,16 @@ static void db8500_thermal_work(struct work_struct *work) } static struct db8500_thsens_platform_data* - db8500_thermal_parse_dt(struct platform_device *pdev) + db8500_thermal_parse_dt(struct device *dev) { struct db8500_thsens_platform_data *ptrips; - struct device_node *np = pdev->dev.of_node; + struct device_node *np = dev->of_node; char prop_name[32]; const char *tmp_str; u32 tmp_data; int i, j; - ptrips = devm_kzalloc(&pdev->dev, sizeof(*ptrips), GFP_KERNEL); + ptrips = devm_kzalloc(dev, sizeof(*ptrips), GFP_KERNEL); if (!ptrips) return NULL; @@ -377,7 +377,7 @@ static struct db8500_thsens_platform_data* return ptrips; err_parse_dt: - dev_err(&pdev->dev, "Parsing device tree data error.\n"); + dev_err(dev, "Parsing device tree data error.\n"); return NULL; } @@ -385,18 +385,19 @@ static int db8500_thermal_probe(struct platform_device *pdev) { struct db8500_thermal_zone *pzone = NULL; struct db8500_thsens_platform_data *ptrips = NULL; - struct device_node *np = pdev->dev.of_node; + struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; int low_irq, high_irq, ret = 0; unsigned long dft_low, dft_high; if (!np) return -EINVAL; - ptrips = db8500_thermal_parse_dt(pdev); + ptrips = db8500_thermal_parse_dt(dev); if (!ptrips) return -EINVAL; - pzone = devm_kzalloc(&pdev->dev, sizeof(*pzone), GFP_KERNEL); + pzone = devm_kzalloc(dev, sizeof(*pzone), GFP_KERNEL); if (!pzone) return -ENOMEM; @@ -410,31 +411,31 @@ static int db8500_thermal_probe(struct platform_device *pdev) low_irq = platform_get_irq_byname(pdev, "IRQ_HOTMON_LOW"); if (low_irq < 0) { - dev_err(&pdev->dev, "Get IRQ_HOTMON_LOW failed.\n"); + dev_err(dev, "Get IRQ_HOTMON_LOW failed.\n"); ret = low_irq; goto out_unlock; } - ret = devm_request_threaded_irq(&pdev->dev, low_irq, NULL, + ret = devm_request_threaded_irq(dev, low_irq, NULL, prcmu_low_irq_handler, IRQF_NO_SUSPEND | IRQF_ONESHOT, "dbx500_temp_low", pzone); if (ret < 0) { - dev_err(&pdev->dev, "Failed to allocate temp low irq.\n"); + dev_err(dev, "Failed to allocate temp low irq.\n"); goto out_unlock; } high_irq = platform_get_irq_byname(pdev, "IRQ_HOTMON_HIGH"); if (high_irq < 0) { - dev_err(&pdev->dev, "Get IRQ_HOTMON_HIGH failed.\n"); + dev_err(dev, "Get IRQ_HOTMON_HIGH failed.\n"); ret = high_irq; goto out_unlock; } - ret = devm_request_threaded_irq(&pdev->dev, high_irq, NULL, + ret = devm_request_threaded_irq(dev, high_irq, NULL, prcmu_high_irq_handler, IRQF_NO_SUSPEND | IRQF_ONESHOT, "dbx500_temp_high", pzone); if (ret < 0) { - dev_err(&pdev->dev, "Failed to allocate temp high irq.\n"); + dev_err(dev, "Failed to allocate temp high irq.\n"); goto out_unlock; } @@ -442,11 +443,11 @@ static int db8500_thermal_probe(struct platform_device *pdev) ptrips->num_trips, 0, pzone, &thdev_ops, NULL, 0, 0); if (IS_ERR(pzone->therm_dev)) { - dev_err(&pdev->dev, "Register thermal zone device failed.\n"); + dev_err(dev, "Register thermal zone device failed.\n"); ret = PTR_ERR(pzone->therm_dev); goto out_unlock; } - dev_info(&pdev->dev, "Thermal zone device registered.\n"); + dev_info(dev, "Thermal zone device registered.\n"); dft_low = PRCMU_DEFAULT_LOW_TEMP; dft_high = ptrips->trip_points[0].temp; From patchwork Wed Aug 28 08:59:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 172354 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp453781ily; Wed, 28 Aug 2019 02:00:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqzWcds1Z4Xb5SE+kaVSXb9ErpM/GY0dtSSdlSYPZcT67vbKB3p8UsWSiaPLPn1CcgG2NXWt X-Received: by 2002:a17:902:547:: with SMTP id 65mr3189861plf.131.1566982814037; Wed, 28 Aug 2019 02:00:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566982814; cv=none; d=google.com; s=arc-20160816; b=jTlPwR9ZIFRCxSo9eScTgD4SzqLweNPk5kL6Egvq6oSeNVxVYNUrx2DyLy83O9cAaV CnGA0+/XoLWy0MfedGyY/6/WGcl6/0OEiPQWN1oDh2Dzlglsi5jb7x/XkvMcOzDMhKhS cl9BHzqdA2MzGoWh+jHi3YAKg7uOON9RP7hAFUT6qMWRRscqt4WXS5Fgt09W7LC32z9h VTx/GWc6k5argyRGbgMZq3SqnTX/VsGD9iYpYB+2DWxtprDaau0fx33yW2XWJ6sj8d7e URDD63PbhNWxrtejT2JXe9mzJnsdxiGf/e5zstAd7ZHwKNz8A37MjJYiT6VNRetKNJoq VONA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IgJWDY6ryus9aZzZeWqmBuLOeymTgddlOD8ElVLWR0k=; b=r5xgotDOZ1OeGC6t6JTMNIMkV25lY5D0HZfyI/1r01vCw62WvYo5KvZKVa2S9R5S3l +KqiLIygH8fX4udP6u3W/7Ho2OvoMH2sVQ5lbPEFKmd513Ti9ep4A/pIePa++mDp/xBM O2SnKwrSK7O3uIl6WTEyCjPKPVg2d5RQ0+vFlEm2qi+Bn89N2fV6Cz0sGycQuWx8nJ6j 1irGpHG8EfaPxlr6Vkh0xtDlE7V90hVHEMtKorkglIKl9LJxPI2X0k7T+mLJIkLW5lAZ zpZlQfbYTIhyDuhUmuE9/mVY6SuR0neMhhPWgc7cD9BJCFKkhG3MmIxKlTVCw/l2q6kA WDaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eUy90Df6; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 q15si1434106pls.184.2019.08.28.02.00.13; Wed, 28 Aug 2019 02:00:14 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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=eUy90Df6; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1726370AbfH1JAN (ORCPT + 11 others); Wed, 28 Aug 2019 05:00:13 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:40267 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726272AbfH1JAN (ORCPT ); Wed, 28 Aug 2019 05:00:13 -0400 Received: by mail-lf1-f66.google.com with SMTP id u29so1468050lfk.7 for ; Wed, 28 Aug 2019 02:00:10 -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 :mime-version:content-transfer-encoding; bh=IgJWDY6ryus9aZzZeWqmBuLOeymTgddlOD8ElVLWR0k=; b=eUy90Df6hqbyayAXXQyo/PvWZymucYdUrG628F9TG/cHdI7u+x7ZRZmyQnfA7voWWs QhbnEgWItFTEHAz1w06aITtpPn9xlENUxWNr3Fr839F0VQAOH7yb38VvHJUuQScJL7p8 cKbGawAwtVGj2SmVAo3kNa/phQ3SkDuy4Eu7ktP1vd74VhD91j5GcI6ZQMwPZYA/lm/C bd34y8IouozztPIEVHZEP7E7UkrRJg4LcrAedlzaL5G/x0fc13fp93BNlsGEAnWiYMKe noGwGBxjUaiZXJ1HlGXq7eBGZBB9eQK3mvKq6iXYiPEwxfjJ4clFThnuk7aXZIIVqpfB pgOA== 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:mime-version:content-transfer-encoding; bh=IgJWDY6ryus9aZzZeWqmBuLOeymTgddlOD8ElVLWR0k=; b=VoRK0j6rwtGe0b0MnCVKvXdApMP9waIbkvQxuPZfjBueLneUdhHRwO5IBobKFmJI+M RMSfW1B0sMiWxDFuEXTm9iin0j7hTbORewhpuQFt02Tqou3uNTx76AyL/4Nt/Q5hlig9 ZNTkGG9zkiarW3fZtGNZ2PbEXedKEXy8MrgZ3rsJGWFn1oxBINiFPO7bF+Z/PJnnvDwc E9tSveAwqloMoSpXP1797aiREF4rPTzBQFvoXd1qTYwe+gCF815nscesWb+xNs59na32 Rw8Uzw+OLUYaAeE/NXXDw/7eVkyKM4rSazqXW6Q9icIW57EFC6O6Gtkwge01GKYajYh3 Gtyw== X-Gm-Message-State: APjAAAUOFoILggqoH76ClOiIS9GUEEGNOZoE07s8JZXP0kedHD4z0kcg 0fThvAgn9YxkNxdfTtUhO3o9vA== X-Received: by 2002:ac2:5c11:: with SMTP id r17mr1032127lfp.61.1566982809830; Wed, 28 Aug 2019 02:00:09 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id c23sm449653ljf.105.2019.08.28.02.00.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 02:00:08 -0700 (PDT) From: Linus Walleij To: Zhang Rui , Eduardo Valentin , Daniel Lezcano Cc: linux-pm@vger.kernel.org, Linus Walleij , Vincent Guittot Subject: [PATCH 3/3 v2] thermal: db8500: Rewrite to be a pure OF sensor Date: Wed, 28 Aug 2019 10:59:59 +0200 Message-Id: <20190828085959.11510-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190828085959.11510-1-linus.walleij@linaro.org> References: <20190828085959.11510-1-linus.walleij@linaro.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org This patch rewrites the DB8500 thermal sensor to be a pure OF sensor, so that it can be used with thermal zones defined in the device tree. This driver was initially merged before we had generic thermal zone device tree bindings, and now it gets modernized to the way we do things these days. The old driver depended on a set of trigger points provided in the device tree or platform data to interpolate the current temperature between trigger points depending on whether the trend was rising or falling. This was bad because the trigger points should be used for defining temperature zone policies and bind to cooling devices. As the PRCMU (power reset control management unit) can only issue IRQs when we pass temperature trigger points upward or downward We instead define a number of temperature points inside the driver ranging from 15 to 100 degrees celsius. The effect is that when we register the device we quickly trigger 15, 20 ... up to the room temperature in succession and then we get continous event IRQs also under normal operating conditions, and the temperature of the system is now reported more accurately (+/- 2.5 degrees celsius) while in the past the first trigger point was at 70 degrees and the average temperature was simply reported as 35 degrees celsius (between 70 degrees and 0) until we passed 70 degrees which didn't accurately represent the temperature of the system. As a result of dropping all the trigger points from the driver and reusing the core DT thermal zone management code we reduce the code footprint quite a bit. Cc: Vincent Guittot Suggested-by: Daniel Lezcano Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - New patch as suggested by Daniel. --- drivers/thermal/db8500_thermal.c | 467 +++++++++---------------------- 1 file changed, 130 insertions(+), 337 deletions(-) -- 2.21.0 diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c index d250bcf3c10c..2c232adcdd5e 100644 --- a/drivers/thermal/db8500_thermal.c +++ b/drivers/thermal/db8500_thermal.c @@ -3,9 +3,9 @@ * db8500_thermal.c - DB8500 Thermal Management Implementation * * Copyright (C) 2012 ST-Ericsson - * Copyright (C) 2012 Linaro Ltd. + * Copyright (C) 2012-2019 Linaro Ltd. * - * Author: Hongbo Zhang + * Authors: Hongbo Zhang, Linus Walleij */ #include @@ -19,458 +19,254 @@ #define PRCMU_DEFAULT_MEASURE_TIME 0xFFF #define PRCMU_DEFAULT_LOW_TEMP 0 -#define COOLING_DEV_MAX 8 -struct db8500_trip_point { - unsigned long temp; - enum thermal_trip_type type; - char cdev_name[COOLING_DEV_MAX][THERMAL_NAME_LENGTH]; -}; - -struct db8500_thsens_platform_data { - struct db8500_trip_point trip_points[THERMAL_MAX_TRIPS]; - int num_trips; +/** + * db8500_thermal_points - the interpolation points that trigger + * interrupts + */ +static const unsigned long db8500_thermal_points[] = { + 15000, + 20000, + 25000, + 30000, + 35000, + 40000, + 45000, + 50000, + 55000, + 60000, + 65000, + 70000, + 75000, + 80000, + /* + * This is where things start to get really bad for the + * SoC and the thermal zones should be set up to trigger + * critical temperature at 85000 mC so we don't get above + * this point. + */ + 85000, + 90000, + 95000, + 100000, }; struct db8500_thermal_zone { - struct thermal_zone_device *therm_dev; - struct mutex th_lock; - struct work_struct therm_work; - struct db8500_thsens_platform_data *trip_tab; + struct thermal_zone_device *tz; + struct mutex lock; + struct work_struct work; enum thermal_device_mode mode; enum thermal_trend trend; - unsigned long cur_temp_pseudo; + unsigned long interpolated_temp; unsigned int cur_index; }; -/* Local function to check if thermal zone matches cooling devices */ -static int db8500_thermal_match_cdev(struct thermal_cooling_device *cdev, - struct db8500_trip_point *trip_point) -{ - int i; - - if (!strlen(cdev->type)) - return -EINVAL; - - for (i = 0; i < COOLING_DEV_MAX; i++) { - if (!strcmp(trip_point->cdev_name[i], cdev->type)) - return 0; - } - - return -ENODEV; -} - -/* Callback to bind cooling device to thermal zone */ -static int db8500_cdev_bind(struct thermal_zone_device *thermal, - struct thermal_cooling_device *cdev) -{ - struct db8500_thermal_zone *pzone = thermal->devdata; - struct db8500_thsens_platform_data *ptrips = pzone->trip_tab; - unsigned long max_state, upper, lower; - int i, ret = -EINVAL; - - cdev->ops->get_max_state(cdev, &max_state); - - for (i = 0; i < ptrips->num_trips; i++) { - if (db8500_thermal_match_cdev(cdev, &ptrips->trip_points[i])) - continue; - - upper = lower = i > max_state ? max_state : i; - - ret = thermal_zone_bind_cooling_device(thermal, i, cdev, - upper, lower, THERMAL_WEIGHT_DEFAULT); - - dev_info(&cdev->device, "%s bind to %d: %d-%s\n", cdev->type, - i, ret, ret ? "fail" : "succeed"); - } - - return ret; -} - -/* Callback to unbind cooling device from thermal zone */ -static int db8500_cdev_unbind(struct thermal_zone_device *thermal, - struct thermal_cooling_device *cdev) -{ - struct db8500_thermal_zone *pzone = thermal->devdata; - struct db8500_thsens_platform_data *ptrips = pzone->trip_tab; - int i, ret = -EINVAL; - - for (i = 0; i < ptrips->num_trips; i++) { - if (db8500_thermal_match_cdev(cdev, &ptrips->trip_points[i])) - continue; - - ret = thermal_zone_unbind_cooling_device(thermal, i, cdev); - - dev_info(&cdev->device, "%s unbind from %d: %s\n", cdev->type, - i, ret ? "fail" : "succeed"); - } - - return ret; -} - /* Callback to get current temperature */ -static int db8500_sys_get_temp(struct thermal_zone_device *thermal, int *temp) +static int db8500_thermal_get_temp(void *data, int *temp) { - struct db8500_thermal_zone *pzone = thermal->devdata; + struct db8500_thermal_zone *th = data; /* * TODO: There is no PRCMU interface to get temperature data currently, * so a pseudo temperature is returned , it works for thermal framework * and this will be fixed when the PRCMU interface is available. */ - *temp = pzone->cur_temp_pseudo; + *temp = th->interpolated_temp; return 0; } /* Callback to get temperature changing trend */ -static int db8500_sys_get_trend(struct thermal_zone_device *thermal, - int trip, enum thermal_trend *trend) -{ - struct db8500_thermal_zone *pzone = thermal->devdata; - - *trend = pzone->trend; - - return 0; -} - -/* Callback to get thermal zone mode */ -static int db8500_sys_get_mode(struct thermal_zone_device *thermal, - enum thermal_device_mode *mode) +static int db8500_thermal_get_trend(void *data, int trip, enum thermal_trend *trend) { - struct db8500_thermal_zone *pzone = thermal->devdata; + struct db8500_thermal_zone *th = data; - mutex_lock(&pzone->th_lock); - *mode = pzone->mode; - mutex_unlock(&pzone->th_lock); + *trend = th->trend; return 0; } -/* Callback to set thermal zone mode */ -static int db8500_sys_set_mode(struct thermal_zone_device *thermal, - enum thermal_device_mode mode) -{ - struct db8500_thermal_zone *pzone = thermal->devdata; - - mutex_lock(&pzone->th_lock); - - pzone->mode = mode; - if (mode == THERMAL_DEVICE_ENABLED) - schedule_work(&pzone->therm_work); - - mutex_unlock(&pzone->th_lock); - - return 0; -} - -/* Callback to get trip point type */ -static int db8500_sys_get_trip_type(struct thermal_zone_device *thermal, - int trip, enum thermal_trip_type *type) -{ - struct db8500_thermal_zone *pzone = thermal->devdata; - struct db8500_thsens_platform_data *ptrips = pzone->trip_tab; - - if (trip >= ptrips->num_trips) - return -EINVAL; - - *type = ptrips->trip_points[trip].type; - - return 0; -} - -/* Callback to get trip point temperature */ -static int db8500_sys_get_trip_temp(struct thermal_zone_device *thermal, - int trip, int *temp) -{ - struct db8500_thermal_zone *pzone = thermal->devdata; - struct db8500_thsens_platform_data *ptrips = pzone->trip_tab; - - if (trip >= ptrips->num_trips) - return -EINVAL; - - *temp = ptrips->trip_points[trip].temp; - - return 0; -} - -/* Callback to get critical trip point temperature */ -static int db8500_sys_get_crit_temp(struct thermal_zone_device *thermal, - int *temp) -{ - struct db8500_thermal_zone *pzone = thermal->devdata; - struct db8500_thsens_platform_data *ptrips = pzone->trip_tab; - int i; - - for (i = ptrips->num_trips - 1; i > 0; i--) { - if (ptrips->trip_points[i].type == THERMAL_TRIP_CRITICAL) { - *temp = ptrips->trip_points[i].temp; - return 0; - } - } - - return -EINVAL; -} - -static struct thermal_zone_device_ops thdev_ops = { - .bind = db8500_cdev_bind, - .unbind = db8500_cdev_unbind, - .get_temp = db8500_sys_get_temp, - .get_trend = db8500_sys_get_trend, - .get_mode = db8500_sys_get_mode, - .set_mode = db8500_sys_set_mode, - .get_trip_type = db8500_sys_get_trip_type, - .get_trip_temp = db8500_sys_get_trip_temp, - .get_crit_temp = db8500_sys_get_crit_temp, +static struct thermal_zone_of_device_ops thdev_ops = { + .get_temp = db8500_thermal_get_temp, + .get_trend = db8500_thermal_get_trend, }; -static void db8500_thermal_update_config(struct db8500_thermal_zone *pzone, - unsigned int idx, enum thermal_trend trend, - unsigned long next_low, unsigned long next_high) +static void db8500_thermal_update_config(struct db8500_thermal_zone *th, + unsigned int idx, + enum thermal_trend trend, + unsigned long next_low, + unsigned long next_high) { prcmu_stop_temp_sense(); - pzone->cur_index = idx; - pzone->cur_temp_pseudo = (next_low + next_high)/2; - pzone->trend = trend; + th->cur_index = idx; + th->interpolated_temp = (next_low + next_high)/2; + th->trend = trend; + /* + * The PRCMU accept absolute temperatures in celsius so divide + * down the millicelsius with 1000 + */ prcmu_config_hotmon((u8)(next_low/1000), (u8)(next_high/1000)); prcmu_start_temp_sense(PRCMU_DEFAULT_MEASURE_TIME); } static irqreturn_t prcmu_low_irq_handler(int irq, void *irq_data) { - struct db8500_thermal_zone *pzone = irq_data; - struct db8500_thsens_platform_data *ptrips = pzone->trip_tab; - unsigned int idx = pzone->cur_index; + struct db8500_thermal_zone *th = irq_data; + unsigned int idx = th->cur_index; unsigned long next_low, next_high; - if (unlikely(idx == 0)) + if (idx == 0) /* Meaningless for thermal management, ignoring it */ return IRQ_HANDLED; if (idx == 1) { - next_high = ptrips->trip_points[0].temp; + next_high = db8500_thermal_points[0]; next_low = PRCMU_DEFAULT_LOW_TEMP; } else { - next_high = ptrips->trip_points[idx-1].temp; - next_low = ptrips->trip_points[idx-2].temp; + next_high = db8500_thermal_points[idx - 1]; + next_low = db8500_thermal_points[idx - 2]; } idx -= 1; - db8500_thermal_update_config(pzone, idx, THERMAL_TREND_DROPPING, - next_low, next_high); - - dev_dbg(&pzone->therm_dev->device, + db8500_thermal_update_config(th, idx, THERMAL_TREND_DROPPING, + next_low, next_high); + dev_dbg(&th->tz->device, "PRCMU set max %ld, min %ld\n", next_high, next_low); - schedule_work(&pzone->therm_work); + schedule_work(&th->work); return IRQ_HANDLED; } static irqreturn_t prcmu_high_irq_handler(int irq, void *irq_data) { - struct db8500_thermal_zone *pzone = irq_data; - struct db8500_thsens_platform_data *ptrips = pzone->trip_tab; - unsigned int idx = pzone->cur_index; + struct db8500_thermal_zone *th = irq_data; + unsigned int idx = th->cur_index; unsigned long next_low, next_high; + int num_points = ARRAY_SIZE(db8500_thermal_points); - if (idx < ptrips->num_trips - 1) { - next_high = ptrips->trip_points[idx+1].temp; - next_low = ptrips->trip_points[idx].temp; + if (idx < num_points - 1) { + next_high = db8500_thermal_points[idx+1]; + next_low = db8500_thermal_points[idx]; idx += 1; - db8500_thermal_update_config(pzone, idx, THERMAL_TREND_RAISING, - next_low, next_high); + db8500_thermal_update_config(th, idx, THERMAL_TREND_RAISING, + next_low, next_high); - dev_dbg(&pzone->therm_dev->device, - "PRCMU set max %ld, min %ld\n", next_high, next_low); - } else if (idx == ptrips->num_trips - 1) - pzone->cur_temp_pseudo = ptrips->trip_points[idx].temp + 1; + dev_info(&th->tz->device, + "PRCMU set max %ld, min %ld\n", next_high, next_low); + } else if (idx == num_points - 1) + /* So we roof out 1 degree over the max point */ + th->interpolated_temp = db8500_thermal_points[idx] + 1; - schedule_work(&pzone->therm_work); + schedule_work(&th->work); return IRQ_HANDLED; } +/** + * db8500_thermal_work - work to update the thermal zone + * @work: the work to perform + * + * This work is scheduled at each IRQ from the PRCMU when passing a measure + * point upward or downward, as well as after system resume. + */ static void db8500_thermal_work(struct work_struct *work) { enum thermal_device_mode cur_mode; - struct db8500_thermal_zone *pzone; + struct db8500_thermal_zone *th; - pzone = container_of(work, struct db8500_thermal_zone, therm_work); + th = container_of(work, struct db8500_thermal_zone, work); - mutex_lock(&pzone->th_lock); - cur_mode = pzone->mode; - mutex_unlock(&pzone->th_lock); + mutex_lock(&th->lock); + cur_mode = th->mode; + mutex_unlock(&th->lock); if (cur_mode == THERMAL_DEVICE_DISABLED) return; - thermal_zone_device_update(pzone->therm_dev, THERMAL_EVENT_UNSPECIFIED); - dev_dbg(&pzone->therm_dev->device, "thermal work finished.\n"); -} - -static struct db8500_thsens_platform_data* - db8500_thermal_parse_dt(struct device *dev) -{ - struct db8500_thsens_platform_data *ptrips; - struct device_node *np = dev->of_node; - char prop_name[32]; - const char *tmp_str; - u32 tmp_data; - int i, j; - - ptrips = devm_kzalloc(dev, sizeof(*ptrips), GFP_KERNEL); - if (!ptrips) - return NULL; - - if (of_property_read_u32(np, "num-trips", &tmp_data)) - goto err_parse_dt; - - if (tmp_data > THERMAL_MAX_TRIPS) - goto err_parse_dt; - - ptrips->num_trips = tmp_data; - - for (i = 0; i < ptrips->num_trips; i++) { - sprintf(prop_name, "trip%d-temp", i); - if (of_property_read_u32(np, prop_name, &tmp_data)) - goto err_parse_dt; - - ptrips->trip_points[i].temp = tmp_data; - - sprintf(prop_name, "trip%d-type", i); - if (of_property_read_string(np, prop_name, &tmp_str)) - goto err_parse_dt; - - if (!strcmp(tmp_str, "active")) - ptrips->trip_points[i].type = THERMAL_TRIP_ACTIVE; - else if (!strcmp(tmp_str, "passive")) - ptrips->trip_points[i].type = THERMAL_TRIP_PASSIVE; - else if (!strcmp(tmp_str, "hot")) - ptrips->trip_points[i].type = THERMAL_TRIP_HOT; - else if (!strcmp(tmp_str, "critical")) - ptrips->trip_points[i].type = THERMAL_TRIP_CRITICAL; - else - goto err_parse_dt; - - sprintf(prop_name, "trip%d-cdev-num", i); - if (of_property_read_u32(np, prop_name, &tmp_data)) - goto err_parse_dt; - - if (tmp_data > COOLING_DEV_MAX) - goto err_parse_dt; - - for (j = 0; j < tmp_data; j++) { - sprintf(prop_name, "trip%d-cdev-name%d", i, j); - if (of_property_read_string(np, prop_name, &tmp_str)) - goto err_parse_dt; - - if (strlen(tmp_str) >= THERMAL_NAME_LENGTH) - goto err_parse_dt; - - strcpy(ptrips->trip_points[i].cdev_name[j], tmp_str); - } - } - return ptrips; - -err_parse_dt: - dev_err(dev, "Parsing device tree data error.\n"); - return NULL; + thermal_zone_device_update(th->tz, THERMAL_EVENT_UNSPECIFIED); + dev_dbg(&th->tz->device, "thermal work updated thermal zone\n"); } static int db8500_thermal_probe(struct platform_device *pdev) { - struct db8500_thermal_zone *pzone = NULL; - struct db8500_thsens_platform_data *ptrips = NULL; + struct db8500_thermal_zone *th = NULL; struct device *dev = &pdev->dev; - struct device_node *np = dev->of_node; int low_irq, high_irq, ret = 0; - unsigned long dft_low, dft_high; - if (!np) - return -EINVAL; - - ptrips = db8500_thermal_parse_dt(dev); - if (!ptrips) - return -EINVAL; - - pzone = devm_kzalloc(dev, sizeof(*pzone), GFP_KERNEL); - if (!pzone) + th = devm_kzalloc(dev, sizeof(*th), GFP_KERNEL); + if (!th) return -ENOMEM; - mutex_init(&pzone->th_lock); - mutex_lock(&pzone->th_lock); + mutex_init(&th->lock); + mutex_lock(&th->lock); - pzone->mode = THERMAL_DEVICE_DISABLED; - pzone->trip_tab = ptrips; + th->mode = THERMAL_DEVICE_DISABLED; - INIT_WORK(&pzone->therm_work, db8500_thermal_work); + INIT_WORK(&th->work, db8500_thermal_work); low_irq = platform_get_irq_byname(pdev, "IRQ_HOTMON_LOW"); if (low_irq < 0) { - dev_err(dev, "Get IRQ_HOTMON_LOW failed.\n"); + dev_err(dev, "Get IRQ_HOTMON_LOW failed\n"); ret = low_irq; goto out_unlock; } ret = devm_request_threaded_irq(dev, low_irq, NULL, prcmu_low_irq_handler, IRQF_NO_SUSPEND | IRQF_ONESHOT, - "dbx500_temp_low", pzone); + "dbx500_temp_low", th); if (ret < 0) { - dev_err(dev, "Failed to allocate temp low irq.\n"); + dev_err(dev, "failed to allocate temp low irq\n"); goto out_unlock; } high_irq = platform_get_irq_byname(pdev, "IRQ_HOTMON_HIGH"); if (high_irq < 0) { - dev_err(dev, "Get IRQ_HOTMON_HIGH failed.\n"); + dev_err(dev, "Get IRQ_HOTMON_HIGH failed\n"); ret = high_irq; goto out_unlock; } ret = devm_request_threaded_irq(dev, high_irq, NULL, prcmu_high_irq_handler, IRQF_NO_SUSPEND | IRQF_ONESHOT, - "dbx500_temp_high", pzone); + "dbx500_temp_high", th); if (ret < 0) { - dev_err(dev, "Failed to allocate temp high irq.\n"); + dev_err(dev, "failed to allocate temp high irq\n"); goto out_unlock; } - pzone->therm_dev = thermal_zone_device_register("db8500_thermal_zone", - ptrips->num_trips, 0, pzone, &thdev_ops, NULL, 0, 0); - - if (IS_ERR(pzone->therm_dev)) { - dev_err(dev, "Register thermal zone device failed.\n"); - ret = PTR_ERR(pzone->therm_dev); + /* register of thermal sensor and get info from DT */ + th->tz = devm_thermal_zone_of_sensor_register(dev, 0, th, &thdev_ops); + if (IS_ERR(th->tz)) { + dev_err(dev, "register thermal zone sensor failed\n"); + ret = PTR_ERR(th->tz); goto out_unlock; } - dev_info(dev, "Thermal zone device registered.\n"); + dev_info(dev, "thermal zone sensor registered\n"); - dft_low = PRCMU_DEFAULT_LOW_TEMP; - dft_high = ptrips->trip_points[0].temp; + /* Start measuring at the lowest point */ + db8500_thermal_update_config(th, 0, THERMAL_TREND_STABLE, + PRCMU_DEFAULT_LOW_TEMP, + db8500_thermal_points[0]); - db8500_thermal_update_config(pzone, 0, THERMAL_TREND_STABLE, - dft_low, dft_high); - - platform_set_drvdata(pdev, pzone); - pzone->mode = THERMAL_DEVICE_ENABLED; + platform_set_drvdata(pdev, th); + th->mode = THERMAL_DEVICE_ENABLED; out_unlock: - mutex_unlock(&pzone->th_lock); + mutex_unlock(&th->lock); return ret; } static int db8500_thermal_remove(struct platform_device *pdev) { - struct db8500_thermal_zone *pzone = platform_get_drvdata(pdev); + struct db8500_thermal_zone *th = platform_get_drvdata(pdev); - thermal_zone_device_unregister(pzone->therm_dev); - cancel_work_sync(&pzone->therm_work); - mutex_destroy(&pzone->th_lock); + cancel_work_sync(&th->work); + mutex_destroy(&th->lock); return 0; } @@ -478,9 +274,9 @@ static int db8500_thermal_remove(struct platform_device *pdev) static int db8500_thermal_suspend(struct platform_device *pdev, pm_message_t state) { - struct db8500_thermal_zone *pzone = platform_get_drvdata(pdev); + struct db8500_thermal_zone *th = platform_get_drvdata(pdev); - flush_work(&pzone->therm_work); + flush_work(&th->work); prcmu_stop_temp_sense(); return 0; @@ -488,15 +284,12 @@ static int db8500_thermal_suspend(struct platform_device *pdev, static int db8500_thermal_resume(struct platform_device *pdev) { - struct db8500_thermal_zone *pzone = platform_get_drvdata(pdev); - struct db8500_thsens_platform_data *ptrips = pzone->trip_tab; - unsigned long dft_low, dft_high; - - dft_low = PRCMU_DEFAULT_LOW_TEMP; - dft_high = ptrips->trip_points[0].temp; + struct db8500_thermal_zone *th = platform_get_drvdata(pdev); - db8500_thermal_update_config(pzone, 0, THERMAL_TREND_STABLE, - dft_low, dft_high); + /* Resume and start measuring at the lowest point */ + db8500_thermal_update_config(th, 0, THERMAL_TREND_STABLE, + PRCMU_DEFAULT_LOW_TEMP, + db8500_thermal_points[0]); return 0; }