From patchwork Wed Nov 23 14:29:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caesar Wang X-Patchwork-Id: 9443515 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 365E7600BA for ; Wed, 23 Nov 2016 14:31:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2982D26CFF for ; Wed, 23 Nov 2016 14:31:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1E2D226D17; Wed, 23 Nov 2016 14:31:39 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham 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 B6D6F26CFF for ; Wed, 23 Nov 2016 14:31:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937116AbcKWOaN (ORCPT ); Wed, 23 Nov 2016 09:30:13 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:36024 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S938095AbcKWO37 (ORCPT ); Wed, 23 Nov 2016 09:29:59 -0500 Received: by mail-pg0-f65.google.com with SMTP id x23so1218548pgx.3; Wed, 23 Nov 2016 06:29:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=a0YPRSnnmxx9b8VZSEdfcL+gRVPpMCiRbuwpwJhrfXM=; b=l8D1RzIYqX6Ag7HZE7+l6BkeaAhf6bJGtm1LH7Ax9ZjGe1T109eAMGic5ZPaD22AZ0 l/WxZcfEwvT/9rZGVq8brJq9QeC25iDNBOGl5PsRdap73l4s+XjtSTl6GgQY1+UfmBX1 CKLJK0a1QaIeHLzq/4yjyMGbqedYmMgslC3iUPSGSBBITUo1DigDoFfs3VTZXmMRErLe TW+ce4aH+Pa8fOMNc+NblEELtkFwMMYLnNXZv5450XI5WSgohdHEI0/w6turaZZ/iCNA w7StNAblB1qbu/hHJbGRGUNhsm7wYWyA5Kyd4BKTJd/1KRhiPureA/Oe13cl/ozu40pM E8lA== X-Gm-Message-State: AKaTC03faXO5L16h1ziPTy43uzMcZTIknUy/x0/SDXSmQXamgPIcuIj7WrCjnXpQgs8FTQ== X-Received: by 10.99.97.15 with SMTP id v15mr5773022pgb.10.1479911399018; Wed, 23 Nov 2016 06:29:59 -0800 (PST) Received: from localhost.localdomain ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id y29sm53385351pfd.63.2016.11.23.06.29.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Nov 2016 06:29:58 -0800 (PST) From: Caesar Wang To: edubezval@gmail.com, rui.zhang@intel.com Cc: linux-rockchip@lists.infradead.org, linux-pm@vger.kernel.org, briannorris@chromium.org, linux-kernel@vger.kernel.org, smbarber@chromium.org, Caesar Wang Subject: [PATCH v2 5/5] thermal: rockchip: handle set_trips without the trip points Date: Wed, 23 Nov 2016 22:29:34 +0800 Message-Id: <1479911374-22006-6-git-send-email-wxt@rock-chips.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479911374-22006-1-git-send-email-wxt@rock-chips.com> References: <1479911374-22006-1-git-send-email-wxt@rock-chips.com> 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 In some cases, some sensors didn't need the trip points, the set_trips will return {-INT_MAX, INT_MAX} to trigger thermal alarm. Signed-off-by: Caesar Wang Reviewed-by: Brian Norris --- Changes in v2: - Fixes something as Brian comments on https://patchwork.kernel.org/patch/9440989. Changes in v1: None drivers/thermal/rockchip_thermal.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index 0d50df7..f873053 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -675,7 +675,21 @@ static int rk_tsadcv2_get_temp(const struct chip_tsadc_table *table, static int rk_tsadcv2_alarm_temp(const struct chip_tsadc_table *table, int chn, void __iomem *regs, int temp) { - u32 alarm_value, int_en; + u32 alarm_value; + u32 int_en, int_clr; + + /* + * In some cases, some sensors didn't need the trip points, the + * set_trips will pass {-INT_MAX, INT_MAX} to trigger tsadc alarm + * in the end, ignore this case and disable the high temperature + * interrupt. + */ + if (temp == INT_MAX) { + int_clr = readl_relaxed(regs + TSADCV2_INT_EN); + int_clr &= ~TSADCV2_INT_SRC_EN(chn); + writel_relaxed(int_clr, regs + TSADCV2_INT_EN); + return 0; + } /* Make sure the value is valid */ alarm_value = rk_tsadcv2_temp_to_code(table, temp);