* [PATCH v2 0/5] thermal: tsens: Prepare for version 2 of TSENS IP @ 2018-06-12 10:54 Amit Kucheria 2018-06-12 10:54 ` [PATCH v2 2/5] dt: qcom: 8996: thermal: Move to DT initialisation Amit Kucheria 0 siblings, 1 reply; 4+ messages in thread From: Amit Kucheria @ 2018-06-12 10:54 UTC (permalink / raw) To: linux-arm-kernel This series is a mixed bag: Some code moves to deal with version 2 of the TSENS IP in common functions, new platform support (sdm845), a cleanup patch and a DT change to have a common way to deal with the SROT and TM registers despite slightly different features across the IP family and different register offsets. I can merge the tsens-8996.c and tsens-sdm845.c files into a tsens-v2.c if desired. Changes since v1: - Move get_temp() from tsens-8996 to tsens-common and rename - Change 8996 DT entry to allow init_common() to work across sdm845 and 8996 due to different offsets Amit Kucheria (5): thermal: tsens: Get rid of unused fields in structure dt: qcom: 8996: thermal: Move to DT initialisation thermal: tsens: Move 8996 get_temp() to common code for reuse thermal: tsens: Add support for SDM845 thermal: tsens: Check if we have valid data before reading .../devicetree/bindings/thermal/qcom-tsens.txt | 1 + arch/arm64/boot/dts/qcom/msm8996.dtsi | 12 +++- drivers/thermal/qcom/Makefile | 2 +- drivers/thermal/qcom/tsens-8996.c | 74 +------------------- drivers/thermal/qcom/tsens-common.c | 78 +++++++++++++++++++--- drivers/thermal/qcom/tsens-sdm845.c | 15 +++++ drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 8 ++- 8 files changed, 107 insertions(+), 86 deletions(-) create mode 100644 drivers/thermal/qcom/tsens-sdm845.c -- 2.7.4 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 2/5] dt: qcom: 8996: thermal: Move to DT initialisation 2018-06-12 10:54 [PATCH v2 0/5] thermal: tsens: Prepare for version 2 of TSENS IP Amit Kucheria @ 2018-06-12 10:54 ` Amit Kucheria 2018-06-12 19:35 ` Bjorn Andersson 0 siblings, 1 reply; 4+ messages in thread From: Amit Kucheria @ 2018-06-12 10:54 UTC (permalink / raw) To: linux-arm-kernel We also split up the regmap address space into two, one for the TM registers, the other for the SROT registers. This was required to deal with different address offsets for the TM and SROT registers across different SoC families. Since tsens-common.c/init_common() currently only registers one address space, the order is important (TM before SROT).This is OK since the code doesn't really use the SROT functionality yet. Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> --- arch/arm64/boot/dts/qcom/msm8996.dtsi | 12 +++++++++++- drivers/thermal/qcom/tsens-8996.c | 1 - 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 410ae78..b4aab18 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -451,7 +451,17 @@ tsens0: thermal-sensor at 4a8000 { compatible = "qcom,msm8996-tsens"; - reg = <0x4a8000 0x2000>; + reg = <0x4a9000 0x1000>, /* TM */ + <0x4a8000 0x1000>; /* SROT */ + #qcom,sensors = <13>; + #thermal-sensor-cells = <1>; + }; + + tsens1: thermal-sensor at 4ac000 { + compatible = "qcom,msm8996-tsens"; + reg = <0x4ad000 0x1000>, /* TM */ + <0x4ac000 0x1000>; /* SROT */ + #qcom,sensors = <8>; #thermal-sensor-cells = <1>; }; diff --git a/drivers/thermal/qcom/tsens-8996.c b/drivers/thermal/qcom/tsens-8996.c index e1f7781..6e59078 100644 --- a/drivers/thermal/qcom/tsens-8996.c +++ b/drivers/thermal/qcom/tsens-8996.c @@ -79,6 +79,5 @@ static const struct tsens_ops ops_8996 = { }; const struct tsens_data data_8996 = { - .num_sensors = 13, .ops = &ops_8996, }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/5] dt: qcom: 8996: thermal: Move to DT initialisation 2018-06-12 10:54 ` [PATCH v2 2/5] dt: qcom: 8996: thermal: Move to DT initialisation Amit Kucheria @ 2018-06-12 19:35 ` Bjorn Andersson 2018-06-13 8:13 ` Amit Kucheria 0 siblings, 1 reply; 4+ messages in thread From: Bjorn Andersson @ 2018-06-12 19:35 UTC (permalink / raw) To: linux-arm-kernel On Tue 12 Jun 03:54 PDT 2018, Amit Kucheria wrote: > We also split up the regmap address space into two, one for the TM > registers, the other for the SROT registers. This was required to deal with > different address offsets for the TM and SROT registers across different > SoC families. > > Since tsens-common.c/init_common() currently only registers one address space, the order is important (TM before SROT).This is OK since the code doesn't really use the SROT functionality yet. Please line wrap this. > > Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> > --- > arch/arm64/boot/dts/qcom/msm8996.dtsi | 12 +++++++++++- > drivers/thermal/qcom/tsens-8996.c | 1 - > 2 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi > index 410ae78..b4aab18 100644 > --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi > +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi > @@ -451,7 +451,17 @@ > > tsens0: thermal-sensor at 4a8000 { > compatible = "qcom,msm8996-tsens"; > - reg = <0x4a8000 0x2000>; > + reg = <0x4a9000 0x1000>, /* TM */ > + <0x4a8000 0x1000>; /* SROT */ > + #qcom,sensors = <13>; > + #thermal-sensor-cells = <1>; > + }; > + > + tsens1: thermal-sensor at 4ac000 { > + compatible = "qcom,msm8996-tsens"; > + reg = <0x4ad000 0x1000>, /* TM */ > + <0x4ac000 0x1000>; /* SROT */ > + #qcom,sensors = <8>; > #thermal-sensor-cells = <1>; > }; > > diff --git a/drivers/thermal/qcom/tsens-8996.c b/drivers/thermal/qcom/tsens-8996.c > index e1f7781..6e59078 100644 > --- a/drivers/thermal/qcom/tsens-8996.c > +++ b/drivers/thermal/qcom/tsens-8996.c > @@ -79,6 +79,5 @@ static const struct tsens_ops ops_8996 = { > }; > > const struct tsens_data data_8996 = { > - .num_sensors = 13, This will cause the current 8996 dts to fail probing the tsens. I think you should just leave this as is, because specifying qcom,sensors in dts will overwrite this number regardless. It also would make this change dts specific, which is convenient as it breaks the interdependency between the different subsystems. > .ops = &ops_8996, Regards, Bjorn ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 2/5] dt: qcom: 8996: thermal: Move to DT initialisation 2018-06-12 19:35 ` Bjorn Andersson @ 2018-06-13 8:13 ` Amit Kucheria 0 siblings, 0 replies; 4+ messages in thread From: Amit Kucheria @ 2018-06-13 8:13 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jun 12, 2018 at 10:35 PM, Bjorn Andersson <bjorn.andersson@linaro.org> wrote: > On Tue 12 Jun 03:54 PDT 2018, Amit Kucheria wrote: > >> We also split up the regmap address space into two, one for the TM >> registers, the other for the SROT registers. This was required to deal with >> different address offsets for the TM and SROT registers across different >> SoC families. >> >> Since tsens-common.c/init_common() currently only registers one address space, the order is important (TM before SROT).This is OK since the code doesn't really use the SROT functionality yet. > > Please line wrap this. > >> >> Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org> >> --- >> arch/arm64/boot/dts/qcom/msm8996.dtsi | 12 +++++++++++- >> drivers/thermal/qcom/tsens-8996.c | 1 - >> 2 files changed, 11 insertions(+), 2 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi >> index 410ae78..b4aab18 100644 >> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi >> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi >> @@ -451,7 +451,17 @@ >> >> tsens0: thermal-sensor at 4a8000 { >> compatible = "qcom,msm8996-tsens"; >> - reg = <0x4a8000 0x2000>; >> + reg = <0x4a9000 0x1000>, /* TM */ >> + <0x4a8000 0x1000>; /* SROT */ >> + #qcom,sensors = <13>; >> + #thermal-sensor-cells = <1>; >> + }; >> + >> + tsens1: thermal-sensor at 4ac000 { >> + compatible = "qcom,msm8996-tsens"; >> + reg = <0x4ad000 0x1000>, /* TM */ >> + <0x4ac000 0x1000>; /* SROT */ >> + #qcom,sensors = <8>; >> #thermal-sensor-cells = <1>; >> }; >> >> diff --git a/drivers/thermal/qcom/tsens-8996.c b/drivers/thermal/qcom/tsens-8996.c >> index e1f7781..6e59078 100644 >> --- a/drivers/thermal/qcom/tsens-8996.c >> +++ b/drivers/thermal/qcom/tsens-8996.c >> @@ -79,6 +79,5 @@ static const struct tsens_ops ops_8996 = { >> }; >> >> const struct tsens_data data_8996 = { >> - .num_sensors = 13, > > This will cause the current 8996 dts to fail probing the tsens. I think > you should just leave this as is, because specifying qcom,sensors in dts > will overwrite this number regardless. Ack, I didn't consider backword compatility of the code with the current dts. Will fix. > It also would make this change dts specific, which is convenient as it > breaks the interdependency between the different subsystems. > >> .ops = &ops_8996, > > Regards, > Bjorn ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-06-13 8:13 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-06-12 10:54 [PATCH v2 0/5] thermal: tsens: Prepare for version 2 of TSENS IP Amit Kucheria 2018-06-12 10:54 ` [PATCH v2 2/5] dt: qcom: 8996: thermal: Move to DT initialisation Amit Kucheria 2018-06-12 19:35 ` Bjorn Andersson 2018-06-13 8:13 ` Amit Kucheria
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).