From patchwork Wed Jul 18 06:43: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: 10531373 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 91E19601D2 for ; Wed, 18 Jul 2018 06:44:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81669205F6 for ; Wed, 18 Jul 2018 06:44:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 753972623D; Wed, 18 Jul 2018 06:44:27 +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 11FBA27F97 for ; Wed, 18 Jul 2018 06:44:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726427AbeGRHUo (ORCPT ); Wed, 18 Jul 2018 03:20:44 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:41522 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726080AbeGRHUn (ORCPT ); Wed, 18 Jul 2018 03:20:43 -0400 Received: by mail-pg1-f195.google.com with SMTP id z8-v6so1548211pgu.8 for ; Tue, 17 Jul 2018 23:44:25 -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=v7ifTUzkyvVtGx5wt0pGx0Zah3Qa2i6PSQqCHrSBSkU=; b=T6dmlguk24aBlZ6ctNglJS2Gx1gJKrcspfIbnkRUlXpf8SpxJ8Pet6vtzeqgDk236u FNKKjFonXyOUrsOV/UClu7WRvnvjsIYoWuE2oN+g+DVoUxeBzCZbPqBnSrzRr0rDCAUC aFEKf5fwFV4B3CPie6AUKSiCFEJkjpbEN/bQ8= 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=v7ifTUzkyvVtGx5wt0pGx0Zah3Qa2i6PSQqCHrSBSkU=; b=GvvqC03NPTuIpI6jymCNf+skDug2InG1b6+iar4nxi6Hcm3dKiUaDeFtKI/xLGtzIa zJEa0VbEfO6HPr5/+WNlNaPjTaqUqPfFyJRqzLwVfEkEAKrQmVMMlRzsAd/CkWXKJ/uV p0fEKU7T1qAatoJrxbiCJlTF3Mw30qHLv0Hk3NES0JnXgoFuc/C5bpzVO4+VwkQl4E92 tnpB5DYc8hydz+nOnJj21KSlr2bBNJJNU8SsVj1ozKrPcUG24pphdw9/lplXhXPkUIGx EWs8MwpIxTX1J74XaJV+uAGN7ozT+6ZrhgW/Tc/TqGzsjJOdbWrPAh/C4Y8zRSJK9uGr 3Ydw== X-Gm-Message-State: AOUpUlFYBYBzN0UL2HIXSHVnstI8j5syNZYZ3QQbMz2KuyFyA4HfPNch iBczu7eBH9UfVozo1u0vdf0syQ== X-Google-Smtp-Source: AAOMgpdEmZhc8Fx4bxJ8+GrSeC8PHCaAmvGPUInDNkXpYYZUnupJPBVxeVQiqhTbcWyZ5Y6syKo6Wg== X-Received: by 2002:a62:4a41:: with SMTP id x62-v6mr3951433pfa.45.1531896265134; Tue, 17 Jul 2018 23:44:25 -0700 (PDT) Received: from localhost ([103.249.91.115]) by smtp.gmail.com with ESMTPSA id z8-v6sm4054244pfe.163.2018.07.17.23.44.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jul 2018 23:44:24 -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, dianders@chromium.org, mka@chromium.org, Zhang Rui , Kees Cook , linux-pm@vger.kernel.org Subject: [PATCH v8 6/7] thermal: tsens: Add generic support for TSENS v2 IP Date: Wed, 18 Jul 2018 12:13:12 +0530 Message-Id: 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 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 defined as part of ops_generic_v2. Signed-off-by: Amit Kucheria Reviewed-by: Bjorn Andersson Tested-by: Matthias Kaehlcke Reviewed-by: Douglas Anderson --- drivers/thermal/qcom/tsens-v2.c | 5 +++++ drivers/thermal/qcom/tsens.c | 3 +++ drivers/thermal/qcom/tsens.h | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c index 44d3736..f40150f 100644 --- a/drivers/thermal/qcom/tsens-v2.c +++ b/drivers/thermal/qcom/tsens-v2.c @@ -69,6 +69,11 @@ 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..a2c9bfa 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,tsens-v2", + .data = &data_tsens_v2, }, {} }; diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h index d785b37..14331eb 100644 --- a/drivers/thermal/qcom/tsens.h +++ b/drivers/thermal/qcom/tsens.h @@ -88,6 +88,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__ */