From patchwork Thu Jul 12 08:39: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: 10521315 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 1836B602C8 for ; Thu, 12 Jul 2018 08:40:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB1262957B for ; Thu, 12 Jul 2018 08:40:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF2E8295CB; Thu, 12 Jul 2018 08:40:30 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 61E24295C5 for ; Thu, 12 Jul 2018 08:40:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732359AbeGLItE (ORCPT ); Thu, 12 Jul 2018 04:49:04 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35704 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725845AbeGLItD (ORCPT ); Thu, 12 Jul 2018 04:49:03 -0400 Received: by mail-wm0-f68.google.com with SMTP id v3-v6so5141674wmh.0 for ; Thu, 12 Jul 2018 01:40:27 -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=vbAo4YPMYQgk6zgSFWvnv30sIR33ZaQ7TfJtCgG/Otw=; b=ScWUq/gloUeYlWyNN6xomryUM3I6GoUtc6E5mtv6tj6cP1pax2GRMfy71Za/UyRL/J oaDyoDRAPfEMtuLaa+CbGp/rPFk6xO9wZ6TNo5RjCKj/RO4lawt1DN1O8HvaoGAaRG1q yMR/dpzOF4wOVzJOtcxwzojyYnjblyGyziX0o= 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=vbAo4YPMYQgk6zgSFWvnv30sIR33ZaQ7TfJtCgG/Otw=; b=btvS/XXhFeVxatEM7rg85QGU+1MFPL30V6E4l9/Vwjo7xt3zjlcaO9wQ1wGHOUfyKU JDVbO8WVttiVxwoAyLsFOOed3ubgCby9MzDt96/O1UI8ddPdrQTxevhtgfzfqymWryOz UvHqOoyjTf9A1G1T95KtsjbOUa4kyhkMTEv6GUEWwyENGMskqhAN4RvL5CFo2BHr+wIo kgcCtRajzRPNsrtlke5upeu24C778Gs9JktRGWA+BPr5QfblP408kXzQVWUJrtQ+bjp/ E2xy20DYd+/XY/mxWefxC5XmGth+czW4l99rKbKG5vieItN+5J38LSF5ln1ctu0KvgXX XQ0A== X-Gm-Message-State: AOUpUlHPufeuTH58eiw09lOwwCsNulPiJF0CaQSzBick52M1VCU6+cc4 EPM79OPEM/Chg3RRTT1bU0GeYA== X-Google-Smtp-Source: AAOMgpdR3ARENGWUdkWDVhsUJws5tCs2qgSJMsQhOhyKI30hRH23c1wb0KeVfwzSPG+Oab26f6nvaQ== X-Received: by 2002:a1c:ac84:: with SMTP id v126-v6mr709276wme.32.1531384826945; Thu, 12 Jul 2018 01:40:26 -0700 (PDT) Received: from localhost ([103.249.91.93]) by smtp.gmail.com with ESMTPSA id u4-v6sm21762797wro.12.2018.07.12.01.40.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jul 2018 01:40:26 -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 , Rob Herring , Kees Cook , linux-pm@vger.kernel.org Subject: [PATCH v7 6/7] thermal: tsens: Add generic support for TSENS v2 IP Date: Thu, 12 Jul 2018 14:09:07 +0530 Message-Id: <34de426540a878bf77a77dd2c42a16678d6545a7.1531384019.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: In-Reply-To: References: Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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__ */