From: Matthias Kaehlcke <mka@chromium.org>
To: Amit Kucheria <amit.kucheria@linaro.org>
Cc: linux-kernel@vger.kernel.org, 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, Zhang Rui <rui.zhang@intel.com>,
linux-pm@vger.kernel.org
Subject: Re: [PATCH v7 2/7] thermal: tsens: Add support to split up register address space into two
Date: Tue, 17 Jul 2018 16:29:07 -0700 [thread overview]
Message-ID: <20180717232907.GC129942@google.com> (raw)
In-Reply-To: <8f833fee80565c4dfd381697e47f99fb5f9e65d3.1531384019.git.amit.kucheria@linaro.org>
On Thu, Jul 12, 2018 at 02:09:03PM +0530, Amit Kucheria wrote:
> There are two banks of registers for v2 TSENS IPs: SROT and TM. On older
> SoCs these were contiguous, leading to DTs mapping them as one register
> address space of size 0x2000. In newer SoCs, these two banks are not
> contiguous anymore.
>
> Add logic to init_common() to differentiate between old and new DTs and
> adjust associated offsets for the TM register bank so that the old DTs will
> continue to function correctly.
>
> Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> Tested-by: Matthias Kaehlcke <mka@chromium.org>
> ---
> drivers/thermal/qcom/tsens-8996.c | 4 ++--
> drivers/thermal/qcom/tsens-common.c | 12 ++++++++++++
> drivers/thermal/qcom/tsens.h | 1 +
> 3 files changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/thermal/qcom/tsens-8996.c b/drivers/thermal/qcom/tsens-8996.c
> index e1f7781..3e60cec 100644
> --- a/drivers/thermal/qcom/tsens-8996.c
> +++ b/drivers/thermal/qcom/tsens-8996.c
> @@ -16,7 +16,7 @@
> #include <linux/regmap.h>
> #include "tsens.h"
>
> -#define STATUS_OFFSET 0x10a0
> +#define STATUS_OFFSET 0xa0
> #define LAST_TEMP_MASK 0xfff
> #define STATUS_VALID_BIT BIT(21)
> #define CODE_SIGN_BIT BIT(11)
> @@ -28,7 +28,7 @@ static int get_temp_8996(struct tsens_device *tmdev, int id, int *temp)
> unsigned int sensor_addr;
> int last_temp = 0, last_temp2 = 0, last_temp3 = 0, ret;
>
> - sensor_addr = STATUS_OFFSET + s->hw_id * 4;
> + sensor_addr = tmdev->tm_offset + STATUS_OFFSET + s->hw_id * 4;
> ret = regmap_read(tmdev->map, sensor_addr, &code);
> if (ret)
> return ret;
> diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
> index b1449ad..c22dc18 100644
> --- a/drivers/thermal/qcom/tsens-common.c
> +++ b/drivers/thermal/qcom/tsens-common.c
> @@ -16,6 +16,7 @@
> #include <linux/io.h>
> #include <linux/nvmem-consumer.h>
> #include <linux/of_address.h>
> +#include <linux/of_platform.h>
> #include <linux/platform_device.h>
> #include <linux/regmap.h>
> #include "tsens.h"
> @@ -126,11 +127,22 @@ static const struct regmap_config tsens_config = {
> int __init init_common(struct tsens_device *tmdev)
> {
> void __iomem *base;
> + struct platform_device *op = of_find_device_by_node(tmdev->dev->of_node);
>
> + if (!op)
> + return -EINVAL;
> base = of_iomap(tmdev->dev->of_node, 0);
> if (!base)
> return -EINVAL;
>
> + /* The driver only uses the TM register address space for now */
> + if (op->num_resources > 1) {
> + tmdev->tm_offset = 0;
> + } else {
> + /* old DTs where SROT and TM were in a contiguous 2K block */
> + tmdev->tm_offset = 0x1000;
> + }
nit: no curly braces for conditionals with a single statement. There
is probably no need to respin just for this though.
Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
next prev parent reply other threads:[~2018-07-17 23:29 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-12 8:39 [PATCH v7 0/7] thermal: tsens: Refactoring for TSENSv2 IP Amit Kucheria
2018-07-12 8:39 ` [PATCH v7 1/7] thermal: tsens: Get rid of unused fields in structure Amit Kucheria
2018-07-12 8:39 ` [PATCH v7 2/7] thermal: tsens: Add support to split up register address space into two Amit Kucheria
2018-07-12 17:12 ` Doug Anderson
2018-07-17 23:29 ` Matthias Kaehlcke [this message]
2018-07-18 3:42 ` Amit Kucheria
2018-07-12 8:39 ` [PATCH v7 3/7] arm64: dts: msm8996: thermal: Initialise via DT and add second controller Amit Kucheria
2018-07-12 17:14 ` Doug Anderson
2018-07-17 23:42 ` Matthias Kaehlcke
2018-07-17 23:55 ` Doug Anderson
2018-07-17 23:58 ` Matthias Kaehlcke
2018-07-12 8:39 ` [PATCH v7 4/7] thermal: tsens: Rename tsens-8996 to tsens-v2 for reuse Amit Kucheria
2018-07-12 17:19 ` Doug Anderson
2018-07-17 23:54 ` Matthias Kaehlcke
2018-07-12 8:39 ` [PATCH v7 5/7] dt: thermal: tsens: Document the fallback DT property for v2 of TSENS IP Amit Kucheria
2018-07-12 17:15 ` Doug Anderson
2018-07-18 0:09 ` Matthias Kaehlcke
2018-07-18 6:42 ` Amit Kucheria
2018-07-12 8:39 ` [PATCH v7 6/7] thermal: tsens: Add generic support for TSENS v2 IP Amit Kucheria
2018-07-12 17:16 ` Doug Anderson
2018-07-12 8:39 ` [PATCH v7 7/7] arm64: dts: sdm845: Add tsens nodes Amit Kucheria
2018-07-12 17:18 ` Doug Anderson
2018-07-18 0:15 ` Matthias Kaehlcke
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=20180717232907.GC129942@google.com \
--to=mka@chromium.org \
--cc=amit.kucheria@linaro.org \
--cc=andy.gross@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=dianders@chromium.org \
--cc=edubezval@gmail.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rnayak@codeaurora.org \
--cc=rui.zhang@intel.com \
--cc=smohanad@codeaurora.org \
--cc=vivek.gautam@codeaurora.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).