From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751543AbeFDEZi (ORCPT ); Mon, 4 Jun 2018 00:25:38 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:53582 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750779AbeFDEZg (ORCPT ); Mon, 4 Jun 2018 00:25:36 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org F0B7460263 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=rnayak@codeaurora.org Subject: Re: [PATCH 1/2] thermal: tsens: Add support for SDM845 platform To: Amit Kucheria , linux-arm-msm@vger.kernel.org Cc: bjorn.andersson@linaro.org, edubezval@gmail.com, Zhang Rui , Rob Herring , Mark Rutland , "open list:THERMAL" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , open list References: <7a0f33cff94f41110bdbff14d28d36074fae2a7d.1527937396.git.amit.kucheria@linaro.org> From: Rajendra Nayak Message-ID: <31b21293-ae00-0146-c196-6c8e964473f9@codeaurora.org> Date: Mon, 4 Jun 2018 09:55:28 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <7a0f33cff94f41110bdbff14d28d36074fae2a7d.1527937396.git.amit.kucheria@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/02/2018 04:41 PM, Amit Kucheria wrote: > There are two tsens blocks on the SDM845. These will be configured through > the devicetree. > > Signed-off-by: Amit Kucheria > --- > .../devicetree/bindings/thermal/qcom-tsens.txt | 1 + > drivers/thermal/qcom/Makefile | 2 +- > drivers/thermal/qcom/tsens-sdm845.c | 98 ++++++++++++++++++++++ > drivers/thermal/qcom/tsens.c | 3 + > drivers/thermal/qcom/tsens.h | 1 + > 5 files changed, 104 insertions(+), 1 deletion(-) > create mode 100644 drivers/thermal/qcom/tsens-sdm845.c > > diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt > index 292ed89..8652499 100644 > --- a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt > +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt > @@ -5,6 +5,7 @@ Required properties: > - "qcom,msm8916-tsens" : For 8916 Family of SoCs > - "qcom,msm8974-tsens" : For 8974 Family of SoCs > - "qcom,msm8996-tsens" : For 8996 Family of SoCs > + - "qcom,sdm845-tsens" : For SDM845 Family of SoCs > > - reg: Address range of the thermal registers > - #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description. > diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile > index 2cc2193..dc9f169 100644 > --- a/drivers/thermal/qcom/Makefile > +++ b/drivers/thermal/qcom/Makefile > @@ -1,2 +1,2 @@ > obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o > -qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-8996.o > +qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-8996.o tsens-sdm845.o > diff --git a/drivers/thermal/qcom/tsens-sdm845.c b/drivers/thermal/qcom/tsens-sdm845.c > new file mode 100644 > index 0000000..5d78f0b > --- /dev/null > +++ b/drivers/thermal/qcom/tsens-sdm845.c > @@ -0,0 +1,98 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (c) 2018, Linaro Limited > + */ > + > +#include > +#include > +#include > +#include "tsens.h" > + > +#define CNTL_OFFSET 4 > +/* CNTL_OFFSET bitmasks */ > +#define EN BIT(0) > +#define SW_RST BIT(1) > + > +#define SENSOR0_SHIFT 3 > + > +#define TRDY_OFFSET 0xe4 > +#define TRDY_READY_BIT BIT(1) > + > +#define STATUS_OFFSET 0xa0 > +#define LAST_TEMP_MASK 0xfff > +#define STATUS_VALID_BIT BIT(21) > +#define CODE_SIGN_BIT BIT(11) > + > +static int get_temp_sdm845(struct tsens_device *tmdev, int id, int *temp) > +{ > + struct tsens_sensor *s = &tmdev->sensor[id]; > + u32 code; > + unsigned int sensor_addr; > + int last_temp = 0, last_temp2 = 0, last_temp3 = 0, ret; > + > + ret = regmap_read(tmdev->map, TRDY_OFFSET, &code); > + if (ret) > + return ret; > + if (code & TRDY_READY_BIT) > + return -ENODATA; > + > + sensor_addr = STATUS_OFFSET + s->hw_id * 4; > + ret = regmap_read(tmdev->map, sensor_addr, &code); > + if (ret) > + return ret; > + last_temp = code & LAST_TEMP_MASK; > + if (code & STATUS_VALID_BIT) > + goto done; > + > + /* Try a second time */ > + ret = regmap_read(tmdev->map, sensor_addr, &code); > + if (ret) > + return ret; > + if (code & STATUS_VALID_BIT) { > + last_temp = code & LAST_TEMP_MASK; > + goto done; > + } else { > + last_temp2 = code & LAST_TEMP_MASK; > + } > + > + /* Try a third/last time */ > + ret = regmap_read(tmdev->map, sensor_addr, &code); > + if (ret) > + return ret; > + if (code & STATUS_VALID_BIT) { > + last_temp = code & LAST_TEMP_MASK; > + goto done; > + } else { > + last_temp3 = code & LAST_TEMP_MASK; > + } > + > + if (last_temp == last_temp2) > + last_temp = last_temp2; > + else if (last_temp2 == last_temp3) > + last_temp = last_temp3; > +done: > + /* Code sign bit is the sign extension for a negative value */ > + if (last_temp & CODE_SIGN_BIT) > + last_temp |= ~CODE_SIGN_BIT; > + > + /* Temperatures are in deciCelicius */ > + *temp = last_temp * 100; This looks the same as what we do for 8996. Does it make sense to move this to tsens-common and reuse in both 8996 and 845? > + > + return 0; > +} > + > +static const struct regmap_config tsens_config = { > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > +}; > + > + > +static const struct tsens_ops ops_sdm845 = { > + .init = init_common, > + .get_temp = get_temp_sdm845, > +}; > + > +const struct tsens_data data_sdm845 = { > + .ops = &ops_sdm845, > +}; > diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c > index 3f9fe6a..314a20f 100644 > --- a/drivers/thermal/qcom/tsens.c > +++ b/drivers/thermal/qcom/tsens.c > @@ -72,6 +72,9 @@ static const struct of_device_id tsens_table[] = { > }, { > .compatible = "qcom,msm8996-tsens", > .data = &data_8996, > + }, { > + .compatible = "qcom,sdm845-tsens", > + .data = &data_sdm845, > }, > {} > }; > diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h > index 911c197..f15660d 100644 > --- a/drivers/thermal/qcom/tsens.h > +++ b/drivers/thermal/qcom/tsens.h > @@ -90,5 +90,6 @@ int init_common(struct tsens_device *); > int get_temp_common(struct tsens_device *, int, int *); > > extern const struct tsens_data data_8916, data_8974, data_8960, data_8996; > +extern const struct tsens_data data_sdm845; > > #endif /* __QCOM_TSENS_H__ */ > -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation