From patchwork Tue Oct 10 18:02:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 9996909 X-Patchwork-Delegate: eduardo.valentin@ti.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 59D0860216 for ; Tue, 10 Oct 2017 18:06:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50E3928701 for ; Tue, 10 Oct 2017 18:06:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45BB1286C6; Tue, 10 Oct 2017 18:06:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C81F7286C6 for ; Tue, 10 Oct 2017 18:06:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932694AbdJJSFY (ORCPT ); Tue, 10 Oct 2017 14:05:24 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:52179 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932663AbdJJSFX (ORCPT ); Tue, 10 Oct 2017 14:05:23 -0400 Received: by mail-wm0-f45.google.com with SMTP id f4so7719361wme.0 for ; Tue, 10 Oct 2017 11:05:22 -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; bh=VNfithlJaR7JHlG4OPXBnwSU7MRKMhDCwL88J7IUMVQ=; b=Yohx14x/r/D7VrtTKJtbceUyy54rKzOoQg6wrwZJH8cOGqRg6r/ZI8XM2VBNXG5L5O E94wpPJ3GrjBjvBrmWeHlCoKQy/mN7PEcV0BaGP36acuF/7yOO+lFPQ29jbBs+9NTWHe cW1h0fNJk3lt94OYZ2f0ZjziiirtUcG5sYrOo= 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; bh=VNfithlJaR7JHlG4OPXBnwSU7MRKMhDCwL88J7IUMVQ=; b=JDCGIwihMou4TWt6vZOb36grksHLYxm+PAPu0y9t57hE2Ni6k3BJKXX49LVh++QQvs SGG67HRRoxhZjISxVpTzlyAYb4BzeqOvp5zzSyKEmceu/UBmnEbynygOFSghagityWGx VMh/jIuHNl7ZalmVweKuwXE8qbnZFxZU+gCsmvWvDC2LVfUvFxT+8MkHyev6kfNv2h1R 7TW3izVGIbKO2CHea5vHymgr2xPU+SD1G1v0ADt0o+ItFRV6k/aEZ8jjdE++L0+lLen4 ojMW0kIGFRQADG7BsazWVNuIzglVTnRnH/NCNOUgf+Cqw667dGcChIkuMNvi4Spaly0+ qJMw== X-Gm-Message-State: AMCzsaXs/sssA9gVLMUeuCs/N2UO1ANCd+axlOQGu3K32W2ufyIrAtCJ uZM5rKgFt0VOFXkj0RshMIkflw== X-Google-Smtp-Source: AOwi7QAdWjoyEAVbgXwVYFy+HTbc2csVngQc4tI4gYMioQFIY1fTEER1kF/mw/VFWKjcRdw2Irg0GA== X-Received: by 10.28.36.212 with SMTP id k203mr10565455wmk.127.1507658721816; Tue, 10 Oct 2017 11:05:21 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:4f9:3ae1:43d2:31ae]) by smtp.gmail.com with ESMTPSA id l73sm12513428wmd.47.2017.10.10.11.05.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Oct 2017 11:05:21 -0700 (PDT) From: Daniel Lezcano To: edubezval@gmail.com, rui.zhang@intel.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, kevin.wangtao@linaro.org Subject: [PATCH 22/25] thermal/drivers/hisi: Add support for multi temp threshold Date: Tue, 10 Oct 2017 20:02:47 +0200 Message-Id: <1507658570-32675-22-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507658570-32675-1-git-send-email-daniel.lezcano@linaro.org> References: <79a5f10c-0fb7-3e4f-caac-c1625904b137@linaro.org> <1507658570-32675-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kevin Wangtao The next patches will provide the support for the hi3660 where the temperature sensor can have multiple alarm levels. In order to set the scene to support it, we have to convert the current code to be able to support multiple threshold values. [Daniel Lezcano: Restated the log] Signed-off-by: Kevin Wangtao Signed-off-by: Daniel Lezcano --- drivers/thermal/hisi_thermal.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index b5a7159..e87ca6c 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -46,10 +46,12 @@ #define HI6220_DEFAULT_SENSOR 2 +#define MAX_THRES_NUM 2 + struct hisi_thermal_sensor { struct thermal_zone_device *tzd; uint32_t id; - uint32_t thres_temp; + uint32_t thres_temp[MAX_THRES_NUM]; }; struct hisi_thermal_data { @@ -244,7 +246,7 @@ static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data) hi6220_thermal_set_lag(data->regs, HI6220_TEMP_LAG); /* enable for interrupt */ - hi6220_thermal_alarm_set(data->regs, sensor->thres_temp); + hi6220_thermal_alarm_set(data->regs, sensor->thres_temp[0]); hi6220_thermal_reset_set(data->regs, HI6220_TEMP_RESET); @@ -303,7 +305,7 @@ static int hisi_thermal_get_temp(void *__data, int *temp) *temp = data->get_temp(data); dev_dbg(&data->pdev->dev, "id=%d, temp=%d, thres=%d\n", - sensor->id, *temp, sensor->thres_temp); + sensor->id, *temp, sensor->thres_temp[0]); return 0; } @@ -322,16 +324,16 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev) hisi_thermal_get_temp(data, &temp); - if (temp >= sensor->thres_temp) { + if (temp >= sensor->thres_temp[0]) { dev_crit(&data->pdev->dev, "THERMAL ALARM: %d > %d\n", - temp, sensor->thres_temp); + temp, sensor->thres_temp[0]); thermal_zone_device_update(data->sensor.tzd, THERMAL_EVENT_UNSPECIFIED); } else { dev_crit(&data->pdev->dev, "THERMAL ALARM stopped: %d < %d\n", - temp, sensor->thres_temp); + temp, sensor->thres_temp[0]); } return IRQ_HANDLED; @@ -341,7 +343,7 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev, struct hisi_thermal_data *data, struct hisi_thermal_sensor *sensor) { - int ret, i; + int ret, i, thres_idx = 0; const struct thermal_trip *trip; sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, @@ -359,8 +361,9 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev, for (i = 0; i < of_thermal_get_ntrips(sensor->tzd); i++) { if (trip[i].type == THERMAL_TRIP_PASSIVE) { - sensor->thres_temp = trip[i].temperature; - break; + sensor->thres_temp[thres_idx++] = trip[i].temperature; + if (thres_idx >= MAX_THRES_NUM) + break; } }