From patchwork Mon Jul 2 12:44:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 10501309 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 5DFA060325 for ; Mon, 2 Jul 2018 12:46:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C00F1FF81 for ; Mon, 2 Jul 2018 12:46:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F0CF1FFE6; Mon, 2 Jul 2018 12:46:20 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 DBF831FF81 for ; Mon, 2 Jul 2018 12:46:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753067AbeGBMpu (ORCPT ); Mon, 2 Jul 2018 08:45:50 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:45168 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753075AbeGBMo4 (ORCPT ); Mon, 2 Jul 2018 08:44:56 -0400 Received: by mail-pl0-f67.google.com with SMTP id bi1-v6so7910527plb.12 for ; Mon, 02 Jul 2018 05:44:55 -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=2chRnc2W7u7nDJkgcN8SuxEHelsCQc93uFuFBC70dN0=; b=L1QRH4nedVyn8SXsrAlvztQC6tpo4mF/Qj+0PRkN6Y12blWvHG4IRuOurcx+N7fbDC cnDINuQbdoT8W9wGoRj5JWnqHOd3AgotDLfQ3RoosOlTbnXhmmE/P8gcOwSE+gbpoQSY /Jl6xiKBiZZy1/t4m0c0qNoo0Dbx6WpmfH51c= 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=2chRnc2W7u7nDJkgcN8SuxEHelsCQc93uFuFBC70dN0=; b=toF/08yYpme0HtW97Abv3Y+5m2vQqFDXWhpAxUec4RVQTpH2/Sj/zs/UGPqxCaBjdl 4IUFBJYqhIxmjuHgDafmePh+gbM5sBq6Bxc3w6JhK7ybQSfFDdo6s4Ugq/JU3RZ8Tcv9 IxTKoQLFHG6zqfcEAjLaY3misrsZYmVCcxdPwYHVUOn0J5vGXdTXce6A4csKtigL3PX2 727wm+a47s4YVS8E+zZOCbkwz4IoA8i4i4gyjN4EVeaw33Js7G+heOTJtMYVeWBn9O1P SFDgbFnlHPcyL15O609VpdOQn5fVotqO0HE3UCQNpu7c9SaRl3R8WAA/cuMWHQUZ5K1R p1og== X-Gm-Message-State: APt69E0Wl4n0vY5W4b7D3LMqKuQLStm5Aoz4dVcAFyfRvWvJT6qwteNQ t4o87k8UbblK2iJi7HwkyU/IYg== X-Google-Smtp-Source: ADUXVKJrybn1Xc3HNujcy6LFFNXLqVV9MbbBshqcCiZbFafxcMrvIi+HrJtTYXyhnh0k9N0USW/8PA== X-Received: by 2002:a17:902:8e87:: with SMTP id bg7-v6mr25600756plb.129.1530535495526; Mon, 02 Jul 2018 05:44:55 -0700 (PDT) Received: from localhost ([49.248.63.129]) by smtp.gmail.com with ESMTPSA id e10-v6sm20453604pgv.48.2018.07.02.05.44.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Jul 2018 05:44:54 -0700 (PDT) From: Amit Kucheria To: linux-kernel@vger.kernel.org Cc: rnayak@codeaurora.org, linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, edubezval@gmail.com, smohanad@codeaurora.org, vivek.gautam@codeaurora.org, andy.gross@linaro.org, Zhang Rui , Rob Herring , Mark Rutland , Kees Cook , linux-pm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v4 4/6] thermal: tsens: Add support for SDM845 Date: Mon, 2 Jul 2018 18:14:07 +0530 Message-Id: <43e3ae530334efab3fa0151430879f03731e9daa.1530533998.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 X-Virus-Scanned: ClamAV using ClamSMTP SDM845 uses v2.4.0 of the TSENS IP block but the get_temp() function appears to be identical across v2.x.y in code seen so far. We use the generic get_temp() function. Signed-off-by: Amit Kucheria Reviewed-by: Bjorn Andersson --- Documentation/devicetree/bindings/thermal/qcom-tsens.txt | 2 ++ drivers/thermal/qcom/tsens-v2.c | 6 +++++- drivers/thermal/qcom/tsens.c | 6 ++++++ drivers/thermal/qcom/tsens.h | 5 ++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt index 06195e8..075182e 100644 --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt @@ -5,6 +5,8 @@ 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,tsens-v2.4.0" : For SDM845 Family of SoCs + - "qcom,tsens-v2" : Generic fallback binding for any Soc using 2.x.y version of the tsens IP - 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/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c index 2eca7ff..1871945 100644 --- a/drivers/thermal/qcom/tsens-v2.c +++ b/drivers/thermal/qcom/tsens-v2.c @@ -69,8 +69,12 @@ static const struct tsens_ops ops_generic_v2 = { .get_temp = get_temp_tsens_v2, }; +const struct tsens_data data_tsens_v2 = { + .ops = &ops_generic_v2, +}; + +/* Kept around for backward compatibility with old msm8996.dtsi */ const struct tsens_data data_8996 = { .num_sensors = 13, .ops = &ops_generic_v2, }; - diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index 3440166c..992ed17 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -72,6 +72,12 @@ static const struct of_device_id tsens_table[] = { }, { .compatible = "qcom,msm8996-tsens", .data = &data_8996, + }, { + .compatible = "qcom,tsens-v2.4.0", + .data = &data_tsens_v2, + }, { + .compatible = "qcom,tsens-v2", + .data = &data_tsens_v2, }, {} }; diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h index dc56e1e..69212cb 100644 --- a/drivers/thermal/qcom/tsens.h +++ b/drivers/thermal/qcom/tsens.h @@ -87,6 +87,9 @@ void compute_intercept_slope(struct tsens_device *, u32 *, u32 *, u32); 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; +/* TSENS v1 targets */ +extern const struct tsens_data data_8916, data_8974, data_8960; +/* TSENS v2 targets */ +extern const struct tsens_data data_8996, data_tsens_v2; #endif /* __QCOM_TSENS_H__ */