lkml.org 
[lkml]   [2018]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v1 01/10] arm/arm64: dts: msm8974/msm8916: thermal: Split address space into two
    hello,

    On Thu, Aug 09, 2018 at 06:02:33PM +0530, Amit Kucheria wrote:
    > We've earlier added support to split the register address space into TM
    > and SROT regions.
    >
    > Split up the regmap address space into two for the remaining platforms that
    > have a similar register layout and make corresponding changes to the
    > get_temp_common() function used by these platforms.
    >
    > 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/arm/boot/dts/qcom-msm8974.dtsi | 6 ++++--
    > arch/arm64/boot/dts/qcom/msm8916.dtsi | 6 ++++--



    > drivers/thermal/qcom/tsens-common.c | 5 +++--


    Can you please resend this with two separate patches, one with
    the driver changes another for the dts(i) changes. Just that
    I prefer taking only the driver changes once accepting the
    dts changes. Makes merging easier to avoid conflicts when sending
    pulls.

    Thanks.
    > 3 files changed, 11 insertions(+), 6 deletions(-)
    >
    > diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
    > index d9019a49b292..3c4b81c29798 100644
    > --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
    > +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
    > @@ -427,11 +427,13 @@
    > };
    > };
    >
    > - tsens: thermal-sensor@fc4a8000 {
    > + tsens: thermal-sensor@fc4a9000 {
    > compatible = "qcom,msm8974-tsens";
    > - reg = <0xfc4a8000 0x2000>;
    > + reg = <0xfc4a9000 0x1000>, /* TM */
    > + <0xfc4a8000 0x1000>; /* SROT */
    > nvmem-cells = <&tsens_calib>, <&tsens_backup>;
    > nvmem-cell-names = "calib", "calib_backup";
    > + #qcom,sensors = <11>;
    > #thermal-sensor-cells = <1>;
    > };
    >
    > diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
    > index cc1040eacdf5..abf84df5a7bc 100644
    > --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
    > +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
    > @@ -774,11 +774,13 @@
    > };
    > };
    >
    > - tsens: thermal-sensor@4a8000 {
    > + tsens: thermal-sensor@4a9000 {
    > compatible = "qcom,msm8916-tsens";
    > - reg = <0x4a8000 0x2000>;
    > + reg = <0x4a9000 0x1000>, /* TM */
    > + <0x4a8000 0x1000>; /* SROT */
    > nvmem-cells = <&tsens_caldata>, <&tsens_calsel>;
    > nvmem-cell-names = "calib", "calib_sel";
    > + #qcom,sensors = <5>;
    > #thermal-sensor-cells = <1>;
    > };
    >
    > diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
    > index 6207d8d92351..478739543bbc 100644
    > --- a/drivers/thermal/qcom/tsens-common.c
    > +++ b/drivers/thermal/qcom/tsens-common.c
    > @@ -21,7 +21,7 @@
    > #include <linux/regmap.h>
    > #include "tsens.h"
    >
    > -#define S0_ST_ADDR 0x1030
    > +#define STATUS_OFFSET 0x30
    > #define SN_ADDR_OFFSET 0x4
    > #define SN_ST_TEMP_MASK 0x3ff
    > #define CAL_DEGC_PT1 30
    > @@ -107,8 +107,9 @@ int get_temp_common(struct tsens_device *tmdev, int id, int *temp)
    > unsigned int status_reg;
    > int last_temp = 0, ret;
    >
    > - status_reg = S0_ST_ADDR + s->hw_id * SN_ADDR_OFFSET;
    > + status_reg = tmdev->tm_offset + STATUS_OFFSET + s->hw_id * SN_ADDR_OFFSET;
    > ret = regmap_read(tmdev->map, status_reg, &code);
    > +
    > if (ret)
    > return ret;
    > last_temp = code & SN_ST_TEMP_MASK;
    > --
    > 2.17.1
    >

    \
     
     \ /
      Last update: 2018-08-25 01:22    [W:4.039 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site