From patchwork Sat Jun 2 11:11:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 137584 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp2033930lji; Sat, 2 Jun 2018 04:11:48 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKMXC7bhXFa3Gj3st92KnyEa/5Sgn4VNXFErex52r3q96gGfKqVmyMI4Y/oi0gshUBpcpAX X-Received: by 2002:a65:5b8b:: with SMTP id i11-v6mr11685453pgr.225.1527937908058; Sat, 02 Jun 2018 04:11:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527937908; cv=none; d=google.com; s=arc-20160816; b=O081JoPDjsc3W089bqSWxME0LG6XlXvTXzWgaDL7k+5aXXe7DecCPnlIb4avSgNQO/ tsxvwK+5v0MnjerZRdhWTp9knFQIuswZx6dohVtoWeh4xaMXo9KOjfwp5hWDjyFI1JIb d4Rx+L/Yt0/lB8fgwy/0Ju6sIbMOUDlSHNAimflBBe3eM+IeiWipG3X5xdRpyflR/9Zs MayU088h1ChANPiLTAscMvkINpNVdgBe2MjFNNQFPQPqJUViNqZWpqvy7IS1Il72yeFf ezEFGZONMwv0P8TJc784O3S9I9rlQIaV83GBl9TUUpLJXAPvDYoHoo/CwjIyKHNOQ/pR zByw== 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 :arc-authentication-results; bh=Es0S++efjeIkFeYG1MtwXjSZcmA4BAjDFYVN8s6Vcq8=; b=PNzB/E+W6sJgCIRHMeaM64orXImneifTYb/4IMWCtXhA/PHiVwjZC4Cq5FSZ0N8Qfs vad3MSdtisCK2xucRfFR8ZPk2CZNHV/d8nBFVxtMg2U42rY0WGvivOH6SC1DR+sMzuq1 biJQRmcV30RhwkFRi3qDpZld+SN2Rtrj1ehtygagw3pLuZAniw/iFc8wRY6iEEdO/zFw Qp2i8/cY93EhYwVMpLD6M02eMcDcmdmIg5Q3acP7YOyrYWPGCdRGYDNTRMekoUTv21Xh MV+5Ej3IJy3gClOpdg0N7pWIH3vc2NRbCEAHaAFT52CEnvz671Ek3D1SNhHwxtNld93K C5Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AAEGPU+m; 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 v64-v6si15501565pfj.292.2018.06.02.04.11.47; Sat, 02 Jun 2018 04:11:48 -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=AAEGPU+m; 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 S1751844AbeFBLLq (ORCPT + 10 others); Sat, 2 Jun 2018 07:11:46 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:35573 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750913AbeFBLLm (ORCPT ); Sat, 2 Jun 2018 07:11:42 -0400 Received: by mail-lf0-f66.google.com with SMTP id y72-v6so18414756lfd.2 for ; Sat, 02 Jun 2018 04:11:41 -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=Es0S++efjeIkFeYG1MtwXjSZcmA4BAjDFYVN8s6Vcq8=; b=AAEGPU+mxWHKSY6SayEUNT57aavVyQKy9vRqFp5JU0FAah11dLq4vLMGsxvRMS1A5d O2mMa9R8MpOh8zJvgJGMIkNBiqqJBXA7ONZCwN2gRhRVDbJTr/WQQDJS/CwbHoe5X6q3 0dB5osbiBA05LtvPLlp5quIfbvL5Mc23vY+c8= 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=Es0S++efjeIkFeYG1MtwXjSZcmA4BAjDFYVN8s6Vcq8=; b=h6umlVE4P7R3Ugbs3I5pKFMyy853SzwqR/JUNi1uAGNLB5yg3mzUGvk2WuLcZdSuRw 5s9fSgPA6NlASGqoRjluihaBdzlEiQjtOkZiFMbhSyS/frCqkOCHeTbGL81fVTqbN5N6 WTjFxQhrpTveH5090wwXpYHNpsWJ+J+OPMymhFGOaVlNVNMymBeYWW9DEuAue2OAplSa 620rT/fkGjJ6er85BWjGnX+RMYU63bSy9V2J3MEVvLy4wLlyIjOTAi5ddTmORiSfI3YF ev9VJrS38FaizDbLZQgLeq9aXK8JF+Wb4evryVIql1IDB/GLaZuPwJkRSPQwRN5hfzgf KVng== X-Gm-Message-State: ALKqPwf55xOkBJxUpbycf39h+SgdiUsZTN8tgmmsnVVAE0o4jzAhPxYr mKPXd3X4xlapCkJQkHzTJboULA== X-Received: by 2002:a19:e82c:: with SMTP id f44-v6mr8469748lfh.19.1527937900817; Sat, 02 Jun 2018 04:11:40 -0700 (PDT) Received: from localhost (88-113-68-225.elisa-laajakaista.fi. [88.113.68.225]) by smtp.gmail.com with ESMTPSA id t9-v6sm8643790ljh.66.2018.06.02.04.11.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 02 Jun 2018 04:11:40 -0700 (PDT) From: Amit Kucheria To: linux-arm-msm@vger.kernel.org Cc: rnayak@codeaurora.org, bjorn.andersson@linaro.org, edubezval@gmail.com, Zhang Rui , Rob Herring , Mark Rutland , linux-pm@vger.kernel.org (open list:THERMAL), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 1/2] thermal: tsens: Add support for SDM845 platform Date: Sat, 2 Jun 2018 14:11:12 +0300 Message-Id: <7a0f33cff94f41110bdbff14d28d36074fae2a7d.1527937396.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org There are two tsens blocks on the SDM845. These will be configured through the devicetree. Signed-off-by: Amit Kucheria --- .../devicetree/bindings/thermal/qcom-tsens.txt | 1 + drivers/thermal/qcom/Makefile | 2 +- drivers/thermal/qcom/tsens-sdm845.c | 98 ++++++++++++++++++++++ drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 1 + 5 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 drivers/thermal/qcom/tsens-sdm845.c -- 2.7.4 diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt index 292ed89..8652499 100644 --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt @@ -5,6 +5,7 @@ Required properties: - "qcom,msm8916-tsens" : For 8916 Family of SoCs - "qcom,msm8974-tsens" : For 8974 Family of SoCs - "qcom,msm8996-tsens" : For 8996 Family of SoCs + - "qcom,sdm845-tsens" : For SDM845 Family of SoCs - reg: Address range of the thermal registers - #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description. diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile index 2cc2193..dc9f169 100644 --- a/drivers/thermal/qcom/Makefile +++ b/drivers/thermal/qcom/Makefile @@ -1,2 +1,2 @@ obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o -qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-8996.o +qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-8996.o tsens-sdm845.o diff --git a/drivers/thermal/qcom/tsens-sdm845.c b/drivers/thermal/qcom/tsens-sdm845.c new file mode 100644 index 0000000..5d78f0b --- /dev/null +++ b/drivers/thermal/qcom/tsens-sdm845.c @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2018, Linaro Limited + */ + +#include +#include +#include +#include "tsens.h" + +#define CNTL_OFFSET 4 +/* CNTL_OFFSET bitmasks */ +#define EN BIT(0) +#define SW_RST BIT(1) + +#define SENSOR0_SHIFT 3 + +#define TRDY_OFFSET 0xe4 +#define TRDY_READY_BIT BIT(1) + +#define STATUS_OFFSET 0xa0 +#define LAST_TEMP_MASK 0xfff +#define STATUS_VALID_BIT BIT(21) +#define CODE_SIGN_BIT BIT(11) + +static int get_temp_sdm845(struct tsens_device *tmdev, int id, int *temp) +{ + struct tsens_sensor *s = &tmdev->sensor[id]; + u32 code; + unsigned int sensor_addr; + int last_temp = 0, last_temp2 = 0, last_temp3 = 0, ret; + + ret = regmap_read(tmdev->map, TRDY_OFFSET, &code); + if (ret) + return ret; + if (code & TRDY_READY_BIT) + return -ENODATA; + + sensor_addr = STATUS_OFFSET + s->hw_id * 4; + ret = regmap_read(tmdev->map, sensor_addr, &code); + if (ret) + return ret; + last_temp = code & LAST_TEMP_MASK; + if (code & STATUS_VALID_BIT) + goto done; + + /* Try a second time */ + ret = regmap_read(tmdev->map, sensor_addr, &code); + if (ret) + return ret; + if (code & STATUS_VALID_BIT) { + last_temp = code & LAST_TEMP_MASK; + goto done; + } else { + last_temp2 = code & LAST_TEMP_MASK; + } + + /* Try a third/last time */ + ret = regmap_read(tmdev->map, sensor_addr, &code); + if (ret) + return ret; + if (code & STATUS_VALID_BIT) { + last_temp = code & LAST_TEMP_MASK; + goto done; + } else { + last_temp3 = code & LAST_TEMP_MASK; + } + + if (last_temp == last_temp2) + last_temp = last_temp2; + else if (last_temp2 == last_temp3) + last_temp = last_temp3; +done: + /* Code sign bit is the sign extension for a negative value */ + if (last_temp & CODE_SIGN_BIT) + last_temp |= ~CODE_SIGN_BIT; + + /* Temperatures are in deciCelicius */ + *temp = last_temp * 100; + + return 0; +} + +static const struct regmap_config tsens_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, +}; + + +static const struct tsens_ops ops_sdm845 = { + .init = init_common, + .get_temp = get_temp_sdm845, +}; + +const struct tsens_data data_sdm845 = { + .ops = &ops_sdm845, +}; diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 3f9fe6a..314a20f 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -72,6 +72,9 @@ static const struct of_device_id tsens_table[] = { }, { .compatible = "qcom,msm8996-tsens", .data = &data_8996, + }, { + .compatible = "qcom,sdm845-tsens", + .data = &data_sdm845, }, {} }; diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h index 911c197..f15660d 100644 --- a/drivers/thermal/qcom/tsens.h +++ b/drivers/thermal/qcom/tsens.h @@ -90,5 +90,6 @@ int init_common(struct tsens_device *); int get_temp_common(struct tsens_device *, int, int *); extern const struct tsens_data data_8916, data_8974, data_8960, data_8996; +extern const struct tsens_data data_sdm845; #endif /* __QCOM_TSENS_H__ */