From patchwork Thu Feb 28 12:21:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 10832929 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 74B4117E9 for ; Thu, 28 Feb 2019 12:27:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67C9F2EC05 for ; Thu, 28 Feb 2019 12:27:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BDA12EC21; Thu, 28 Feb 2019 12:27:42 +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 04DB82EC05 for ; Thu, 28 Feb 2019 12:27:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731571AbfB1M1f (ORCPT ); Thu, 28 Feb 2019 07:27:35 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:37443 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731669AbfB1M1e (ORCPT ); Thu, 28 Feb 2019 07:27:34 -0500 Received: by mail-wm1-f65.google.com with SMTP id x10so8682176wmg.2 for ; Thu, 28 Feb 2019 04:27:33 -0800 (PST) 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=CfWghgV1RK0L2tcup/p41zKc8qLLDQNa3EIDdIC0c4k=; b=itToNH34dv/FNuiFrwtUZfaVgZuc6mR6JycBLuO6WmYYwFlLdWCap+YxOkoiIvL/Cm Rmbslj+pfTiLu6OYKKMPx6qD/3Gw/dfrFRdlbDFanlqVvGCUsuVvnaFk4pi+mRGObHUX X2Y5/7Xyg49pG++0IPgeF/spcTfhQmG8vuWsz8W2cv0TjmywdHZnEmkhrLWEUjIhe0dO EEJIysryMBqRAyDFXkk2vCMzR/X21/3omezosBN2rsnfsh3P3VdTpMi2DBGtVSUkgZAx ep07YZJ8QWvUHVFwvtq3TTZZ8XYFYMDLY+uoKzeUr84ui7CdoTal9a5eom1F43bZazzi dGmA== 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=CfWghgV1RK0L2tcup/p41zKc8qLLDQNa3EIDdIC0c4k=; b=C2UgKEWUh4ykkjsuQ+ztxtp5tmq8BBO5MkrffqqFO7ElvZ5wL0+Gm075xeHhwYPadL ekDzH9wiiNU34DQahVU3Dc+/c0nlUZdazuskkkf2F4gUniKeYj2whfHzhkPerS9+f8/J 16juvDM0hauC+nol6NS3J5g7aCdyF9kQuCNxhIUuOlBoxYagqe5OKCeNFEcCJ2aRptZC zWJTgbRuBErBq9QDuOtBv2jZdZZ2Uht/uONPDpXfPkyREW77kCrHOsDHuEhFXcN5AELo OlfbFNO8p4xiIMHlB9g9NgQBhuFuXD8TC4dFT76TymG8QFta+/Aof4nquwTK3qU9kNTP 6Gyw== X-Gm-Message-State: AHQUAubkng81dpecR8D0LFTX7mZ9CVvS8QrQqb8riNf7m0Js34wr4X7x f573FvHhbmf9M+57VL21E0xHNg== X-Google-Smtp-Source: AHgI3IYaqGtafzzyrzp1ANso5Ig9dc7sZ9IW5lFkCUg3X1u7zjmMnXseHATTDA1jHN3x+vZj9TH38g== X-Received: by 2002:a1c:790b:: with SMTP id l11mr2711318wme.54.1551356852837; Thu, 28 Feb 2019 04:27:32 -0800 (PST) Received: from localhost ([49.248.54.130]) by smtp.gmail.com with ESMTPSA id d9sm20694097wrn.72.2019.02.28.04.27.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 04:27:32 -0800 (PST) From: Amit Kucheria To: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, edubezval@gmail.com, andy.gross@linaro.org, Daniel Lezcano , David Brown , Zhang Rui Cc: linux-pm@vger.kernel.org Subject: [PATCH v2 16/24] drivers: thermal: tsens: Introduce IP-specific max_sensor count Date: Thu, 28 Feb 2019 17:51:06 +0530 Message-Id: X-Mailer: git-send-email 2.17.1 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 The IP can support 'm' sensors while the platform can enable 'n' sensors of the 'm' where n <= m. Track maximum sensors supported by the IP so that we can correctly track what subset of the sensors are supported on the platform. Signed-off-by: Amit Kucheria --- drivers/thermal/qcom/tsens-common.c | 4 ++-- drivers/thermal/qcom/tsens-v0_1.c | 1 + drivers/thermal/qcom/tsens-v2.c | 1 + drivers/thermal/qcom/tsens.h | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c index c58ba4c200bc..5f838fd798c3 100644 --- a/drivers/thermal/qcom/tsens-common.c +++ b/drivers/thermal/qcom/tsens-common.c @@ -197,13 +197,13 @@ int __init init_common(struct tsens_priv *priv) return PTR_ERR(priv->rf[SENSOR_EN]); /* now alloc regmap_fields in tm_map */ - for (i = 0, j = LAST_TEMP_0; i < priv->num_sensors; i++, j++) { + for (i = 0, j = LAST_TEMP_0; i < priv->feat->max_sensors; i++, j++) { priv->rf[j] = devm_regmap_field_alloc(dev, priv->tm_map, priv->fields[j]); if (IS_ERR(priv->rf[j])) return PTR_ERR(priv->rf[j]); } - for (i = 0, j = VALID_0; i < priv->num_sensors; i++, j++) { + for (i = 0, j = VALID_0; i < priv->feat->max_sensors; i++, j++) { priv->rf[j] = devm_regmap_field_alloc(dev, priv->tm_map, priv->fields[j]); if (IS_ERR(priv->rf[j])) diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c index 837e7872e512..03c0f2e11eaf 100644 --- a/drivers/thermal/qcom/tsens-v0_1.c +++ b/drivers/thermal/qcom/tsens-v0_1.c @@ -324,6 +324,7 @@ const struct tsens_features tsens_v0_1_feat = { .crit_int = 0, .adc = 1, .srot_split = 1, + .max_sensors = 11, }; /* v0.1: 8916, 8974 */ diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c index 7346bfc9efe6..55fe00f90b22 100644 --- a/drivers/thermal/qcom/tsens-v2.c +++ b/drivers/thermal/qcom/tsens-v2.c @@ -88,6 +88,7 @@ const struct tsens_features tsens_v2_feat = { .crit_int = 1, .adc = 0, .srot_split = 1, + .max_sensors = 16, }; const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = { diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h index a20725b1cc67..eb988c1d17c4 100644 --- a/drivers/thermal/qcom/tsens.h +++ b/drivers/thermal/qcom/tsens.h @@ -297,12 +297,14 @@ enum regfield_ids { * @adc: do the sensors only output adc code (instead of temperature)? * @srot_split: does the IP neatly splits the register space into SROT and TM, * with SROT only being available to secure boot firmware? + * @max_sensors: maximum sensors supported by this version of the IP */ struct tsens_features { unsigned int ver_info:1; unsigned int crit_int:1; unsigned int adc:1; unsigned int srot_split:1; + unsigned int max_sensors; }; /**