From: Ansuel Smith <ansuelsmth@gmail.com>
To: Amit Kucheria <amitk@kernel.org>
Cc: Ansuel Smith <ansuelsmth@gmail.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Zhang Rui <rui.zhang@intel.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Rob Herring <robh+dt@kernel.org>,
linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v10 4/8] drivers: thermal: tsens: Use init_common for msm8960
Date: Wed, 17 Feb 2021 20:40:06 +0100 [thread overview]
Message-ID: <20210217194011.22649-5-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20210217194011.22649-1-ansuelsmth@gmail.com>
Use init_common and drop custom init for msm8960.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/thermal/qcom/tsens-8960.c | 52 +------------------------------
1 file changed, 1 insertion(+), 51 deletions(-)
diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
index 3f4fc1ffe679..86585f439985 100644
--- a/drivers/thermal/qcom/tsens-8960.c
+++ b/drivers/thermal/qcom/tsens-8960.c
@@ -173,56 +173,6 @@ static void disable_8960(struct tsens_priv *priv)
regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl);
}
-static int init_8960(struct tsens_priv *priv)
-{
- int ret, i;
- u32 reg_cntl;
-
- priv->tm_map = dev_get_regmap(priv->dev, NULL);
- if (!priv->tm_map)
- return -ENODEV;
-
- /*
- * The status registers for each sensor are discontiguous
- * because some SoCs have 5 sensors while others have more
- * but the control registers stay in the same place, i.e
- * directly after the first 5 status registers.
- */
- for (i = 0; i < priv->num_sensors; i++) {
- if (i >= 5)
- priv->sensor[i].status = S0_STATUS_ADDR + 40;
- priv->sensor[i].status += i * 4;
- }
-
- reg_cntl = SW_RST;
- ret = regmap_update_bits(priv->tm_map, CNTL_ADDR, SW_RST, reg_cntl);
- if (ret)
- return ret;
-
- if (priv->num_sensors > 1) {
- reg_cntl |= SLP_CLK_ENA | (MEASURE_PERIOD << 18);
- reg_cntl &= ~SW_RST;
- ret = regmap_update_bits(priv->tm_map, CONFIG_ADDR,
- CONFIG_MASK, CONFIG);
- } else {
- reg_cntl |= SLP_CLK_ENA_8660 | (MEASURE_PERIOD << 16);
- reg_cntl &= ~CONFIG_MASK_8660;
- reg_cntl |= CONFIG_8660 << CONFIG_SHIFT_8660;
- }
-
- reg_cntl |= GENMASK(priv->num_sensors - 1, 0) << SENSOR0_SHIFT;
- ret = regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl);
- if (ret)
- return ret;
-
- reg_cntl |= EN;
- ret = regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl);
- if (ret)
- return ret;
-
- return 0;
-}
-
static int calibrate_8960(struct tsens_priv *priv)
{
int i;
@@ -346,7 +296,7 @@ static const struct reg_field tsens_8960_regfields[MAX_REGFIELDS] = {
};
static const struct tsens_ops ops_8960 = {
- .init = init_8960,
+ .init = init_common,
.calibrate = calibrate_8960,
.get_temp = get_temp_8960,
.enable = enable_8960,
--
2.30.0
next prev parent reply other threads:[~2021-02-18 0:57 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-17 19:40 [PATCH v10 0/8] Add support for ipq8064 tsens Ansuel Smith
2021-02-17 19:40 ` [PATCH v10 1/8] drivers: thermal: tsens: Add VER_0 tsens version Ansuel Smith
2021-03-18 21:15 ` Thara Gopinath
2021-02-17 19:40 ` [PATCH v10 2/8] drivers: thermal: tsens: Don't hardcode sensor slope Ansuel Smith
2021-03-18 21:15 ` Thara Gopinath
2021-02-17 19:40 ` [PATCH v10 3/8] drivers: thermal: tsens: Convert msm8960 to reg_field Ansuel Smith
2021-03-18 21:15 ` Thara Gopinath
2021-02-17 19:40 ` Ansuel Smith [this message]
2021-03-18 21:15 ` [PATCH v10 4/8] drivers: thermal: tsens: Use init_common for msm8960 Thara Gopinath
2021-02-17 19:40 ` [PATCH v10 5/8] drivers: thermal: tsens: Fix bug in sensor enable " Ansuel Smith
2021-03-18 21:15 ` Thara Gopinath
2021-02-17 19:40 ` [PATCH v10 6/8] drivers: thermal: tsens: Use get_temp_common " Ansuel Smith
2021-03-18 21:15 ` Thara Gopinath
2021-02-17 19:40 ` [PATCH v10 7/8] drivers: thermal: tsens: Add support for ipq8064-tsens Ansuel Smith
2021-03-18 21:14 ` Thara Gopinath
2021-02-17 19:40 ` [PATCH v10 8/8] dt-bindings: thermal: tsens: Document ipq8064 bindings Ansuel Smith
2021-03-05 15:24 ` Rob Herring
2021-03-10 12:19 ` [PATCH v10 0/8] Add support for ipq8064 tsens Daniel Lezcano
2021-03-10 13:32 ` Thara Gopinath
2021-03-10 13:40 ` Daniel Lezcano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210217194011.22649-5-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=agross@kernel.org \
--cc=amitk@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.