* [PATCH v5 01/11] thermal: qcom: tsens: Add a skeletal TSENS drivers
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
@ 2016-04-14 9:31 ` Rajendra Nayak
2016-04-28 0:20 ` Eduardo Valentin
2016-04-14 9:31 ` [PATCH v5 02/11] thermal: qcom: tsens-8916: Add support for 8916 family of SoCs Rajendra Nayak
` (11 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Rajendra Nayak @ 2016-04-14 9:31 UTC (permalink / raw)
To: edubezval
Cc: Rajendra Nayak, linux-pm, linux-arm-msm, punit.agrawal, sboyd,
lina.iyer, nrajan, andy.gross, rui.zhang, linux-arm-kernel
TSENS is Qualcomms' thermal temperature sensor device. It
supports reading temperatures from multiple thermal sensors
present on various QCOM SoCs.
Calibration data is generally read from a non-volatile memory
(eeprom) device.
Add a skeleton driver with all the necessary abstractions so
a variety of qcom device families which support TSENS can
add driver extensions.
Also add the required device tree bindings which can be used
to describe the TSENS device in DT.
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
Reviewed-by: Lina Iyer <lina.iyer@linaro.org>
---
.../devicetree/bindings/thermal/qcom-tsens.txt | 21 +++
drivers/thermal/Kconfig | 5 +
drivers/thermal/Makefile | 1 +
drivers/thermal/qcom/Kconfig | 11 ++
drivers/thermal/qcom/Makefile | 2 +
drivers/thermal/qcom/tsens-common.c | 135 ++++++++++++++
drivers/thermal/qcom/tsens.c | 202 +++++++++++++++++++++
drivers/thermal/qcom/tsens.h | 90 +++++++++
8 files changed, 467 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt
create mode 100644 drivers/thermal/qcom/Kconfig
create mode 100644 drivers/thermal/qcom/Makefile
create mode 100644 drivers/thermal/qcom/tsens-common.c
create mode 100644 drivers/thermal/qcom/tsens.c
create mode 100644 drivers/thermal/qcom/tsens.h
diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt
new file mode 100644
index 0000000..292ed89
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt
@@ -0,0 +1,21 @@
+* QCOM SoC Temperature Sensor (TSENS)
+
+Required properties:
+- compatible :
+ - "qcom,msm8916-tsens" : For 8916 Family of SoCs
+ - "qcom,msm8974-tsens" : For 8974 Family of SoCs
+ - "qcom,msm8996-tsens" : For 8996 Family of SoCs
+
+- reg: Address range of the thermal registers
+- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description.
+- Refer to Documentation/devicetree/bindings/nvmem/nvmem.txt to know how to specify
+nvmem cells
+
+Example:
+tsens: thermal-sensor@900000 {
+ compatible = "qcom,msm8916-tsens";
+ reg = <0x4a8000 0x2000>;
+ nvmem-cells = <&tsens_caldata>, <&tsens_calsel>;
+ nvmem-cell-names = "caldata", "calsel";
+ #thermal-sensor-cells = <1>;
+ };
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index c37eedc..463b00c 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -408,4 +408,9 @@ config QCOM_SPMI_TEMP_ALARM
real time die temperature if an ADC is present or an estimate of the
temperature based upon the over temperature stage value.
+menu "Qualcomm thermal drivers"
+depends on (ARCH_QCOM && OF) || COMPILE_TEST
+source "drivers/thermal/qcom/Kconfig"
+endmenu
+
endif
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index 8e9cbc3..3f3e72c 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -46,6 +46,7 @@ obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/
obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/
obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o
obj-$(CONFIG_ST_THERMAL) += st/
+obj-$(CONFIG_QCOM_TSENS) += qcom/
obj-$(CONFIG_TEGRA_SOCTHERM) += tegra_soctherm.o
obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o
obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o
diff --git a/drivers/thermal/qcom/Kconfig b/drivers/thermal/qcom/Kconfig
new file mode 100644
index 0000000..be32e5a
--- /dev/null
+++ b/drivers/thermal/qcom/Kconfig
@@ -0,0 +1,11 @@
+config QCOM_TSENS
+ tristate "Qualcomm TSENS Temperature Alarm"
+ depends on THERMAL
+ depends on QCOM_QFPROM
+ depends on ARCH_QCOM || COMPILE_TEST
+ help
+ This enables the thermal sysfs driver for the TSENS device. It shows
+ up in Sysfs as a thermal zone with multiple trip points. Disabling the
+ thermal zone device via the mode file results in disabling the sensor.
+ Also able to set threshold temperature for both hot and cold and update
+ when a threshold is reached.
diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile
new file mode 100644
index 0000000..2e800c5
--- /dev/null
+++ b/drivers/thermal/qcom/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o
+qcom_tsens-y += tsens.o tsens-common.o
diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
new file mode 100644
index 0000000..4bffbc1
--- /dev/null
+++ b/drivers/thermal/qcom/tsens-common.c
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/nvmem-consumer.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include "tsens.h"
+
+#define S0_ST_ADDR 0x1030
+#define SN_ADDR_OFFSET 0x4
+#define SN_ST_TEMP_MASK 0x3ff
+#define CAL_DEGC_PT1 30
+#define CAL_DEGC_PT2 120
+#define SLOPE_FACTOR 1000
+#define SLOPE_DEFAULT 3200
+
+char *qfprom_read(struct device *dev, const char *cname)
+{
+ struct nvmem_cell *cell;
+ ssize_t data;
+ char *ret;
+
+ cell = nvmem_cell_get(dev, cname);
+ if (IS_ERR(cell))
+ return ERR_CAST(cell);
+
+ ret = nvmem_cell_read(cell, &data);
+ nvmem_cell_put(cell);
+
+ return ret;
+}
+
+void compute_intercept_slope(struct tsens_device *tmdev, u32 *p1,
+ u32 *p2, u32 mode)
+{
+ int i;
+ int num, den;
+
+ for (i = 0; i < tmdev->num_sensors; i++) {
+ dev_dbg(tmdev->dev,
+ "sensor%d - data_point1:%#x data_point2:%#x\n",
+ i, p1[i], p2[i]);
+
+ tmdev->sensor[i].slope = SLOPE_DEFAULT;
+ if (mode == TWO_PT_CALIB) {
+ /*
+ * slope (m) = adc_code2 - adc_code1 (y2 - y1)/
+ * temp_120_degc - temp_30_degc (x2 - x1)
+ */
+ num = p2[i] - p1[i];
+ num *= SLOPE_FACTOR;
+ den = CAL_DEGC_PT2 - CAL_DEGC_PT1;
+ tmdev->sensor[i].slope = num / den;
+ }
+
+ tmdev->sensor[i].offset = (p1[i] * SLOPE_FACTOR) -
+ (CAL_DEGC_PT1 *
+ tmdev->sensor[i].slope);
+ dev_dbg(tmdev->dev, "offset:%d\n", tmdev->sensor[i].offset);
+ }
+}
+
+static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s)
+{
+ int degc, num, den;
+
+ num = (adc_code * SLOPE_FACTOR) - s->offset;
+ den = s->slope;
+
+ if (num > 0)
+ degc = num + (den / 2);
+ else if (num < 0)
+ degc = num - (den / 2);
+ else
+ degc = num;
+
+ degc /= den;
+
+ return degc;
+}
+
+int get_temp_common(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, ret;
+
+ sensor_addr = S0_ST_ADDR + s->hw_id * SN_ADDR_OFFSET;
+ ret = regmap_read(tmdev->map, sensor_addr, &code);
+ if (ret)
+ return ret;
+ last_temp = code & SN_ST_TEMP_MASK;
+
+ *temp = code_to_degc(last_temp, s) * 1000;
+
+ return 0;
+}
+
+static const struct regmap_config tsens_config = {
+ .reg_bits = 32,
+ .val_bits = 32,
+ .reg_stride = 4,
+};
+
+int __init init_common(struct tsens_device *tmdev)
+{
+ void __iomem *base;
+
+ base = of_iomap(tmdev->dev->of_node, 0);
+ if (IS_ERR(base))
+ return -EINVAL;
+
+ tmdev->map = devm_regmap_init_mmio(tmdev->dev, base, &tsens_config);
+ if (!tmdev->map) {
+ iounmap(base);
+ return -ENODEV;
+ }
+
+ return 0;
+}
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
new file mode 100644
index 0000000..e799182
--- /dev/null
+++ b/drivers/thermal/qcom/tsens.c
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/pm.h>
+#include <linux/slab.h>
+#include <linux/thermal.h>
+#include "tsens.h"
+
+static int tsens_get_temp(void *data, int *temp)
+{
+ const struct tsens_sensor *s = data;
+ struct tsens_device *tmdev = s->tmdev;
+
+ return tmdev->ops->get_temp(tmdev, s->id, temp);
+}
+
+static int tsens_get_trend(void *data, long *temp)
+{
+ const struct tsens_sensor *s = data;
+ struct tsens_device *tmdev = s->tmdev;
+
+ if (tmdev->ops->get_trend)
+ return tmdev->ops->get_trend(tmdev, s->id, temp);
+
+ return -ENOTSUPP;
+}
+
+static int tsens_suspend(struct device *dev)
+{
+ struct tsens_device *tmdev = dev_get_drvdata(dev);
+
+ if (tmdev->ops && tmdev->ops->suspend)
+ return tmdev->ops->suspend(tmdev);
+
+ return 0;
+}
+
+static int tsens_resume(struct device *dev)
+{
+ struct tsens_device *tmdev = dev_get_drvdata(dev);
+
+ if (tmdev->ops && tmdev->ops->resume)
+ return tmdev->ops->resume(tmdev);
+
+ return 0;
+}
+
+static SIMPLE_DEV_PM_OPS(tsens_pm_ops, tsens_suspend, tsens_resume);
+
+static const struct of_device_id tsens_table[] = {
+ {
+ .compatible = "qcom,msm8916-tsens",
+ }, {
+ .compatible = "qcom,msm8974-tsens",
+ },
+ {}
+};
+MODULE_DEVICE_TABLE(of, tsens_table);
+
+static const struct thermal_zone_of_device_ops tsens_of_ops = {
+ .get_temp = tsens_get_temp,
+ .get_trend = tsens_get_trend,
+};
+
+static int tsens_register(struct tsens_device *tmdev)
+{
+ int i;
+ struct thermal_zone_device *tzd;
+ u32 *hw_id, n = tmdev->num_sensors;
+
+ hw_id = devm_kcalloc(tmdev->dev, n, sizeof(u32), GFP_KERNEL);
+ if (!hw_id)
+ return -ENOMEM;
+
+ for (i = 0; i < tmdev->num_sensors; i++) {
+ tmdev->sensor[i].tmdev = tmdev;
+ tmdev->sensor[i].id = i;
+ tzd = thermal_zone_of_sensor_register(tmdev->dev, i,
+ &tmdev->sensor[i],
+ &tsens_of_ops);
+ if (IS_ERR(tzd))
+ continue;
+ tmdev->sensor[i].tzd = tzd;
+ if (tmdev->ops->enable)
+ tmdev->ops->enable(tmdev, i);
+ }
+ return 0;
+}
+
+static int tsens_probe(struct platform_device *pdev)
+{
+ int ret, i;
+ struct device *dev;
+ struct device_node *np;
+ struct tsens_sensor *s;
+ struct tsens_device *tmdev;
+ const struct tsens_data *data;
+ const struct of_device_id *id;
+
+ if (pdev->dev.of_node)
+ dev = &pdev->dev;
+ else
+ dev = pdev->dev.parent;
+
+ np = dev->of_node;
+
+ id = of_match_node(tsens_table, np);
+ if (!id)
+ return -EINVAL;
+
+ data = id->data;
+
+ if (data->num_sensors <= 0) {
+ dev_err(dev, "invalid number of sensors\n");
+ return -EINVAL;
+ }
+
+ tmdev = devm_kzalloc(dev, sizeof(*tmdev) +
+ data->num_sensors * sizeof(*s), GFP_KERNEL);
+ if (!tmdev)
+ return -ENOMEM;
+
+ tmdev->dev = dev;
+ tmdev->num_sensors = data->num_sensors;
+ tmdev->ops = data->ops;
+ for (i = 0; i < tmdev->num_sensors; i++) {
+ if (data->hw_ids)
+ tmdev->sensor[i].hw_id = data->hw_ids[i];
+ else
+ tmdev->sensor[i].hw_id = i;
+ }
+
+ if (!tmdev->ops || !tmdev->ops->init || !tmdev->ops->get_temp)
+ return -EINVAL;
+
+ ret = tmdev->ops->init(tmdev);
+ if (ret < 0) {
+ dev_err(dev, "tsens init failed\n");
+ return ret;
+ }
+
+ if (tmdev->ops->calibrate) {
+ ret = tmdev->ops->calibrate(tmdev);
+ if (ret < 0) {
+ dev_err(dev, "tsens calibration failed\n");
+ return ret;
+ }
+ }
+
+ ret = tsens_register(tmdev);
+
+ platform_set_drvdata(pdev, tmdev);
+
+ return ret;
+}
+
+static int tsens_remove(struct platform_device *pdev)
+{
+ int i;
+ struct tsens_device *tmdev = platform_get_drvdata(pdev);
+ struct thermal_zone_device *tzd;
+
+ if (tmdev->ops->disable)
+ tmdev->ops->disable(tmdev);
+
+ for (i = 0; i < tmdev->num_sensors; i++) {
+ tzd = tmdev->sensor[i].tzd;
+ thermal_zone_of_sensor_unregister(&pdev->dev, tzd);
+ }
+
+ return 0;
+}
+
+static struct platform_driver tsens_driver = {
+ .probe = tsens_probe,
+ .remove = tsens_remove,
+ .driver = {
+ .name = "qcom-tsens",
+ .pm = &tsens_pm_ops,
+ .of_match_table = tsens_table,
+ },
+};
+module_platform_driver(tsens_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("QCOM Temperature Sensor driver");
+MODULE_ALIAS("platform:qcom-tsens");
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
new file mode 100644
index 0000000..6f652ed
--- /dev/null
+++ b/drivers/thermal/qcom/tsens.h
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+#ifndef __QCOM_TSENS_H__
+#define __QCOM_TSENS_H__
+
+#define ONE_PT_CALIB 0x1
+#define ONE_PT_CALIB2 0x2
+#define TWO_PT_CALIB 0x3
+
+struct tsens_device;
+
+struct tsens_sensor {
+ struct tsens_device *tmdev;
+ struct thermal_zone_device *tzd;
+ int offset;
+ int id;
+ int hw_id;
+ u32 slope;
+ u32 status;
+};
+
+/**
+ * struct tsens_ops - operations as supported by the tsens device
+ * @init: Function to initialize the tsens device
+ * @calibrate: Function to calibrate the tsens device
+ * @get_temp: Function which returns the temp in millidegC
+ * @enable: Function to enable (clocks/power) tsens device
+ * @disable: Function to disable the tsens device
+ * @suspend: Function to suspend the tsens device
+ * @resume: Function to resume the tsens device
+ * @get_trend: Function to get the thermal/temp trend
+ */
+struct tsens_ops {
+ /* mandatory callbacks */
+ int (*init)(struct tsens_device *);
+ int (*calibrate)(struct tsens_device *);
+ int (*get_temp)(struct tsens_device *, int, int *);
+ /* optional callbacks */
+ int (*enable)(struct tsens_device *, int);
+ void (*disable)(struct tsens_device *);
+ int (*suspend)(struct tsens_device *);
+ int (*resume)(struct tsens_device *);
+ int (*get_trend)(struct tsens_device *, int, long *);
+};
+
+/**
+ * struct tsens_data - tsens instance specific data
+ * @num_sensors: Max number of sensors supported by platform
+ * @ops: operations the tsens instance supports
+ * @hw_ids: Subset of sensors ids supported by platform, if not the first n
+ */
+struct tsens_data {
+ const u32 num_sensors;
+ const struct tsens_ops *ops;
+ unsigned int *hw_ids;
+};
+
+/* Registers to be saved/restored across a context loss */
+struct tsens_context {
+ int threshold;
+ int control;
+};
+
+struct tsens_device {
+ struct device *dev;
+ u32 num_sensors;
+ struct regmap *map;
+ struct regmap_field *status_field;
+ struct tsens_context ctx;
+ bool trdy;
+ const struct tsens_ops *ops;
+ struct tsens_sensor sensor[0];
+};
+
+char *qfprom_read(struct device *, const char *);
+void compute_intercept_slope(struct tsens_device *, u32 *, u32 *, u32);
+int init_common(struct tsens_device *);
+int get_temp_common(struct tsens_device *, int, int *);
+
+#endif /* __QCOM_TSENS_H__ */
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v5 01/11] thermal: qcom: tsens: Add a skeletal TSENS drivers
2016-04-14 9:31 ` [PATCH v5 01/11] thermal: qcom: tsens: Add a skeletal TSENS drivers Rajendra Nayak
@ 2016-04-28 0:20 ` Eduardo Valentin
2016-05-05 4:50 ` Rajendra Nayak
0 siblings, 1 reply; 26+ messages in thread
From: Eduardo Valentin @ 2016-04-28 0:20 UTC (permalink / raw)
To: Rajendra Nayak
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal
On Thu, Apr 14, 2016 at 03:01:49PM +0530, Rajendra Nayak wrote:
> TSENS is Qualcomms' thermal temperature sensor device. It
> supports reading temperatures from multiple thermal sensors
> present on various QCOM SoCs.
> Calibration data is generally read from a non-volatile memory
> (eeprom) device.
>
> Add a skeleton driver with all the necessary abstractions so
> a variety of qcom device families which support TSENS can
> add driver extensions.
>
> Also add the required device tree bindings which can be used
> to describe the TSENS device in DT.
>
> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
> Reviewed-by: Lina Iyer <lina.iyer@linaro.org>
> ---
> .../devicetree/bindings/thermal/qcom-tsens.txt | 21 +++
> drivers/thermal/Kconfig | 5 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/qcom/Kconfig | 11 ++
> drivers/thermal/qcom/Makefile | 2 +
> drivers/thermal/qcom/tsens-common.c | 135 ++++++++++++++
> drivers/thermal/qcom/tsens.c | 202 +++++++++++++++++++++
> drivers/thermal/qcom/tsens.h | 90 +++++++++
> 8 files changed, 467 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt
> create mode 100644 drivers/thermal/qcom/Kconfig
> create mode 100644 drivers/thermal/qcom/Makefile
> create mode 100644 drivers/thermal/qcom/tsens-common.c
> create mode 100644 drivers/thermal/qcom/tsens.c
> create mode 100644 drivers/thermal/qcom/tsens.h
>
> diff --git a/Documentation/devicetree/bindings/thermal/qcom-tsens.txt b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt
> new file mode 100644
> index 0000000..292ed89
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt
> @@ -0,0 +1,21 @@
> +* QCOM SoC Temperature Sensor (TSENS)
> +
> +Required properties:
> +- compatible :
> + - "qcom,msm8916-tsens" : For 8916 Family of SoCs
> + - "qcom,msm8974-tsens" : For 8974 Family of SoCs
> + - "qcom,msm8996-tsens" : For 8996 Family of SoCs
> +
> +- reg: Address range of the thermal registers
> +- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description.
> +- Refer to Documentation/devicetree/bindings/nvmem/nvmem.txt to know how to specify
> +nvmem cells
> +
> +Example:
> +tsens: thermal-sensor@900000 {
> + compatible = "qcom,msm8916-tsens";
> + reg = <0x4a8000 0x2000>;
> + nvmem-cells = <&tsens_caldata>, <&tsens_calsel>;
> + nvmem-cell-names = "caldata", "calsel";
> + #thermal-sensor-cells = <1>;
> + };
> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
> index c37eedc..463b00c 100644
> --- a/drivers/thermal/Kconfig
> +++ b/drivers/thermal/Kconfig
> @@ -408,4 +408,9 @@ config QCOM_SPMI_TEMP_ALARM
> real time die temperature if an ADC is present or an estimate of the
> temperature based upon the over temperature stage value.
>
> +menu "Qualcomm thermal drivers"
> +depends on (ARCH_QCOM && OF) || COMPILE_TEST
> +source "drivers/thermal/qcom/Kconfig"
> +endmenu
> +
> endif
> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
> index 8e9cbc3..3f3e72c 100644
> --- a/drivers/thermal/Makefile
> +++ b/drivers/thermal/Makefile
> @@ -46,6 +46,7 @@ obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/
> obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/
> obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o
> obj-$(CONFIG_ST_THERMAL) += st/
> +obj-$(CONFIG_QCOM_TSENS) += qcom/
> obj-$(CONFIG_TEGRA_SOCTHERM) += tegra_soctherm.o
> obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o
> obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o
> diff --git a/drivers/thermal/qcom/Kconfig b/drivers/thermal/qcom/Kconfig
> new file mode 100644
> index 0000000..be32e5a
> --- /dev/null
> +++ b/drivers/thermal/qcom/Kconfig
> @@ -0,0 +1,11 @@
> +config QCOM_TSENS
> + tristate "Qualcomm TSENS Temperature Alarm"
> + depends on THERMAL
> + depends on QCOM_QFPROM
> + depends on ARCH_QCOM || COMPILE_TEST
> + help
> + This enables the thermal sysfs driver for the TSENS device. It shows
> + up in Sysfs as a thermal zone with multiple trip points. Disabling the
> + thermal zone device via the mode file results in disabling the sensor.
> + Also able to set threshold temperature for both hot and cold and update
> + when a threshold is reached.
> diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile
> new file mode 100644
> index 0000000..2e800c5
> --- /dev/null
> +++ b/drivers/thermal/qcom/Makefile
> @@ -0,0 +1,2 @@
> +obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o
> +qcom_tsens-y += tsens.o tsens-common.o
> diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
> new file mode 100644
> index 0000000..4bffbc1
> --- /dev/null
> +++ b/drivers/thermal/qcom/tsens-common.c
> @@ -0,0 +1,135 @@
> +/*
> + * Copyright (c) 2015, The Linux Foundation. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 and
> + * only version 2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + */
> +
> +#include <linux/err.h>
> +#include <linux/io.h>
> +#include <linux/nvmem-consumer.h>
> +#include <linux/of_address.h>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include "tsens.h"
> +
> +#define S0_ST_ADDR 0x1030
> +#define SN_ADDR_OFFSET 0x4
> +#define SN_ST_TEMP_MASK 0x3ff
> +#define CAL_DEGC_PT1 30
> +#define CAL_DEGC_PT2 120
> +#define SLOPE_FACTOR 1000
> +#define SLOPE_DEFAULT 3200
> +
> +char *qfprom_read(struct device *dev, const char *cname)
> +{
> + struct nvmem_cell *cell;
> + ssize_t data;
> + char *ret;
> +
> + cell = nvmem_cell_get(dev, cname);
> + if (IS_ERR(cell))
> + return ERR_CAST(cell);
> +
> + ret = nvmem_cell_read(cell, &data);
> + nvmem_cell_put(cell);
> +
> + return ret;
> +}
> +
> +void compute_intercept_slope(struct tsens_device *tmdev, u32 *p1,
> + u32 *p2, u32 mode)
> +{
Could you please add a comment explaining the cases that this function
is used instead of tz->tzp->slope,offset?
> + int i;
> + int num, den;
> +
> + for (i = 0; i < tmdev->num_sensors; i++) {
> + dev_dbg(tmdev->dev,
> + "sensor%d - data_point1:%#x data_point2:%#x\n",
> + i, p1[i], p2[i]);
> +
> + tmdev->sensor[i].slope = SLOPE_DEFAULT;
> + if (mode == TWO_PT_CALIB) {
> + /*
> + * slope (m) = adc_code2 - adc_code1 (y2 - y1)/
> + * temp_120_degc - temp_30_degc (x2 - x1)
> + */
> + num = p2[i] - p1[i];
> + num *= SLOPE_FACTOR;
> + den = CAL_DEGC_PT2 - CAL_DEGC_PT1;
> + tmdev->sensor[i].slope = num / den;
> + }
> +
> + tmdev->sensor[i].offset = (p1[i] * SLOPE_FACTOR) -
> + (CAL_DEGC_PT1 *
> + tmdev->sensor[i].slope);
> + dev_dbg(tmdev->dev, "offset:%d\n", tmdev->sensor[i].offset);
> + }
> +}
> +
> +static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s)
> +{
> + int degc, num, den;
> +
> + num = (adc_code * SLOPE_FACTOR) - s->offset;
> + den = s->slope;
> +
> + if (num > 0)
> + degc = num + (den / 2);
> + else if (num < 0)
> + degc = num - (den / 2);
> + else
> + degc = num;
> +
> + degc /= den;
> +
> + return degc;
> +}
> +
> +int get_temp_common(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, ret;
> +
> + sensor_addr = S0_ST_ADDR + s->hw_id * SN_ADDR_OFFSET;
> + ret = regmap_read(tmdev->map, sensor_addr, &code);
> + if (ret)
> + return ret;
> + last_temp = code & SN_ST_TEMP_MASK;
> +
> + *temp = code_to_degc(last_temp, s) * 1000;
> +
> + return 0;
> +}
> +
> +static const struct regmap_config tsens_config = {
> + .reg_bits = 32,
> + .val_bits = 32,
> + .reg_stride = 4,
> +};
> +
> +int __init init_common(struct tsens_device *tmdev)
> +{
> + void __iomem *base;
> +
> + base = of_iomap(tmdev->dev->of_node, 0);
> + if (IS_ERR(base))
> + return -EINVAL;
> +
> + tmdev->map = devm_regmap_init_mmio(tmdev->dev, base, &tsens_config);
> + if (!tmdev->map) {
> + iounmap(base);
> + return -ENODEV;
> + }
> +
> + return 0;
> +}
> diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
> new file mode 100644
> index 0000000..e799182
> --- /dev/null
> +++ b/drivers/thermal/qcom/tsens.c
> @@ -0,0 +1,202 @@
> +/*
> + * Copyright (c) 2015, The Linux Foundation. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 and
> + * only version 2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + */
> +
> +#include <linux/err.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/platform_device.h>
> +#include <linux/pm.h>
> +#include <linux/slab.h>
> +#include <linux/thermal.h>
> +#include "tsens.h"
> +
> +static int tsens_get_temp(void *data, int *temp)
> +{
> + const struct tsens_sensor *s = data;
> + struct tsens_device *tmdev = s->tmdev;
> +
> + return tmdev->ops->get_temp(tmdev, s->id, temp);
> +}
> +
> +static int tsens_get_trend(void *data, long *temp)
> +{
> + const struct tsens_sensor *s = data;
> + struct tsens_device *tmdev = s->tmdev;
> +
> + if (tmdev->ops->get_trend)
> + return tmdev->ops->get_trend(tmdev, s->id, temp);
> +
> + return -ENOTSUPP;
> +}
> +
> +static int tsens_suspend(struct device *dev)
> +{
> + struct tsens_device *tmdev = dev_get_drvdata(dev);
> +
> + if (tmdev->ops && tmdev->ops->suspend)
> + return tmdev->ops->suspend(tmdev);
> +
> + return 0;
> +}
> +
> +static int tsens_resume(struct device *dev)
> +{
> + struct tsens_device *tmdev = dev_get_drvdata(dev);
> +
> + if (tmdev->ops && tmdev->ops->resume)
> + return tmdev->ops->resume(tmdev);
> +
> + return 0;
> +}
> +
> +static SIMPLE_DEV_PM_OPS(tsens_pm_ops, tsens_suspend, tsens_resume);
> +
> +static const struct of_device_id tsens_table[] = {
> + {
> + .compatible = "qcom,msm8916-tsens",
> + }, {
> + .compatible = "qcom,msm8974-tsens",
> + },
> + {}
> +};
> +MODULE_DEVICE_TABLE(of, tsens_table);
> +
> +static const struct thermal_zone_of_device_ops tsens_of_ops = {
> + .get_temp = tsens_get_temp,
> + .get_trend = tsens_get_trend,
> +};
> +
> +static int tsens_register(struct tsens_device *tmdev)
> +{
> + int i;
> + struct thermal_zone_device *tzd;
> + u32 *hw_id, n = tmdev->num_sensors;
> +
> + hw_id = devm_kcalloc(tmdev->dev, n, sizeof(u32), GFP_KERNEL);
> + if (!hw_id)
> + return -ENOMEM;
> +
> + for (i = 0; i < tmdev->num_sensors; i++) {
> + tmdev->sensor[i].tmdev = tmdev;
> + tmdev->sensor[i].id = i;
> + tzd = thermal_zone_of_sensor_register(tmdev->dev, i,
> + &tmdev->sensor[i],
> + &tsens_of_ops);
How about using the devm_ version of this API?
> + if (IS_ERR(tzd))
> + continue;
> + tmdev->sensor[i].tzd = tzd;
> + if (tmdev->ops->enable)
> + tmdev->ops->enable(tmdev, i);
> + }
> + return 0;
> +}
> +
> +static int tsens_probe(struct platform_device *pdev)
> +{
> + int ret, i;
> + struct device *dev;
> + struct device_node *np;
> + struct tsens_sensor *s;
> + struct tsens_device *tmdev;
> + const struct tsens_data *data;
> + const struct of_device_id *id;
> +
> + if (pdev->dev.of_node)
> + dev = &pdev->dev;
> + else
> + dev = pdev->dev.parent;
> +
> + np = dev->of_node;
> +
> + id = of_match_node(tsens_table, np);
> + if (!id)
> + return -EINVAL;
> +
> + data = id->data;
> +
> + if (data->num_sensors <= 0) {
> + dev_err(dev, "invalid number of sensors\n");
> + return -EINVAL;
> + }
> +
> + tmdev = devm_kzalloc(dev, sizeof(*tmdev) +
> + data->num_sensors * sizeof(*s), GFP_KERNEL);
> + if (!tmdev)
> + return -ENOMEM;
> +
> + tmdev->dev = dev;
> + tmdev->num_sensors = data->num_sensors;
> + tmdev->ops = data->ops;
> + for (i = 0; i < tmdev->num_sensors; i++) {
> + if (data->hw_ids)
> + tmdev->sensor[i].hw_id = data->hw_ids[i];
> + else
> + tmdev->sensor[i].hw_id = i;
> + }
> +
> + if (!tmdev->ops || !tmdev->ops->init || !tmdev->ops->get_temp)
> + return -EINVAL;
> +
> + ret = tmdev->ops->init(tmdev);
> + if (ret < 0) {
> + dev_err(dev, "tsens init failed\n");
> + return ret;
> + }
> +
> + if (tmdev->ops->calibrate) {
> + ret = tmdev->ops->calibrate(tmdev);
> + if (ret < 0) {
> + dev_err(dev, "tsens calibration failed\n");
> + return ret;
> + }
> + }
> +
> + ret = tsens_register(tmdev);
> +
> + platform_set_drvdata(pdev, tmdev);
> +
> + return ret;
> +}
> +
> +static int tsens_remove(struct platform_device *pdev)
> +{
> + int i;
> + struct tsens_device *tmdev = platform_get_drvdata(pdev);
> + struct thermal_zone_device *tzd;
> +
> + if (tmdev->ops->disable)
> + tmdev->ops->disable(tmdev);
> +
> + for (i = 0; i < tmdev->num_sensors; i++) {
> + tzd = tmdev->sensor[i].tzd;
> + thermal_zone_of_sensor_unregister(&pdev->dev, tzd);
> + }
> +
> + return 0;
> +}
> +
> +static struct platform_driver tsens_driver = {
> + .probe = tsens_probe,
> + .remove = tsens_remove,
> + .driver = {
> + .name = "qcom-tsens",
> + .pm = &tsens_pm_ops,
> + .of_match_table = tsens_table,
> + },
> +};
> +module_platform_driver(tsens_driver);
> +
> +MODULE_LICENSE("GPL v2");
> +MODULE_DESCRIPTION("QCOM Temperature Sensor driver");
> +MODULE_ALIAS("platform:qcom-tsens");
> diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
> new file mode 100644
> index 0000000..6f652ed
> --- /dev/null
> +++ b/drivers/thermal/qcom/tsens.h
> @@ -0,0 +1,90 @@
> +/*
> + * Copyright (c) 2015, The Linux Foundation. All rights reserved.
> + *
> + * This software is licensed under the terms of the GNU General Public
> + * License version 2, as published by the Free Software Foundation, and
> + * may be copied, distributed, and modified under those terms.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + */
> +#ifndef __QCOM_TSENS_H__
> +#define __QCOM_TSENS_H__
> +
> +#define ONE_PT_CALIB 0x1
> +#define ONE_PT_CALIB2 0x2
> +#define TWO_PT_CALIB 0x3
> +
> +struct tsens_device;
> +
> +struct tsens_sensor {
> + struct tsens_device *tmdev;
> + struct thermal_zone_device *tzd;
> + int offset;
> + int id;
> + int hw_id;
> + u32 slope;
> + u32 status;
> +};
> +
> +/**
> + * struct tsens_ops - operations as supported by the tsens device
> + * @init: Function to initialize the tsens device
> + * @calibrate: Function to calibrate the tsens device
> + * @get_temp: Function which returns the temp in millidegC
> + * @enable: Function to enable (clocks/power) tsens device
> + * @disable: Function to disable the tsens device
> + * @suspend: Function to suspend the tsens device
> + * @resume: Function to resume the tsens device
> + * @get_trend: Function to get the thermal/temp trend
> + */
> +struct tsens_ops {
> + /* mandatory callbacks */
> + int (*init)(struct tsens_device *);
> + int (*calibrate)(struct tsens_device *);
> + int (*get_temp)(struct tsens_device *, int, int *);
> + /* optional callbacks */
> + int (*enable)(struct tsens_device *, int);
> + void (*disable)(struct tsens_device *);
> + int (*suspend)(struct tsens_device *);
> + int (*resume)(struct tsens_device *);
> + int (*get_trend)(struct tsens_device *, int, long *);
> +};
> +
> +/**
> + * struct tsens_data - tsens instance specific data
> + * @num_sensors: Max number of sensors supported by platform
> + * @ops: operations the tsens instance supports
> + * @hw_ids: Subset of sensors ids supported by platform, if not the first n
> + */
> +struct tsens_data {
> + const u32 num_sensors;
> + const struct tsens_ops *ops;
> + unsigned int *hw_ids;
> +};
> +
> +/* Registers to be saved/restored across a context loss */
> +struct tsens_context {
> + int threshold;
> + int control;
> +};
> +
> +struct tsens_device {
> + struct device *dev;
> + u32 num_sensors;
> + struct regmap *map;
> + struct regmap_field *status_field;
> + struct tsens_context ctx;
> + bool trdy;
> + const struct tsens_ops *ops;
> + struct tsens_sensor sensor[0];
> +};
> +
> +char *qfprom_read(struct device *, const char *);
> +void compute_intercept_slope(struct tsens_device *, u32 *, u32 *, u32);
> +int init_common(struct tsens_device *);
> +int get_temp_common(struct tsens_device *, int, int *);
> +
> +#endif /* __QCOM_TSENS_H__ */
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v5 01/11] thermal: qcom: tsens: Add a skeletal TSENS drivers
2016-04-28 0:20 ` Eduardo Valentin
@ 2016-05-05 4:50 ` Rajendra Nayak
0 siblings, 0 replies; 26+ messages in thread
From: Rajendra Nayak @ 2016-05-05 4:50 UTC (permalink / raw)
To: Eduardo Valentin
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal
On 04/28/2016 05:50 AM, Eduardo Valentin wrote:
> On Thu, Apr 14, 2016 at 03:01:49PM +0530, Rajendra Nayak wrote:
>> TSENS is Qualcomms' thermal temperature sensor device. It
>> supports reading temperatures from multiple thermal sensors
>> present on various QCOM SoCs.
>> Calibration data is generally read from a non-volatile memory
>> (eeprom) device.
>>
>> Add a skeleton driver with all the necessary abstractions so
>> a variety of qcom device families which support TSENS can
>> add driver extensions.
>>
>> Also add the required device tree bindings which can be used
>> to describe the TSENS device in DT.
>>
>> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
>> Reviewed-by: Lina Iyer <lina.iyer@linaro.org>
>> ---
[]..
>> @@ -0,0 +1,135 @@
>> +/*
>> + * Copyright (c) 2015, The Linux Foundation. All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 and
>> + * only version 2 as published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU General Public License for more details.
>> + *
>> + */
>> +
>> +#include <linux/err.h>
>> +#include <linux/io.h>
>> +#include <linux/nvmem-consumer.h>
>> +#include <linux/of_address.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/regmap.h>
>> +#include "tsens.h"
>> +
>> +#define S0_ST_ADDR 0x1030
>> +#define SN_ADDR_OFFSET 0x4
>> +#define SN_ST_TEMP_MASK 0x3ff
>> +#define CAL_DEGC_PT1 30
>> +#define CAL_DEGC_PT2 120
>> +#define SLOPE_FACTOR 1000
>> +#define SLOPE_DEFAULT 3200
>> +
>> +char *qfprom_read(struct device *dev, const char *cname)
>> +{
>> + struct nvmem_cell *cell;
>> + ssize_t data;
>> + char *ret;
>> +
>> + cell = nvmem_cell_get(dev, cname);
>> + if (IS_ERR(cell))
>> + return ERR_CAST(cell);
>> +
>> + ret = nvmem_cell_read(cell, &data);
>> + nvmem_cell_put(cell);
>> +
>> + return ret;
>> +}
>> +
>> +void compute_intercept_slope(struct tsens_device *tmdev, u32 *p1,
>> + u32 *p2, u32 mode)
>> +{
>
> Could you please add a comment explaining the cases that this function
> is used instead of tz->tzp->slope,offset?
sure, will do.
>
>> + int i;
>> + int num, den;
>> +
>> + for (i = 0; i < tmdev->num_sensors; i++) {
>> + dev_dbg(tmdev->dev,
>> + "sensor%d - data_point1:%#x data_point2:%#x\n",
>> + i, p1[i], p2[i]);
>> +
>> + tmdev->sensor[i].slope = SLOPE_DEFAULT;
>> + if (mode == TWO_PT_CALIB) {
>> + /*
>> + * slope (m) = adc_code2 - adc_code1 (y2 - y1)/
>> + * temp_120_degc - temp_30_degc (x2 - x1)
>> + */
>> + num = p2[i] - p1[i];
>> + num *= SLOPE_FACTOR;
>> + den = CAL_DEGC_PT2 - CAL_DEGC_PT1;
>> + tmdev->sensor[i].slope = num / den;
>> + }
>> +
>> + tmdev->sensor[i].offset = (p1[i] * SLOPE_FACTOR) -
>> + (CAL_DEGC_PT1 *
>> + tmdev->sensor[i].slope);
>> + dev_dbg(tmdev->dev, "offset:%d\n", tmdev->sensor[i].offset);
>> + }
>> +}
[]..
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v5 02/11] thermal: qcom: tsens-8916: Add support for 8916 family of SoCs
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
2016-04-14 9:31 ` [PATCH v5 01/11] thermal: qcom: tsens: Add a skeletal TSENS drivers Rajendra Nayak
@ 2016-04-14 9:31 ` Rajendra Nayak
2016-04-14 9:31 ` [PATCH v5 03/11] thermal: qcom: tsens-8974: Add support for 8974 " Rajendra Nayak
` (10 subsequent siblings)
12 siblings, 0 replies; 26+ messages in thread
From: Rajendra Nayak @ 2016-04-14 9:31 UTC (permalink / raw)
To: edubezval
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal, Rajendra Nayak
Add support to calibrate sensors on 8916 family and also add common
functions to read temperature from sensors (This can be reused on
other SoCs having similar TSENS device)
The calibration data is read from eeprom using the generic nvmem
framework apis.
Based on the original code by Siddartha Mohanadoss and Stephen Boyd.
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
drivers/thermal/qcom/Makefile | 2 +-
drivers/thermal/qcom/tsens-8916.c | 113 ++++++++++++++++++++++++++++++++++++++
drivers/thermal/qcom/tsens.c | 1 +
drivers/thermal/qcom/tsens.h | 2 +
4 files changed, 117 insertions(+), 1 deletion(-)
create mode 100644 drivers/thermal/qcom/tsens-8916.c
diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile
index 2e800c5..05c98e4 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
+qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o
diff --git a/drivers/thermal/qcom/tsens-8916.c b/drivers/thermal/qcom/tsens-8916.c
new file mode 100644
index 0000000..beb3afa
--- /dev/null
+++ b/drivers/thermal/qcom/tsens-8916.c
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include "tsens.h"
+
+/* eeprom layout data for 8916 */
+#define BASE0_MASK 0x0000007f
+#define BASE1_MASK 0xfe000000
+#define BASE0_SHIFT 0
+#define BASE1_SHIFT 25
+
+#define S0_P1_MASK 0x00000f80
+#define S1_P1_MASK 0x003e0000
+#define S2_P1_MASK 0xf8000000
+#define S3_P1_MASK 0x000003e0
+#define S4_P1_MASK 0x000f8000
+
+#define S0_P2_MASK 0x0001f000
+#define S1_P2_MASK 0x07c00000
+#define S2_P2_MASK 0x0000001f
+#define S3_P2_MASK 0x00007c00
+#define S4_P2_MASK 0x01f00000
+
+#define S0_P1_SHIFT 7
+#define S1_P1_SHIFT 17
+#define S2_P1_SHIFT 27
+#define S3_P1_SHIFT 5
+#define S4_P1_SHIFT 15
+
+#define S0_P2_SHIFT 12
+#define S1_P2_SHIFT 22
+#define S2_P2_SHIFT 0
+#define S3_P2_SHIFT 10
+#define S4_P2_SHIFT 20
+
+#define CAL_SEL_MASK 0xe0000000
+#define CAL_SEL_SHIFT 29
+
+static int calibrate_8916(struct tsens_device *tmdev)
+{
+ int base0 = 0, base1 = 0, i;
+ u32 p1[5], p2[5];
+ int mode = 0;
+ u32 *qfprom_cdata, *qfprom_csel;
+
+ qfprom_cdata = (u32 *)qfprom_read(tmdev->dev, "calib");
+ if (IS_ERR(qfprom_cdata))
+ return PTR_ERR(qfprom_cdata);
+
+ qfprom_csel = (u32 *)qfprom_read(tmdev->dev, "calib_sel");
+ if (IS_ERR(qfprom_csel))
+ return PTR_ERR(qfprom_csel);
+
+ mode = (qfprom_csel[0] & CAL_SEL_MASK) >> CAL_SEL_SHIFT;
+ dev_dbg(tmdev->dev, "calibration mode is %d\n", mode);
+
+ switch (mode) {
+ case TWO_PT_CALIB:
+ base1 = (qfprom_cdata[1] & BASE1_MASK) >> BASE1_SHIFT;
+ p2[0] = (qfprom_cdata[0] & S0_P2_MASK) >> S0_P2_SHIFT;
+ p2[1] = (qfprom_cdata[0] & S1_P2_MASK) >> S1_P2_SHIFT;
+ p2[2] = (qfprom_cdata[1] & S2_P2_MASK) >> S2_P2_SHIFT;
+ p2[3] = (qfprom_cdata[1] & S3_P2_MASK) >> S3_P2_SHIFT;
+ p2[4] = (qfprom_cdata[1] & S4_P2_MASK) >> S4_P2_SHIFT;
+ for (i = 0; i < tmdev->num_sensors; i++)
+ p2[i] = ((base1 + p2[i]) << 3);
+ /* Fall through */
+ case ONE_PT_CALIB2:
+ base0 = (qfprom_cdata[0] & BASE0_MASK);
+ p1[0] = (qfprom_cdata[0] & S0_P1_MASK) >> S0_P1_SHIFT;
+ p1[1] = (qfprom_cdata[0] & S1_P1_MASK) >> S1_P1_SHIFT;
+ p1[2] = (qfprom_cdata[0] & S2_P1_MASK) >> S2_P1_SHIFT;
+ p1[3] = (qfprom_cdata[1] & S3_P1_MASK) >> S3_P1_SHIFT;
+ p1[4] = (qfprom_cdata[1] & S4_P1_MASK) >> S4_P1_SHIFT;
+ for (i = 0; i < tmdev->num_sensors; i++)
+ p1[i] = (((base0) + p1[i]) << 3);
+ break;
+ default:
+ for (i = 0; i < tmdev->num_sensors; i++) {
+ p1[i] = 500;
+ p2[i] = 780;
+ }
+ break;
+ }
+
+ compute_intercept_slope(tmdev, p1, p2, mode);
+
+ return 0;
+}
+
+const struct tsens_ops ops_8916 = {
+ .init = init_common,
+ .calibrate = calibrate_8916,
+ .get_temp = get_temp_common,
+};
+
+const struct tsens_data data_8916 = {
+ .num_sensors = 5,
+ .ops = &ops_8916,
+ .hw_ids = (unsigned int []){0, 1, 2, 4, 5 },
+};
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index e799182..c11d2e4 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -65,6 +65,7 @@ static SIMPLE_DEV_PM_OPS(tsens_pm_ops, tsens_suspend, tsens_resume);
static const struct of_device_id tsens_table[] = {
{
.compatible = "qcom,msm8916-tsens",
+ .data = &data_8916,
}, {
.compatible = "qcom,msm8974-tsens",
},
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index 6f652ed..0ecf979 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -87,4 +87,6 @@ void compute_intercept_slope(struct tsens_device *, u32 *, u32 *, u32);
int init_common(struct tsens_device *);
int get_temp_common(struct tsens_device *, int, int *);
+extern const struct tsens_data data_8916;
+
#endif /* __QCOM_TSENS_H__ */
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 03/11] thermal: qcom: tsens-8974: Add support for 8974 family of SoCs
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
2016-04-14 9:31 ` [PATCH v5 01/11] thermal: qcom: tsens: Add a skeletal TSENS drivers Rajendra Nayak
2016-04-14 9:31 ` [PATCH v5 02/11] thermal: qcom: tsens-8916: Add support for 8916 family of SoCs Rajendra Nayak
@ 2016-04-14 9:31 ` Rajendra Nayak
2016-04-14 9:31 ` [PATCH v5 04/11] thermal: core: export apis to get slope and offset Rajendra Nayak
` (9 subsequent siblings)
12 siblings, 0 replies; 26+ messages in thread
From: Rajendra Nayak @ 2016-04-14 9:31 UTC (permalink / raw)
To: edubezval
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal, Rajendra Nayak
Add .calibrate support for 8974 family as part of tsens_ops.
Based on the original code by Siddartha Mohanadoss and Stephen Boyd.
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
drivers/thermal/qcom/Makefile | 2 +-
drivers/thermal/qcom/tsens-8974.c | 244 ++++++++++++++++++++++++++++++++++++++
drivers/thermal/qcom/tsens.c | 1 +
drivers/thermal/qcom/tsens.h | 2 +-
4 files changed, 247 insertions(+), 2 deletions(-)
create mode 100644 drivers/thermal/qcom/tsens-8974.c
diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile
index 05c98e4..a471100 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
+qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o
diff --git a/drivers/thermal/qcom/tsens-8974.c b/drivers/thermal/qcom/tsens-8974.c
new file mode 100644
index 0000000..da3ca4c
--- /dev/null
+++ b/drivers/thermal/qcom/tsens-8974.c
@@ -0,0 +1,244 @@
+/*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include "tsens.h"
+
+/* eeprom layout data for 8974 */
+#define BASE1_MASK 0xff
+#define S0_P1_MASK 0x3f00
+#define S1_P1_MASK 0xfc000
+#define S2_P1_MASK 0x3f00000
+#define S3_P1_MASK 0xfc000000
+#define S4_P1_MASK 0x3f
+#define S5_P1_MASK 0xfc0
+#define S6_P1_MASK 0x3f000
+#define S7_P1_MASK 0xfc0000
+#define S8_P1_MASK 0x3f000000
+#define S8_P1_MASK_BKP 0x3f
+#define S9_P1_MASK 0x3f
+#define S9_P1_MASK_BKP 0xfc0
+#define S10_P1_MASK 0xfc0
+#define S10_P1_MASK_BKP 0x3f000
+#define CAL_SEL_0_1 0xc0000000
+#define CAL_SEL_2 0x40000000
+#define CAL_SEL_SHIFT 30
+#define CAL_SEL_SHIFT_2 28
+
+#define S0_P1_SHIFT 8
+#define S1_P1_SHIFT 14
+#define S2_P1_SHIFT 20
+#define S3_P1_SHIFT 26
+#define S5_P1_SHIFT 6
+#define S6_P1_SHIFT 12
+#define S7_P1_SHIFT 18
+#define S8_P1_SHIFT 24
+#define S9_P1_BKP_SHIFT 6
+#define S10_P1_SHIFT 6
+#define S10_P1_BKP_SHIFT 12
+
+#define BASE2_SHIFT 12
+#define BASE2_BKP_SHIFT 18
+#define S0_P2_SHIFT 20
+#define S0_P2_BKP_SHIFT 26
+#define S1_P2_SHIFT 26
+#define S2_P2_BKP_SHIFT 6
+#define S3_P2_SHIFT 6
+#define S3_P2_BKP_SHIFT 12
+#define S4_P2_SHIFT 12
+#define S4_P2_BKP_SHIFT 18
+#define S5_P2_SHIFT 18
+#define S5_P2_BKP_SHIFT 24
+#define S6_P2_SHIFT 24
+#define S7_P2_BKP_SHIFT 6
+#define S8_P2_SHIFT 6
+#define S8_P2_BKP_SHIFT 12
+#define S9_P2_SHIFT 12
+#define S9_P2_BKP_SHIFT 18
+#define S10_P2_SHIFT 18
+#define S10_P2_BKP_SHIFT 24
+
+#define BASE2_MASK 0xff000
+#define BASE2_BKP_MASK 0xfc0000
+#define S0_P2_MASK 0x3f00000
+#define S0_P2_BKP_MASK 0xfc000000
+#define S1_P2_MASK 0xfc000000
+#define S1_P2_BKP_MASK 0x3f
+#define S2_P2_MASK 0x3f
+#define S2_P2_BKP_MASK 0xfc0
+#define S3_P2_MASK 0xfc0
+#define S3_P2_BKP_MASK 0x3f000
+#define S4_P2_MASK 0x3f000
+#define S4_P2_BKP_MASK 0xfc0000
+#define S5_P2_MASK 0xfc0000
+#define S5_P2_BKP_MASK 0x3f000000
+#define S6_P2_MASK 0x3f000000
+#define S6_P2_BKP_MASK 0x3f
+#define S7_P2_MASK 0x3f
+#define S7_P2_BKP_MASK 0xfc0
+#define S8_P2_MASK 0xfc0
+#define S8_P2_BKP_MASK 0x3f000
+#define S9_P2_MASK 0x3f000
+#define S9_P2_BKP_MASK 0xfc0000
+#define S10_P2_MASK 0xfc0000
+#define S10_P2_BKP_MASK 0x3f000000
+
+#define BKP_SEL 0x3
+#define BKP_REDUN_SEL 0xe0000000
+#define BKP_REDUN_SHIFT 29
+
+#define BIT_APPEND 0x3
+
+static int calibrate_8974(struct tsens_device *tmdev)
+{
+ int base1 = 0, base2 = 0, i;
+ u32 p1[11], p2[11];
+ int mode = 0;
+ u32 *calib, *bkp;
+ u32 calib_redun_sel;
+
+ calib = (u32 *)qfprom_read(tmdev->dev, "calib");
+ if (IS_ERR(calib))
+ return PTR_ERR(calib);
+
+ bkp = (u32 *)qfprom_read(tmdev->dev, "calib_backup");
+ if (IS_ERR(bkp))
+ return PTR_ERR(bkp);
+
+ calib_redun_sel = bkp[1] & BKP_REDUN_SEL;
+ calib_redun_sel >>= BKP_REDUN_SHIFT;
+
+ if (calib_redun_sel == BKP_SEL) {
+ mode = (calib[4] & CAL_SEL_0_1) >> CAL_SEL_SHIFT;
+ mode |= (calib[5] & CAL_SEL_2) >> CAL_SEL_SHIFT_2;
+
+ switch (mode) {
+ case TWO_PT_CALIB:
+ base2 = (bkp[2] & BASE2_BKP_MASK) >> BASE2_BKP_SHIFT;
+ p2[0] = (bkp[2] & S0_P2_BKP_MASK) >> S0_P2_BKP_SHIFT;
+ p2[1] = (bkp[3] & S1_P2_BKP_MASK);
+ p2[2] = (bkp[3] & S2_P2_BKP_MASK) >> S2_P2_BKP_SHIFT;
+ p2[3] = (bkp[3] & S3_P2_BKP_MASK) >> S3_P2_BKP_SHIFT;
+ p2[4] = (bkp[3] & S4_P2_BKP_MASK) >> S4_P2_BKP_SHIFT;
+ p2[5] = (calib[4] & S5_P2_BKP_MASK) >> S5_P2_BKP_SHIFT;
+ p2[6] = (calib[5] & S6_P2_BKP_MASK);
+ p2[7] = (calib[5] & S7_P2_BKP_MASK) >> S7_P2_BKP_SHIFT;
+ p2[8] = (calib[5] & S8_P2_BKP_MASK) >> S8_P2_BKP_SHIFT;
+ p2[9] = (calib[5] & S9_P2_BKP_MASK) >> S9_P2_BKP_SHIFT;
+ p2[10] = (calib[5] & S10_P2_BKP_MASK) >> S10_P2_BKP_SHIFT;
+ /* Fall through */
+ case ONE_PT_CALIB:
+ case ONE_PT_CALIB2:
+ base1 = bkp[0] & BASE1_MASK;
+ p1[0] = (bkp[0] & S0_P1_MASK) >> S0_P1_SHIFT;
+ p1[1] = (bkp[0] & S1_P1_MASK) >> S1_P1_SHIFT;
+ p1[2] = (bkp[0] & S2_P1_MASK) >> S2_P1_SHIFT;
+ p1[3] = (bkp[0] & S3_P1_MASK) >> S3_P1_SHIFT;
+ p1[4] = (bkp[1] & S4_P1_MASK);
+ p1[5] = (bkp[1] & S5_P1_MASK) >> S5_P1_SHIFT;
+ p1[6] = (bkp[1] & S6_P1_MASK) >> S6_P1_SHIFT;
+ p1[7] = (bkp[1] & S7_P1_MASK) >> S7_P1_SHIFT;
+ p1[8] = (bkp[2] & S8_P1_MASK_BKP) >> S8_P1_SHIFT;
+ p1[9] = (bkp[2] & S9_P1_MASK_BKP) >> S9_P1_BKP_SHIFT;
+ p1[10] = (bkp[2] & S10_P1_MASK_BKP) >> S10_P1_BKP_SHIFT;
+ break;
+ }
+ } else {
+ mode = (calib[1] & CAL_SEL_0_1) >> CAL_SEL_SHIFT;
+ mode |= (calib[3] & CAL_SEL_2) >> CAL_SEL_SHIFT_2;
+
+ switch (mode) {
+ case TWO_PT_CALIB:
+ base2 = (calib[2] & BASE2_MASK) >> BASE2_SHIFT;
+ p2[0] = (calib[2] & S0_P2_MASK) >> S0_P2_SHIFT;
+ p2[1] = (calib[2] & S1_P2_MASK) >> S1_P2_SHIFT;
+ p2[2] = (calib[3] & S2_P2_MASK);
+ p2[3] = (calib[3] & S3_P2_MASK) >> S3_P2_SHIFT;
+ p2[4] = (calib[3] & S4_P2_MASK) >> S4_P2_SHIFT;
+ p2[5] = (calib[3] & S5_P2_MASK) >> S5_P2_SHIFT;
+ p2[6] = (calib[3] & S6_P2_MASK) >> S6_P2_SHIFT;
+ p2[7] = (calib[4] & S7_P2_MASK);
+ p2[8] = (calib[4] & S8_P2_MASK) >> S8_P2_SHIFT;
+ p2[9] = (calib[4] & S9_P2_MASK) >> S9_P2_SHIFT;
+ p2[10] = (calib[4] & S10_P2_MASK) >> S10_P2_SHIFT;
+ /* Fall through */
+ case ONE_PT_CALIB:
+ case ONE_PT_CALIB2:
+ base1 = calib[0] & BASE1_MASK;
+ p1[0] = (calib[0] & S0_P1_MASK) >> S0_P1_SHIFT;
+ p1[1] = (calib[0] & S1_P1_MASK) >> S1_P1_SHIFT;
+ p1[2] = (calib[0] & S2_P1_MASK) >> S2_P1_SHIFT;
+ p1[3] = (calib[0] & S3_P1_MASK) >> S3_P1_SHIFT;
+ p1[4] = (calib[1] & S4_P1_MASK);
+ p1[5] = (calib[1] & S5_P1_MASK) >> S5_P1_SHIFT;
+ p1[6] = (calib[1] & S6_P1_MASK) >> S6_P1_SHIFT;
+ p1[7] = (calib[1] & S7_P1_MASK) >> S7_P1_SHIFT;
+ p1[8] = (calib[1] & S8_P1_MASK) >> S8_P1_SHIFT;
+ p1[9] = (calib[2] & S9_P1_MASK);
+ p1[10] = (calib[2] & S10_P1_MASK) >> S10_P1_SHIFT;
+ break;
+ }
+ }
+
+ switch (mode) {
+ case ONE_PT_CALIB:
+ for (i = 0; i < tmdev->num_sensors; i++)
+ p1[i] += (base1 << 2) | BIT_APPEND;
+ break;
+ case TWO_PT_CALIB:
+ for (i = 0; i < tmdev->num_sensors; i++) {
+ p2[i] += base2;
+ p2[i] <<= 2;
+ p2[i] |= BIT_APPEND;
+ }
+ /* Fall through */
+ case ONE_PT_CALIB2:
+ for (i = 0; i < tmdev->num_sensors; i++) {
+ p1[i] += base1;
+ p1[i] <<= 2;
+ p1[i] |= BIT_APPEND;
+ }
+ break;
+ default:
+ for (i = 0; i < tmdev->num_sensors; i++)
+ p2[i] = 780;
+ p1[0] = 502;
+ p1[1] = 509;
+ p1[2] = 503;
+ p1[3] = 509;
+ p1[4] = 505;
+ p1[5] = 509;
+ p1[6] = 507;
+ p1[7] = 510;
+ p1[8] = 508;
+ p1[9] = 509;
+ p1[10] = 508;
+ break;
+ }
+
+ compute_intercept_slope(tmdev, p1, p2, mode);
+
+ return 0;
+}
+
+const struct tsens_ops ops_8974 = {
+ .init = init_common,
+ .calibrate = calibrate_8974,
+ .get_temp = get_temp_common,
+};
+
+const struct tsens_data data_8974 = {
+ .num_sensors = 11,
+ .ops = &ops_8974,
+};
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index c11d2e4..99f3a6a 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -68,6 +68,7 @@ static const struct of_device_id tsens_table[] = {
.data = &data_8916,
}, {
.compatible = "qcom,msm8974-tsens",
+ .data = &data_8974,
},
{}
};
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index 0ecf979..d4cfb5f 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -87,6 +87,6 @@ void compute_intercept_slope(struct tsens_device *, u32 *, u32 *, u32);
int init_common(struct tsens_device *);
int get_temp_common(struct tsens_device *, int, int *);
-extern const struct tsens_data data_8916;
+extern const struct tsens_data data_8916, data_8974;
#endif /* __QCOM_TSENS_H__ */
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 04/11] thermal: core: export apis to get slope and offset
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
` (2 preceding siblings ...)
2016-04-14 9:31 ` [PATCH v5 03/11] thermal: qcom: tsens-8974: Add support for 8974 " Rajendra Nayak
@ 2016-04-14 9:31 ` Rajendra Nayak
2016-04-28 0:08 ` Eduardo Valentin
2016-04-14 9:31 ` [PATCH v5 05/11] thermal: qcom: tsens-8960: Add support for 8960 family of SoCs Rajendra Nayak
` (8 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Rajendra Nayak @ 2016-04-14 9:31 UTC (permalink / raw)
To: edubezval
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal, Rajendra Nayak
Add apis for platform thermal drivers to query for slope and offset
attributes, which might be needed for temperature calculations.
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
drivers/thermal/thermal_core.c | 16 ++++++++++++++++
include/linux/thermal.h | 8 ++++++++
2 files changed, 24 insertions(+)
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index d4b5465..7d72aad 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -2065,6 +2065,22 @@ exit:
}
EXPORT_SYMBOL_GPL(thermal_zone_get_zone_by_name);
+int thermal_zone_get_slope(struct thermal_zone_device *tz)
+{
+ if (tz && tz->tzp)
+ return tz->tzp->slope;
+ return 1;
+}
+EXPORT_SYMBOL_GPL(thermal_zone_get_slope);
+
+int thermal_zone_get_offset(struct thermal_zone_device *tz)
+{
+ if (tz && tz->tzp)
+ return tz->tzp->offset;
+ return 0;
+}
+EXPORT_SYMBOL_GPL(thermal_zone_get_offset);
+
#ifdef CONFIG_NET
static const struct genl_multicast_group thermal_event_mcgrps[] = {
{ .name = THERMAL_GENL_MCAST_GROUP_NAME, },
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index a55d052..84be6a9 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -432,6 +432,8 @@ thermal_of_cooling_device_register(struct device_node *np, char *, void *,
void thermal_cooling_device_unregister(struct thermal_cooling_device *);
struct thermal_zone_device *thermal_zone_get_zone_by_name(const char *name);
int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);
+int thermal_zone_get_slope(struct thermal_zone_device *tz);
+int thermal_zone_get_offset(struct thermal_zone_device *tz);
int get_tz_trend(struct thermal_zone_device *, int);
struct thermal_instance *get_thermal_instance(struct thermal_zone_device *,
@@ -489,6 +491,12 @@ static inline struct thermal_zone_device *thermal_zone_get_zone_by_name(
static inline int thermal_zone_get_temp(
struct thermal_zone_device *tz, int *temp)
{ return -ENODEV; }
+static inline int thermal_zone_get_slope(
+ struct thermal_zone_device *tz)
+{ return -ENODEV; }
+static inline int thermal_zone_get_offset(
+ struct thermal_zone_device *tz)
+{ return -ENODEV; }
static inline int get_tz_trend(struct thermal_zone_device *tz, int trip)
{ return -ENODEV; }
static inline struct thermal_instance *
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v5 04/11] thermal: core: export apis to get slope and offset
2016-04-14 9:31 ` [PATCH v5 04/11] thermal: core: export apis to get slope and offset Rajendra Nayak
@ 2016-04-28 0:08 ` Eduardo Valentin
2016-05-05 4:47 ` Rajendra Nayak
0 siblings, 1 reply; 26+ messages in thread
From: Eduardo Valentin @ 2016-04-28 0:08 UTC (permalink / raw)
To: Rajendra Nayak
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal
On Thu, Apr 14, 2016 at 03:01:52PM +0530, Rajendra Nayak wrote:
> Add apis for platform thermal drivers to query for slope and offset
> attributes, which might be needed for temperature calculations.
>
> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
> ---
> drivers/thermal/thermal_core.c | 16 ++++++++++++++++
> include/linux/thermal.h | 8 ++++++++
> 2 files changed, 24 insertions(+)
>
> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
> index d4b5465..7d72aad 100644
> --- a/drivers/thermal/thermal_core.c
> +++ b/drivers/thermal/thermal_core.c
> @@ -2065,6 +2065,22 @@ exit:
> }
> EXPORT_SYMBOL_GPL(thermal_zone_get_zone_by_name);
>
> +int thermal_zone_get_slope(struct thermal_zone_device *tz)
> +{
> + if (tz && tz->tzp)
> + return tz->tzp->slope;
> + return 1;
> +}
> +EXPORT_SYMBOL_GPL(thermal_zone_get_slope);
> +
> +int thermal_zone_get_offset(struct thermal_zone_device *tz)
> +{
> + if (tz && tz->tzp)
> + return tz->tzp->offset;
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(thermal_zone_get_offset);
Please include kernel doc entries for the exported functions. Updating
sysfs-api.txt would be also appreciated.
Thanks for adding this.
> +
> #ifdef CONFIG_NET
> static const struct genl_multicast_group thermal_event_mcgrps[] = {
> { .name = THERMAL_GENL_MCAST_GROUP_NAME, },
> diff --git a/include/linux/thermal.h b/include/linux/thermal.h
> index a55d052..84be6a9 100644
> --- a/include/linux/thermal.h
> +++ b/include/linux/thermal.h
> @@ -432,6 +432,8 @@ thermal_of_cooling_device_register(struct device_node *np, char *, void *,
> void thermal_cooling_device_unregister(struct thermal_cooling_device *);
> struct thermal_zone_device *thermal_zone_get_zone_by_name(const char *name);
> int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);
> +int thermal_zone_get_slope(struct thermal_zone_device *tz);
> +int thermal_zone_get_offset(struct thermal_zone_device *tz);
>
> int get_tz_trend(struct thermal_zone_device *, int);
> struct thermal_instance *get_thermal_instance(struct thermal_zone_device *,
> @@ -489,6 +491,12 @@ static inline struct thermal_zone_device *thermal_zone_get_zone_by_name(
> static inline int thermal_zone_get_temp(
> struct thermal_zone_device *tz, int *temp)
> { return -ENODEV; }
> +static inline int thermal_zone_get_slope(
> + struct thermal_zone_device *tz)
> +{ return -ENODEV; }
> +static inline int thermal_zone_get_offset(
> + struct thermal_zone_device *tz)
> +{ return -ENODEV; }
> static inline int get_tz_trend(struct thermal_zone_device *tz, int trip)
> { return -ENODEV; }
> static inline struct thermal_instance *
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v5 04/11] thermal: core: export apis to get slope and offset
2016-04-28 0:08 ` Eduardo Valentin
@ 2016-05-05 4:47 ` Rajendra Nayak
0 siblings, 0 replies; 26+ messages in thread
From: Rajendra Nayak @ 2016-05-05 4:47 UTC (permalink / raw)
To: Eduardo Valentin
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal
On 04/28/2016 05:38 AM, Eduardo Valentin wrote:
> On Thu, Apr 14, 2016 at 03:01:52PM +0530, Rajendra Nayak wrote:
>> Add apis for platform thermal drivers to query for slope and offset
>> attributes, which might be needed for temperature calculations.
>>
>> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
>> ---
>> drivers/thermal/thermal_core.c | 16 ++++++++++++++++
>> include/linux/thermal.h | 8 ++++++++
>> 2 files changed, 24 insertions(+)
>>
>> diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
>> index d4b5465..7d72aad 100644
>> --- a/drivers/thermal/thermal_core.c
>> +++ b/drivers/thermal/thermal_core.c
>> @@ -2065,6 +2065,22 @@ exit:
>> }
>> EXPORT_SYMBOL_GPL(thermal_zone_get_zone_by_name);
>>
>> +int thermal_zone_get_slope(struct thermal_zone_device *tz)
>> +{
>> + if (tz && tz->tzp)
>> + return tz->tzp->slope;
>> + return 1;
>> +}
>> +EXPORT_SYMBOL_GPL(thermal_zone_get_slope);
>> +
>> +int thermal_zone_get_offset(struct thermal_zone_device *tz)
>> +{
>> + if (tz && tz->tzp)
>> + return tz->tzp->offset;
>> + return 0;
>> +}
>> +EXPORT_SYMBOL_GPL(thermal_zone_get_offset);
>
>
> Please include kernel doc entries for the exported functions. Updating
> sysfs-api.txt would be also appreciated.
Sure, will update and repost.
>
> Thanks for adding this.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v5 05/11] thermal: qcom: tsens-8960: Add support for 8960 family of SoCs
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
` (3 preceding siblings ...)
2016-04-14 9:31 ` [PATCH v5 04/11] thermal: core: export apis to get slope and offset Rajendra Nayak
@ 2016-04-14 9:31 ` Rajendra Nayak
2016-04-28 0:10 ` Eduardo Valentin
2016-04-14 9:31 ` [PATCH v5 06/11] thermal: qcom: tsens-8996: Add support for 8996 " Rajendra Nayak
` (7 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Rajendra Nayak @ 2016-04-14 9:31 UTC (permalink / raw)
To: edubezval
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal, Rajendra Nayak
8960 family of SoCs have the TSENS device as part of GCC, hence
the driver probes the virtual child device created by GCC and
uses the parent to extract all DT properties and reuses the GCC
regmap.
Also GCC/TSENS are part of a domain thats not always ON.
Hence add .suspend and .resume hooks to save and restore some of
the inited register context.
Also 8960 family have some of the TSENS init sequence thats
required to be done by the HLOS driver (some later versions of TSENS
do not export these registers to non-secure world, and hence need
these initializations to be done by secure bootloaders)
8660 from the same family has just one sensor and hence some register
offset/layout differences which need special handling in the driver.
Based on the original code from Siddartha Mohanadoss, Stephen Boyd and
Narendran Rajan.
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
drivers/thermal/qcom/Makefile | 2 +-
drivers/thermal/qcom/tsens-8960.c | 293 ++++++++++++++++++++++++++++++++++++++
drivers/thermal/qcom/tsens.c | 8 +-
drivers/thermal/qcom/tsens.h | 2 +-
4 files changed, 299 insertions(+), 6 deletions(-)
create mode 100644 drivers/thermal/qcom/tsens-8960.c
diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile
index a471100..f3cefd1 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
+qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o
diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
new file mode 100644
index 0000000..a5976ec3
--- /dev/null
+++ b/drivers/thermal/qcom/tsens-8960.c
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/bitops.h>
+#include <linux/regmap.h>
+#include <linux/thermal.h>
+#include "tsens.h"
+
+#define CAL_MDEGC 30000
+
+#define CONFIG_ADDR 0x3640
+#define CONFIG_ADDR_8660 0x3620
+/* CONFIG_ADDR bitmasks */
+#define CONFIG 0x9b
+#define CONFIG_MASK 0xf
+#define CONFIG_8660 1
+#define CONFIG_SHIFT_8660 28
+#define CONFIG_MASK_8660 (3 << CONFIG_SHIFT_8660)
+
+#define STATUS_CNTL_ADDR_8064 0x3660
+#define CNTL_ADDR 0x3620
+/* CNTL_ADDR bitmasks */
+#define EN BIT(0)
+#define SW_RST BIT(1)
+#define SENSOR0_EN BIT(3)
+#define SLP_CLK_ENA BIT(26)
+#define SLP_CLK_ENA_8660 BIT(24)
+#define MEASURE_PERIOD 1
+#define SENSOR0_SHIFT 3
+
+/* INT_STATUS_ADDR bitmasks */
+#define MIN_STATUS_MASK BIT(0)
+#define LOWER_STATUS_CLR BIT(1)
+#define UPPER_STATUS_CLR BIT(2)
+#define MAX_STATUS_MASK BIT(3)
+
+#define THRESHOLD_ADDR 0x3624
+/* THRESHOLD_ADDR bitmasks */
+#define THRESHOLD_MAX_LIMIT_SHIFT 24
+#define THRESHOLD_MIN_LIMIT_SHIFT 16
+#define THRESHOLD_UPPER_LIMIT_SHIFT 8
+#define THRESHOLD_LOWER_LIMIT_SHIFT 0
+
+/* Initial temperature threshold values */
+#define LOWER_LIMIT_TH 0x50
+#define UPPER_LIMIT_TH 0xdf
+#define MIN_LIMIT_TH 0x0
+#define MAX_LIMIT_TH 0xff
+
+#define S0_STATUS_ADDR 0x3628
+#define INT_STATUS_ADDR 0x363c
+#define TRDY_MASK BIT(7)
+#define TIMEOUT_US 100
+
+static int suspend_8960(struct tsens_device *tmdev)
+{
+ int ret;
+ unsigned int mask;
+ struct regmap *map = tmdev->map;
+
+ ret = regmap_read(map, THRESHOLD_ADDR, &tmdev->ctx.threshold);
+ if (ret)
+ return ret;
+
+ ret = regmap_read(map, CNTL_ADDR, &tmdev->ctx.control);
+ if (ret)
+ return ret;
+
+ if (tmdev->num_sensors > 1)
+ mask = SLP_CLK_ENA | EN;
+ else
+ mask = SLP_CLK_ENA_8660 | EN;
+
+ ret = regmap_update_bits(map, CNTL_ADDR, mask, 0);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static int resume_8960(struct tsens_device *tmdev)
+{
+ int ret;
+ struct regmap *map = tmdev->map;
+
+ ret = regmap_update_bits(map, CNTL_ADDR, SW_RST, SW_RST);
+ if (ret)
+ return ret;
+
+ /*
+ * Separate CONFIG restore is not needed only for 8660 as
+ * config is part of CTRL Addr and its restored as such
+ */
+ if (tmdev->num_sensors > 1) {
+ ret = regmap_update_bits(map, CONFIG_ADDR, CONFIG_MASK, CONFIG);
+ if (ret)
+ return ret;
+ }
+
+ ret = regmap_write(map, THRESHOLD_ADDR, tmdev->ctx.threshold);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(map, CNTL_ADDR, tmdev->ctx.control);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static int enable_8960(struct tsens_device *tmdev, int id)
+{
+ int ret;
+ u32 reg, mask;
+
+ ret = regmap_read(tmdev->map, CNTL_ADDR, ®);
+ if (ret)
+ return ret;
+
+ mask = BIT(id + SENSOR0_SHIFT);
+ ret = regmap_write(tmdev->map, CNTL_ADDR, reg | SW_RST);
+ if (ret)
+ return ret;
+
+ if (tmdev->num_sensors > 1)
+ reg |= mask | SLP_CLK_ENA | EN;
+ else
+ reg |= mask | SLP_CLK_ENA_8660 | EN;
+
+ ret = regmap_write(tmdev->map, CNTL_ADDR, reg);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static void disable_8960(struct tsens_device *tmdev)
+{
+ int ret;
+ u32 reg_cntl;
+ u32 mask;
+
+ mask = GENMASK(tmdev->num_sensors - 1, 0);
+ mask <<= SENSOR0_SHIFT;
+ mask |= EN;
+
+ ret = regmap_read(tmdev->map, CNTL_ADDR, ®_cntl);
+ if (ret)
+ return;
+
+ reg_cntl &= ~mask;
+
+ if (tmdev->num_sensors > 1)
+ reg_cntl &= ~SLP_CLK_ENA;
+ else
+ reg_cntl &= ~SLP_CLK_ENA_8660;
+
+ regmap_write(tmdev->map, CNTL_ADDR, reg_cntl);
+}
+
+static int init_8960(struct tsens_device *tmdev)
+{
+ int ret, i;
+ u32 reg_cntl;
+
+ tmdev->map = dev_get_regmap(tmdev->dev, NULL);
+ if (!tmdev->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 < tmdev->num_sensors; i++) {
+ if (i >= 5)
+ tmdev->sensor[i].status = S0_STATUS_ADDR + 40;
+ tmdev->sensor[i].status += i * 4;
+ }
+
+ reg_cntl = SW_RST;
+ ret = regmap_update_bits(tmdev->map, CNTL_ADDR, SW_RST, reg_cntl);
+ if (ret)
+ return ret;
+
+ if (tmdev->num_sensors > 1) {
+ reg_cntl |= SLP_CLK_ENA | (MEASURE_PERIOD << 18);
+ reg_cntl &= ~SW_RST;
+ ret = regmap_update_bits(tmdev->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(tmdev->num_sensors - 1, 0) << SENSOR0_SHIFT;
+ ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl);
+ if (ret)
+ return ret;
+
+ reg_cntl |= EN;
+ ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
+static int calibrate_8960(struct tsens_device *tmdev)
+{
+ int i;
+ char *data;
+
+ ssize_t num_read = tmdev->num_sensors;
+ struct tsens_sensor *s = tmdev->sensor;
+
+ data = qfprom_read(tmdev->dev, "calib");
+ if (IS_ERR(data))
+ data = qfprom_read(tmdev->dev, "calib_backup");
+ if (IS_ERR(data))
+ return PTR_ERR(data);
+
+ for (i = 0; i < num_read; i++, s++)
+ s->offset = data[i];
+
+ return 0;
+}
+
+/* Temperature on y axis and ADC-code on x-axis */
+static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s)
+{
+ u32 slope;
+ int offset;
+
+ slope = thermal_zone_get_slope(s->tzd);;
+ offset = CAL_MDEGC - slope * s->offset;
+
+ return adc_code * slope + offset;
+}
+
+static int get_temp_8960(struct tsens_device *tmdev, int id, int *temp)
+{
+ int ret;
+ u32 code, trdy;
+ const struct tsens_sensor *s = &tmdev->sensor[id];
+ unsigned long timeout;
+
+ timeout = jiffies + usecs_to_jiffies(TIMEOUT_US);
+ do {
+ ret = regmap_read(tmdev->map, INT_STATUS_ADDR, &trdy);
+ if (ret)
+ return ret;
+ if (!(trdy & TRDY_MASK))
+ continue;
+ ret = regmap_read(tmdev->map, s->status, &code);
+ if (ret)
+ return ret;
+ *temp = code_to_mdegC(code, s);
+ return 0;
+ } while (time_before(jiffies, timeout));
+
+ return -ETIMEDOUT;
+}
+
+const struct tsens_ops ops_8960 = {
+ .init = init_8960,
+ .calibrate = calibrate_8960,
+ .get_temp = get_temp_8960,
+ .enable = enable_8960,
+ .disable = disable_8960,
+ .suspend = suspend_8960,
+ .resume = resume_8960,
+};
+
+const struct tsens_data data_8960 = {
+ .num_sensors = 11,
+ .ops = &ops_8960,
+};
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 99f3a6a..096f64d 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -122,10 +122,10 @@ static int tsens_probe(struct platform_device *pdev)
np = dev->of_node;
id = of_match_node(tsens_table, np);
- if (!id)
- return -EINVAL;
-
- data = id->data;
+ if (id)
+ data = id->data;
+ else
+ data = &data_8960;
if (data->num_sensors <= 0) {
dev_err(dev, "invalid number of sensors\n");
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index d4cfb5f..146d4f1 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -87,6 +87,6 @@ void compute_intercept_slope(struct tsens_device *, u32 *, u32 *, u32);
int init_common(struct tsens_device *);
int get_temp_common(struct tsens_device *, int, int *);
-extern const struct tsens_data data_8916, data_8974;
+extern const struct tsens_data data_8916, data_8974, data_8960;
#endif /* __QCOM_TSENS_H__ */
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v5 05/11] thermal: qcom: tsens-8960: Add support for 8960 family of SoCs
2016-04-14 9:31 ` [PATCH v5 05/11] thermal: qcom: tsens-8960: Add support for 8960 family of SoCs Rajendra Nayak
@ 2016-04-28 0:10 ` Eduardo Valentin
2016-05-05 4:48 ` Rajendra Nayak
0 siblings, 1 reply; 26+ messages in thread
From: Eduardo Valentin @ 2016-04-28 0:10 UTC (permalink / raw)
To: Rajendra Nayak
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal
On Thu, Apr 14, 2016 at 03:01:53PM +0530, Rajendra Nayak wrote:
> 8960 family of SoCs have the TSENS device as part of GCC, hence
> the driver probes the virtual child device created by GCC and
> uses the parent to extract all DT properties and reuses the GCC
> regmap.
>
> Also GCC/TSENS are part of a domain thats not always ON.
> Hence add .suspend and .resume hooks to save and restore some of
> the inited register context.
>
> Also 8960 family have some of the TSENS init sequence thats
> required to be done by the HLOS driver (some later versions of TSENS
> do not export these registers to non-secure world, and hence need
> these initializations to be done by secure bootloaders)
>
> 8660 from the same family has just one sensor and hence some register
> offset/layout differences which need special handling in the driver.
>
> Based on the original code from Siddartha Mohanadoss, Stephen Boyd and
> Narendran Rajan.
>
> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
> ---
> drivers/thermal/qcom/Makefile | 2 +-
> drivers/thermal/qcom/tsens-8960.c | 293 ++++++++++++++++++++++++++++++++++++++
> drivers/thermal/qcom/tsens.c | 8 +-
> drivers/thermal/qcom/tsens.h | 2 +-
> 4 files changed, 299 insertions(+), 6 deletions(-)
> create mode 100644 drivers/thermal/qcom/tsens-8960.c
>
> diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile
> index a471100..f3cefd1 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
> +qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o
> diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
> new file mode 100644
> index 0000000..a5976ec3
> --- /dev/null
> +++ b/drivers/thermal/qcom/tsens-8960.c
> @@ -0,0 +1,293 @@
> +/*
> + * Copyright (c) 2015, The Linux Foundation. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 and
> + * only version 2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + */
> +
> +#include <linux/platform_device.h>
> +#include <linux/delay.h>
> +#include <linux/bitops.h>
> +#include <linux/regmap.h>
> +#include <linux/thermal.h>
> +#include "tsens.h"
> +
> +#define CAL_MDEGC 30000
> +
> +#define CONFIG_ADDR 0x3640
> +#define CONFIG_ADDR_8660 0x3620
> +/* CONFIG_ADDR bitmasks */
> +#define CONFIG 0x9b
> +#define CONFIG_MASK 0xf
> +#define CONFIG_8660 1
> +#define CONFIG_SHIFT_8660 28
> +#define CONFIG_MASK_8660 (3 << CONFIG_SHIFT_8660)
> +
> +#define STATUS_CNTL_ADDR_8064 0x3660
> +#define CNTL_ADDR 0x3620
> +/* CNTL_ADDR bitmasks */
> +#define EN BIT(0)
> +#define SW_RST BIT(1)
> +#define SENSOR0_EN BIT(3)
> +#define SLP_CLK_ENA BIT(26)
> +#define SLP_CLK_ENA_8660 BIT(24)
> +#define MEASURE_PERIOD 1
> +#define SENSOR0_SHIFT 3
> +
> +/* INT_STATUS_ADDR bitmasks */
> +#define MIN_STATUS_MASK BIT(0)
> +#define LOWER_STATUS_CLR BIT(1)
> +#define UPPER_STATUS_CLR BIT(2)
> +#define MAX_STATUS_MASK BIT(3)
> +
> +#define THRESHOLD_ADDR 0x3624
> +/* THRESHOLD_ADDR bitmasks */
> +#define THRESHOLD_MAX_LIMIT_SHIFT 24
> +#define THRESHOLD_MIN_LIMIT_SHIFT 16
> +#define THRESHOLD_UPPER_LIMIT_SHIFT 8
> +#define THRESHOLD_LOWER_LIMIT_SHIFT 0
> +
> +/* Initial temperature threshold values */
> +#define LOWER_LIMIT_TH 0x50
> +#define UPPER_LIMIT_TH 0xdf
> +#define MIN_LIMIT_TH 0x0
> +#define MAX_LIMIT_TH 0xff
> +
> +#define S0_STATUS_ADDR 0x3628
> +#define INT_STATUS_ADDR 0x363c
> +#define TRDY_MASK BIT(7)
> +#define TIMEOUT_US 100
> +
> +static int suspend_8960(struct tsens_device *tmdev)
> +{
> + int ret;
> + unsigned int mask;
> + struct regmap *map = tmdev->map;
> +
> + ret = regmap_read(map, THRESHOLD_ADDR, &tmdev->ctx.threshold);
> + if (ret)
> + return ret;
> +
> + ret = regmap_read(map, CNTL_ADDR, &tmdev->ctx.control);
> + if (ret)
> + return ret;
> +
> + if (tmdev->num_sensors > 1)
> + mask = SLP_CLK_ENA | EN;
> + else
> + mask = SLP_CLK_ENA_8660 | EN;
> +
> + ret = regmap_update_bits(map, CNTL_ADDR, mask, 0);
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +
> +static int resume_8960(struct tsens_device *tmdev)
> +{
> + int ret;
> + struct regmap *map = tmdev->map;
> +
> + ret = regmap_update_bits(map, CNTL_ADDR, SW_RST, SW_RST);
> + if (ret)
> + return ret;
> +
> + /*
> + * Separate CONFIG restore is not needed only for 8660 as
> + * config is part of CTRL Addr and its restored as such
> + */
> + if (tmdev->num_sensors > 1) {
> + ret = regmap_update_bits(map, CONFIG_ADDR, CONFIG_MASK, CONFIG);
> + if (ret)
> + return ret;
> + }
> +
> + ret = regmap_write(map, THRESHOLD_ADDR, tmdev->ctx.threshold);
> + if (ret)
> + return ret;
> +
> + ret = regmap_write(map, CNTL_ADDR, tmdev->ctx.control);
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +
> +static int enable_8960(struct tsens_device *tmdev, int id)
> +{
> + int ret;
> + u32 reg, mask;
> +
> + ret = regmap_read(tmdev->map, CNTL_ADDR, ®);
> + if (ret)
> + return ret;
> +
> + mask = BIT(id + SENSOR0_SHIFT);
> + ret = regmap_write(tmdev->map, CNTL_ADDR, reg | SW_RST);
> + if (ret)
> + return ret;
> +
> + if (tmdev->num_sensors > 1)
> + reg |= mask | SLP_CLK_ENA | EN;
> + else
> + reg |= mask | SLP_CLK_ENA_8660 | EN;
> +
> + ret = regmap_write(tmdev->map, CNTL_ADDR, reg);
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +
> +static void disable_8960(struct tsens_device *tmdev)
> +{
> + int ret;
> + u32 reg_cntl;
> + u32 mask;
> +
> + mask = GENMASK(tmdev->num_sensors - 1, 0);
> + mask <<= SENSOR0_SHIFT;
> + mask |= EN;
> +
> + ret = regmap_read(tmdev->map, CNTL_ADDR, ®_cntl);
> + if (ret)
> + return;
> +
> + reg_cntl &= ~mask;
> +
> + if (tmdev->num_sensors > 1)
> + reg_cntl &= ~SLP_CLK_ENA;
> + else
> + reg_cntl &= ~SLP_CLK_ENA_8660;
> +
> + regmap_write(tmdev->map, CNTL_ADDR, reg_cntl);
> +}
> +
> +static int init_8960(struct tsens_device *tmdev)
> +{
> + int ret, i;
> + u32 reg_cntl;
> +
> + tmdev->map = dev_get_regmap(tmdev->dev, NULL);
> + if (!tmdev->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 < tmdev->num_sensors; i++) {
> + if (i >= 5)
> + tmdev->sensor[i].status = S0_STATUS_ADDR + 40;
> + tmdev->sensor[i].status += i * 4;
> + }
> +
> + reg_cntl = SW_RST;
> + ret = regmap_update_bits(tmdev->map, CNTL_ADDR, SW_RST, reg_cntl);
> + if (ret)
> + return ret;
> +
> + if (tmdev->num_sensors > 1) {
> + reg_cntl |= SLP_CLK_ENA | (MEASURE_PERIOD << 18);
> + reg_cntl &= ~SW_RST;
> + ret = regmap_update_bits(tmdev->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(tmdev->num_sensors - 1, 0) << SENSOR0_SHIFT;
> + ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl);
> + if (ret)
> + return ret;
> +
> + reg_cntl |= EN;
> + ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl);
> + if (ret)
> + return ret;
> +
> + return 0;
> +}
> +
> +static int calibrate_8960(struct tsens_device *tmdev)
> +{
> + int i;
> + char *data;
> +
> + ssize_t num_read = tmdev->num_sensors;
> + struct tsens_sensor *s = tmdev->sensor;
> +
> + data = qfprom_read(tmdev->dev, "calib");
> + if (IS_ERR(data))
> + data = qfprom_read(tmdev->dev, "calib_backup");
> + if (IS_ERR(data))
> + return PTR_ERR(data);
> +
> + for (i = 0; i < num_read; i++, s++)
> + s->offset = data[i];
> +
> + return 0;
> +}
> +
> +/* Temperature on y axis and ADC-code on x-axis */
> +static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s)
> +{
> + u32 slope;
why unsigned?
> + int offset;
> +
> + slope = thermal_zone_get_slope(s->tzd);;
Please use one single ;
> + offset = CAL_MDEGC - slope * s->offset;
> +
> + return adc_code * slope + offset;
> +}
> +
> +static int get_temp_8960(struct tsens_device *tmdev, int id, int *temp)
> +{
> + int ret;
> + u32 code, trdy;
> + const struct tsens_sensor *s = &tmdev->sensor[id];
> + unsigned long timeout;
> +
> + timeout = jiffies + usecs_to_jiffies(TIMEOUT_US);
> + do {
> + ret = regmap_read(tmdev->map, INT_STATUS_ADDR, &trdy);
> + if (ret)
> + return ret;
> + if (!(trdy & TRDY_MASK))
> + continue;
> + ret = regmap_read(tmdev->map, s->status, &code);
> + if (ret)
> + return ret;
> + *temp = code_to_mdegC(code, s);
> + return 0;
> + } while (time_before(jiffies, timeout));
> +
> + return -ETIMEDOUT;
> +}
> +
> +const struct tsens_ops ops_8960 = {
> + .init = init_8960,
> + .calibrate = calibrate_8960,
> + .get_temp = get_temp_8960,
> + .enable = enable_8960,
> + .disable = disable_8960,
> + .suspend = suspend_8960,
> + .resume = resume_8960,
> +};
> +
> +const struct tsens_data data_8960 = {
> + .num_sensors = 11,
> + .ops = &ops_8960,
> +};
> diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
> index 99f3a6a..096f64d 100644
> --- a/drivers/thermal/qcom/tsens.c
> +++ b/drivers/thermal/qcom/tsens.c
> @@ -122,10 +122,10 @@ static int tsens_probe(struct platform_device *pdev)
> np = dev->of_node;
>
> id = of_match_node(tsens_table, np);
> - if (!id)
> - return -EINVAL;
> -
> - data = id->data;
> + if (id)
> + data = id->data;
> + else
> + data = &data_8960;
>
> if (data->num_sensors <= 0) {
> dev_err(dev, "invalid number of sensors\n");
> diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
> index d4cfb5f..146d4f1 100644
> --- a/drivers/thermal/qcom/tsens.h
> +++ b/drivers/thermal/qcom/tsens.h
> @@ -87,6 +87,6 @@ void compute_intercept_slope(struct tsens_device *, u32 *, u32 *, u32);
> int init_common(struct tsens_device *);
> int get_temp_common(struct tsens_device *, int, int *);
>
> -extern const struct tsens_data data_8916, data_8974;
> +extern const struct tsens_data data_8916, data_8974, data_8960;
>
> #endif /* __QCOM_TSENS_H__ */
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v5 05/11] thermal: qcom: tsens-8960: Add support for 8960 family of SoCs
2016-04-28 0:10 ` Eduardo Valentin
@ 2016-05-05 4:48 ` Rajendra Nayak
0 siblings, 0 replies; 26+ messages in thread
From: Rajendra Nayak @ 2016-05-05 4:48 UTC (permalink / raw)
To: Eduardo Valentin
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal
On 04/28/2016 05:40 AM, Eduardo Valentin wrote:
> On Thu, Apr 14, 2016 at 03:01:53PM +0530, Rajendra Nayak wrote:
>> 8960 family of SoCs have the TSENS device as part of GCC, hence
>> the driver probes the virtual child device created by GCC and
>> uses the parent to extract all DT properties and reuses the GCC
>> regmap.
>>
>> Also GCC/TSENS are part of a domain thats not always ON.
>> Hence add .suspend and .resume hooks to save and restore some of
>> the inited register context.
>>
>> Also 8960 family have some of the TSENS init sequence thats
>> required to be done by the HLOS driver (some later versions of TSENS
>> do not export these registers to non-secure world, and hence need
>> these initializations to be done by secure bootloaders)
>>
>> 8660 from the same family has just one sensor and hence some register
>> offset/layout differences which need special handling in the driver.
>>
>> Based on the original code from Siddartha Mohanadoss, Stephen Boyd and
>> Narendran Rajan.
>>
>> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
>> ---
>> drivers/thermal/qcom/Makefile | 2 +-
>> drivers/thermal/qcom/tsens-8960.c | 293 ++++++++++++++++++++++++++++++++++++++
>> drivers/thermal/qcom/tsens.c | 8 +-
>> drivers/thermal/qcom/tsens.h | 2 +-
>> 4 files changed, 299 insertions(+), 6 deletions(-)
>> create mode 100644 drivers/thermal/qcom/tsens-8960.c
>>
>> diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile
>> index a471100..f3cefd1 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
>> +qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o
>> diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
>> new file mode 100644
>> index 0000000..a5976ec3
>> --- /dev/null
>> +++ b/drivers/thermal/qcom/tsens-8960.c
>> @@ -0,0 +1,293 @@
>> +/*
>> + * Copyright (c) 2015, The Linux Foundation. All rights reserved.
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 and
>> + * only version 2 as published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU General Public License for more details.
>> + *
>> + */
>> +
>> +#include <linux/platform_device.h>
>> +#include <linux/delay.h>
>> +#include <linux/bitops.h>
>> +#include <linux/regmap.h>
>> +#include <linux/thermal.h>
>> +#include "tsens.h"
>> +
>> +#define CAL_MDEGC 30000
>> +
>> +#define CONFIG_ADDR 0x3640
>> +#define CONFIG_ADDR_8660 0x3620
>> +/* CONFIG_ADDR bitmasks */
>> +#define CONFIG 0x9b
>> +#define CONFIG_MASK 0xf
>> +#define CONFIG_8660 1
>> +#define CONFIG_SHIFT_8660 28
>> +#define CONFIG_MASK_8660 (3 << CONFIG_SHIFT_8660)
>> +
>> +#define STATUS_CNTL_ADDR_8064 0x3660
>> +#define CNTL_ADDR 0x3620
>> +/* CNTL_ADDR bitmasks */
>> +#define EN BIT(0)
>> +#define SW_RST BIT(1)
>> +#define SENSOR0_EN BIT(3)
>> +#define SLP_CLK_ENA BIT(26)
>> +#define SLP_CLK_ENA_8660 BIT(24)
>> +#define MEASURE_PERIOD 1
>> +#define SENSOR0_SHIFT 3
>> +
>> +/* INT_STATUS_ADDR bitmasks */
>> +#define MIN_STATUS_MASK BIT(0)
>> +#define LOWER_STATUS_CLR BIT(1)
>> +#define UPPER_STATUS_CLR BIT(2)
>> +#define MAX_STATUS_MASK BIT(3)
>> +
>> +#define THRESHOLD_ADDR 0x3624
>> +/* THRESHOLD_ADDR bitmasks */
>> +#define THRESHOLD_MAX_LIMIT_SHIFT 24
>> +#define THRESHOLD_MIN_LIMIT_SHIFT 16
>> +#define THRESHOLD_UPPER_LIMIT_SHIFT 8
>> +#define THRESHOLD_LOWER_LIMIT_SHIFT 0
>> +
>> +/* Initial temperature threshold values */
>> +#define LOWER_LIMIT_TH 0x50
>> +#define UPPER_LIMIT_TH 0xdf
>> +#define MIN_LIMIT_TH 0x0
>> +#define MAX_LIMIT_TH 0xff
>> +
>> +#define S0_STATUS_ADDR 0x3628
>> +#define INT_STATUS_ADDR 0x363c
>> +#define TRDY_MASK BIT(7)
>> +#define TIMEOUT_US 100
>> +
>> +static int suspend_8960(struct tsens_device *tmdev)
>> +{
>> + int ret;
>> + unsigned int mask;
>> + struct regmap *map = tmdev->map;
>> +
>> + ret = regmap_read(map, THRESHOLD_ADDR, &tmdev->ctx.threshold);
>> + if (ret)
>> + return ret;
>> +
>> + ret = regmap_read(map, CNTL_ADDR, &tmdev->ctx.control);
>> + if (ret)
>> + return ret;
>> +
>> + if (tmdev->num_sensors > 1)
>> + mask = SLP_CLK_ENA | EN;
>> + else
>> + mask = SLP_CLK_ENA_8660 | EN;
>> +
>> + ret = regmap_update_bits(map, CNTL_ADDR, mask, 0);
>> + if (ret)
>> + return ret;
>> +
>> + return 0;
>> +}
>> +
>> +static int resume_8960(struct tsens_device *tmdev)
>> +{
>> + int ret;
>> + struct regmap *map = tmdev->map;
>> +
>> + ret = regmap_update_bits(map, CNTL_ADDR, SW_RST, SW_RST);
>> + if (ret)
>> + return ret;
>> +
>> + /*
>> + * Separate CONFIG restore is not needed only for 8660 as
>> + * config is part of CTRL Addr and its restored as such
>> + */
>> + if (tmdev->num_sensors > 1) {
>> + ret = regmap_update_bits(map, CONFIG_ADDR, CONFIG_MASK, CONFIG);
>> + if (ret)
>> + return ret;
>> + }
>> +
>> + ret = regmap_write(map, THRESHOLD_ADDR, tmdev->ctx.threshold);
>> + if (ret)
>> + return ret;
>> +
>> + ret = regmap_write(map, CNTL_ADDR, tmdev->ctx.control);
>> + if (ret)
>> + return ret;
>> +
>> + return 0;
>> +}
>> +
>> +static int enable_8960(struct tsens_device *tmdev, int id)
>> +{
>> + int ret;
>> + u32 reg, mask;
>> +
>> + ret = regmap_read(tmdev->map, CNTL_ADDR, ®);
>> + if (ret)
>> + return ret;
>> +
>> + mask = BIT(id + SENSOR0_SHIFT);
>> + ret = regmap_write(tmdev->map, CNTL_ADDR, reg | SW_RST);
>> + if (ret)
>> + return ret;
>> +
>> + if (tmdev->num_sensors > 1)
>> + reg |= mask | SLP_CLK_ENA | EN;
>> + else
>> + reg |= mask | SLP_CLK_ENA_8660 | EN;
>> +
>> + ret = regmap_write(tmdev->map, CNTL_ADDR, reg);
>> + if (ret)
>> + return ret;
>> +
>> + return 0;
>> +}
>> +
>> +static void disable_8960(struct tsens_device *tmdev)
>> +{
>> + int ret;
>> + u32 reg_cntl;
>> + u32 mask;
>> +
>> + mask = GENMASK(tmdev->num_sensors - 1, 0);
>> + mask <<= SENSOR0_SHIFT;
>> + mask |= EN;
>> +
>> + ret = regmap_read(tmdev->map, CNTL_ADDR, ®_cntl);
>> + if (ret)
>> + return;
>> +
>> + reg_cntl &= ~mask;
>> +
>> + if (tmdev->num_sensors > 1)
>> + reg_cntl &= ~SLP_CLK_ENA;
>> + else
>> + reg_cntl &= ~SLP_CLK_ENA_8660;
>> +
>> + regmap_write(tmdev->map, CNTL_ADDR, reg_cntl);
>> +}
>> +
>> +static int init_8960(struct tsens_device *tmdev)
>> +{
>> + int ret, i;
>> + u32 reg_cntl;
>> +
>> + tmdev->map = dev_get_regmap(tmdev->dev, NULL);
>> + if (!tmdev->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 < tmdev->num_sensors; i++) {
>> + if (i >= 5)
>> + tmdev->sensor[i].status = S0_STATUS_ADDR + 40;
>> + tmdev->sensor[i].status += i * 4;
>> + }
>> +
>> + reg_cntl = SW_RST;
>> + ret = regmap_update_bits(tmdev->map, CNTL_ADDR, SW_RST, reg_cntl);
>> + if (ret)
>> + return ret;
>> +
>> + if (tmdev->num_sensors > 1) {
>> + reg_cntl |= SLP_CLK_ENA | (MEASURE_PERIOD << 18);
>> + reg_cntl &= ~SW_RST;
>> + ret = regmap_update_bits(tmdev->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(tmdev->num_sensors - 1, 0) << SENSOR0_SHIFT;
>> + ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl);
>> + if (ret)
>> + return ret;
>> +
>> + reg_cntl |= EN;
>> + ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl);
>> + if (ret)
>> + return ret;
>> +
>> + return 0;
>> +}
>> +
>> +static int calibrate_8960(struct tsens_device *tmdev)
>> +{
>> + int i;
>> + char *data;
>> +
>> + ssize_t num_read = tmdev->num_sensors;
>> + struct tsens_sensor *s = tmdev->sensor;
>> +
>> + data = qfprom_read(tmdev->dev, "calib");
>> + if (IS_ERR(data))
>> + data = qfprom_read(tmdev->dev, "calib_backup");
>> + if (IS_ERR(data))
>> + return PTR_ERR(data);
>> +
>> + for (i = 0; i < num_read; i++, s++)
>> + s->offset = data[i];
>> +
>> + return 0;
>> +}
>> +
>> +/* Temperature on y axis and ADC-code on x-axis */
>> +static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s)
>> +{
>> + u32 slope;
>
> why unsigned?
>
>> + int offset;
>> +
>> + slope = thermal_zone_get_slope(s->tzd);;
>
> Please use one single ;
Will fix both when I repost.
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v5 06/11] thermal: qcom: tsens-8996: Add support for 8996 family of SoCs
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
` (4 preceding siblings ...)
2016-04-14 9:31 ` [PATCH v5 05/11] thermal: qcom: tsens-8960: Add support for 8960 family of SoCs Rajendra Nayak
@ 2016-04-14 9:31 ` Rajendra Nayak
2016-04-28 0:13 ` Eduardo Valentin
2016-04-14 9:31 ` [PATCH v5 07/11] arm: dts: msm8974: Add thermal zones, tsens and qfprom nodes Rajendra Nayak
` (6 subsequent siblings)
12 siblings, 1 reply; 26+ messages in thread
From: Rajendra Nayak @ 2016-04-14 9:31 UTC (permalink / raw)
To: edubezval
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal, Rajendra Nayak
The TSENS controller in 8996 family of SoCs is capable of converting the
ADC code outputs to real temperature values (in decidegree Celsius).
It can also be programmed to provide raw ADC code, but the secure software
on 8996 programs it to provide real temperatures and also does the needed
calibrations.
We check the valid bit to ensure valid data is read by the AHB master.
And the spec recommends the below algorithm to read data 3 consecutive
times, which takes care of the worst case delay taken to propogate the
updated data to the register.
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
drivers/thermal/qcom/Makefile | 2 +-
drivers/thermal/qcom/tsens-8996.c | 82 +++++++++++++++++++++++++++++++++++++++
drivers/thermal/qcom/tsens.c | 3 ++
drivers/thermal/qcom/tsens.h | 2 +-
4 files changed, 87 insertions(+), 2 deletions(-)
create mode 100644 drivers/thermal/qcom/tsens-8996.c
diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile
index f3cefd1..2cc2193 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
+qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-8996.o
diff --git a/drivers/thermal/qcom/tsens-8996.c b/drivers/thermal/qcom/tsens-8996.c
new file mode 100644
index 0000000..3d70aa0
--- /dev/null
+++ b/drivers/thermal/qcom/tsens-8996.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include "tsens.h"
+
+#define STATUS_OFFSET 0x10a0
+#define LAST_TEMP_MASK 0xfff
+#define STATUS_VALID_BIT BIT(21)
+#define CODE_SIGN_BIT BIT(11)
+
+static int get_temp_8996(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;
+
+ 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;
+
+ return 0;
+}
+
+const struct tsens_ops ops_8996 = {
+ .init = init_common,
+ .get_temp = get_temp_8996,
+};
+
+const struct tsens_data data_8996 = {
+ .num_sensors = 13,
+ .ops = &ops_8996,
+};
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index 096f64d..9ebe020 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -69,6 +69,9 @@ static const struct of_device_id tsens_table[] = {
}, {
.compatible = "qcom,msm8974-tsens",
.data = &data_8974,
+ }, {
+ .compatible = "qcom,msm8996-tsens",
+ .data = &data_8996,
},
{}
};
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index 146d4f1..4a12df2 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -87,6 +87,6 @@ void compute_intercept_slope(struct tsens_device *, u32 *, u32 *, u32);
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;
+extern const struct tsens_data data_8916, data_8974, data_8960, data_8996;
#endif /* __QCOM_TSENS_H__ */
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v5 06/11] thermal: qcom: tsens-8996: Add support for 8996 family of SoCs
2016-04-14 9:31 ` [PATCH v5 06/11] thermal: qcom: tsens-8996: Add support for 8996 " Rajendra Nayak
@ 2016-04-28 0:13 ` Eduardo Valentin
0 siblings, 0 replies; 26+ messages in thread
From: Eduardo Valentin @ 2016-04-28 0:13 UTC (permalink / raw)
To: Rajendra Nayak
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal
On Thu, Apr 14, 2016 at 03:01:54PM +0530, Rajendra Nayak wrote:
> The TSENS controller in 8996 family of SoCs is capable of converting the
> ADC code outputs to real temperature values (in decidegree Celsius).
> It can also be programmed to provide raw ADC code, but the secure software
> on 8996 programs it to provide real temperatures and also does the needed
> calibrations.
>
> We check the valid bit to ensure valid data is read by the AHB master.
> And the spec recommends the below algorithm to read data 3 consecutive
> times, which takes care of the worst case delay taken to propogate the
s/propogate/propagate/g ?
> updated data to the register.
>
> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
> ---
> drivers/thermal/qcom/Makefile | 2 +-
> drivers/thermal/qcom/tsens-8996.c | 82 +++++++++++++++++++++++++++++++++++++++
> drivers/thermal/qcom/tsens.c | 3 ++
> drivers/thermal/qcom/tsens.h | 2 +-
> 4 files changed, 87 insertions(+), 2 deletions(-)
> create mode 100644 drivers/thermal/qcom/tsens-8996.c
>
> diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile
> index f3cefd1..2cc2193 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
> +qcom_tsens-y += tsens.o tsens-common.o tsens-8916.o tsens-8974.o tsens-8960.o tsens-8996.o
> diff --git a/drivers/thermal/qcom/tsens-8996.c b/drivers/thermal/qcom/tsens-8996.c
> new file mode 100644
> index 0000000..3d70aa0
> --- /dev/null
> +++ b/drivers/thermal/qcom/tsens-8996.c
> @@ -0,0 +1,82 @@
> +/*
> + * Copyright (c) 2015, The Linux Foundation. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 and
> + * only version 2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + */
> +
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include "tsens.h"
> +
> +#define STATUS_OFFSET 0x10a0
> +#define LAST_TEMP_MASK 0xfff
> +#define STATUS_VALID_BIT BIT(21)
> +#define CODE_SIGN_BIT BIT(11)
> +
> +static int get_temp_8996(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;
> +
> + 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;
I believe coding style suggests you to use {} on all arms in this if.
> +
> + /* 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;
> +
ditto.
> + 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;
> +
> + return 0;
> +}
> +
> +const struct tsens_ops ops_8996 = {
> + .init = init_common,
> + .get_temp = get_temp_8996,
> +};
> +
> +const struct tsens_data data_8996 = {
> + .num_sensors = 13,
> + .ops = &ops_8996,
> +};
> diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
> index 096f64d..9ebe020 100644
> --- a/drivers/thermal/qcom/tsens.c
> +++ b/drivers/thermal/qcom/tsens.c
> @@ -69,6 +69,9 @@ static const struct of_device_id tsens_table[] = {
> }, {
> .compatible = "qcom,msm8974-tsens",
> .data = &data_8974,
> + }, {
> + .compatible = "qcom,msm8996-tsens",
> + .data = &data_8996,
> },
> {}
> };
> diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
> index 146d4f1..4a12df2 100644
> --- a/drivers/thermal/qcom/tsens.h
> +++ b/drivers/thermal/qcom/tsens.h
> @@ -87,6 +87,6 @@ void compute_intercept_slope(struct tsens_device *, u32 *, u32 *, u32);
> 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;
> +extern const struct tsens_data data_8916, data_8974, data_8960, data_8996;
>
> #endif /* __QCOM_TSENS_H__ */
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH v5 07/11] arm: dts: msm8974: Add thermal zones, tsens and qfprom nodes
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
` (5 preceding siblings ...)
2016-04-14 9:31 ` [PATCH v5 06/11] thermal: qcom: tsens-8996: Add support for 8996 " Rajendra Nayak
@ 2016-04-14 9:31 ` Rajendra Nayak
2016-04-14 9:31 ` [PATCH v5 08/11] arm: dts: apq8064: " Rajendra Nayak
` (5 subsequent siblings)
12 siblings, 0 replies; 26+ messages in thread
From: Rajendra Nayak @ 2016-04-14 9:31 UTC (permalink / raw)
To: edubezval
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal, Rajendra Nayak,
Andy Gross
Add thermal zones, tsens and qfprom nodes
Cc: Andy Gross <agross@codeaurora.org>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
arch/arm/boot/dts/qcom-msm8974.dtsi | 103 ++++++++++++++++++++++++++++++++++++
1 file changed, 103 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index ef53305..7ddf031 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -126,6 +126,88 @@
};
};
+ thermal-zones {
+ cpu-thermal0 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 5>;
+
+ trips {
+ cpu_alert0: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit0: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal1 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 6>;
+
+ trips {
+ cpu_alert1: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit1: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal2 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 7>;
+
+ trips {
+ cpu_alert2: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit2: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal3 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 8>;
+
+ trips {
+ cpu_alert3: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit3: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+ };
+
cpu-pmu {
compatible = "qcom,krait-pmu";
interrupts = <1 7 0xf04>;
@@ -249,6 +331,27 @@
reg = <0xf9011000 0x1000>;
};
+ qfprom: qfprom@fc4bc000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "qcom,qfprom";
+ reg = <0xfc4bc000 0x1000>;
+ tsens_calib: calib@d0 {
+ reg = <0xd0 0x18>;
+ };
+ tsens_backup: backup@440 {
+ reg = <0x440 0x10>;
+ };
+ };
+
+ tsens: thermal-sensor@fc4a8000 {
+ compatible = "qcom,msm8974-tsens";
+ reg = <0xfc4a8000 0x2000>;
+ nvmem-cells = <&tsens_calib>, <&tsens_backup>;
+ nvmem-cell-names = "calib", "calib_backup";
+ #thermal-sensor-cells = <1>;
+ };
+
timer@f9020000 {
#address-cells = <1>;
#size-cells = <1>;
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 08/11] arm: dts: apq8064: Add thermal zones, tsens and qfprom nodes
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
` (6 preceding siblings ...)
2016-04-14 9:31 ` [PATCH v5 07/11] arm: dts: msm8974: Add thermal zones, tsens and qfprom nodes Rajendra Nayak
@ 2016-04-14 9:31 ` Rajendra Nayak
2016-04-14 9:31 ` [PATCH v5 09/11] arm: dts: apq8084: " Rajendra Nayak
` (4 subsequent siblings)
12 siblings, 0 replies; 26+ messages in thread
From: Rajendra Nayak @ 2016-04-14 9:31 UTC (permalink / raw)
To: edubezval
Cc: Rajendra Nayak, linux-pm, linux-arm-msm, punit.agrawal, sboyd,
lina.iyer, nrajan, Andy Gross, andy.gross, rui.zhang,
linux-arm-kernel
TSENS is part of GCC, hence add TSENS properties as part of GCC node.
Also add thermal zones and qfprom nodes.
Update GCC bindings doc to mention the possibility of optional TSENS
properties that can be part of GCC node.
Cc: Andy Gross <agross@codeaurora.org>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
.../devicetree/bindings/clock/qcom,gcc.txt | 18 ++++
arch/arm/boot/dts/qcom-apq8064.dtsi | 103 +++++++++++++++++++++
2 files changed, 121 insertions(+)
diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt b/Documentation/devicetree/bindings/clock/qcom,gcc.txt
index 9a60fde..16e2f84 100644
--- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt
+++ b/Documentation/devicetree/bindings/clock/qcom,gcc.txt
@@ -23,6 +23,13 @@ Required properties :
Optional properties :
- #power-domain-cells : shall contain 1
+Optional properties:
+- Qualcomm TSENS (thermal sensor device) on some devices can
+be part of GCC and hence the TSENS properties can also be
+part of the GCC/clock-controller node.
+For more details on the TSENS properties please refer
+Documentation/devicetree/bindings/thermal/qcom-tsens.txt
+
Example:
clock-controller@900000 {
compatible = "qcom,gcc-msm8960";
@@ -31,3 +38,14 @@ Example:
#reset-cells = <1>;
#power-domain-cells = <1>;
};
+
+Example of GCC with TSENS properties:
+ clock-controller@900000 {
+ compatible = "qcom,gcc-apq8064";
+ reg = <0x00900000 0x4000>;
+ nvmem-cells = <&tsens_calib>, <&tsens_backup>;
+ nvmem-cell-names = "calib", "calib_backup";
+ #clock-cells = <1>;
+ #reset-cells = <1>;
+ #thermal-sensor-cells = <1>;
+ };
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index 65d0e8d..4f839b0 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -86,6 +86,92 @@
};
};
+ thermal-zones {
+ cpu-thermal0 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&gcc 7>;
+ coefficients = <1199 0>;
+
+ trips {
+ cpu_alert0: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit0: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal1 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&gcc 8>;
+ coefficients = <1132 0>;
+
+ trips {
+ cpu_alert1: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit1: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal2 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&gcc 9>;
+ coefficients = <1199 0>;
+
+ trips {
+ cpu_alert2: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit2: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal3 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&gcc 10>;
+ coefficients = <1132 0>;
+
+ trips {
+ cpu_alert3: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit3: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+ };
+
cpu-pmu {
compatible = "qcom,krait-pmu";
interrupts = <1 10 0x304>;
@@ -481,11 +567,28 @@
};
};
+ qfprom: qfprom@00700000 {
+ compatible = "qcom,qfprom";
+ reg = <0x00700000 0x1000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+ tsens_calib: calib {
+ reg = <0x404 0x10>;
+ };
+ tsens_backup: backup_calib {
+ reg = <0x414 0x10>;
+ };
+ };
+
gcc: clock-controller@900000 {
compatible = "qcom,gcc-apq8064";
reg = <0x00900000 0x4000>;
+ nvmem-cells = <&tsens_calib>, <&tsens_backup>;
+ nvmem-cell-names = "calib", "calib_backup";
#clock-cells = <1>;
#reset-cells = <1>;
+ #thermal-sensor-cells = <1>;
};
lcc: clock-controller@28000000 {
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 09/11] arm: dts: apq8084: Add thermal zones, tsens and qfprom nodes
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
` (7 preceding siblings ...)
2016-04-14 9:31 ` [PATCH v5 08/11] arm: dts: apq8064: " Rajendra Nayak
@ 2016-04-14 9:31 ` Rajendra Nayak
2016-04-14 9:31 ` [PATCH v5 10/11] arm64: dts: msm8916: " Rajendra Nayak
` (3 subsequent siblings)
12 siblings, 0 replies; 26+ messages in thread
From: Rajendra Nayak @ 2016-04-14 9:31 UTC (permalink / raw)
To: edubezval
Cc: Rajendra Nayak, linux-pm, linux-arm-msm, punit.agrawal, sboyd,
lina.iyer, nrajan, Andy Gross, andy.gross, rui.zhang,
linux-arm-kernel
Add thermal zones, tsens and qfprom nodes
Cc: Andy Gross <agross@codeaurora.org>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
arch/arm/boot/dts/qcom-apq8084.dtsi | 103 ++++++++++++++++++++++++++++++++++++
1 file changed, 103 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi
index a33a09f..5284709 100644
--- a/arch/arm/boot/dts/qcom-apq8084.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8084.dtsi
@@ -86,6 +86,88 @@
};
};
+ thermal-zones {
+ cpu-thermal0 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 5>;
+
+ trips {
+ cpu_alert0: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit0: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal1 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 6>;
+
+ trips {
+ cpu_alert1: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit1: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal2 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 7>;
+
+ trips {
+ cpu_alert2: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit2: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal3 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 8>;
+
+ trips {
+ cpu_alert3: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit3: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+ };
+
cpu-pmu {
compatible = "qcom,krait-pmu";
interrupts = <1 7 0xf04>;
@@ -142,6 +224,27 @@
reg = <0xf9011000 0x1000>;
};
+ qfprom: qfprom@fc4bc000 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "qcom,qfprom";
+ reg = <0xfc4bc000 0x1000>;
+ tsens_calib: calib@d0 {
+ reg = <0xd0 0x18>;
+ };
+ tsens_backup: backup@440 {
+ reg = <0x440 0x10>;
+ };
+ };
+
+ tsens: thermal-sensor@fc4a8000 {
+ compatible = "qcom,msm8974-tsens";
+ reg = <0xfc4a8000 0x2000>;
+ nvmem-cells = <&tsens_calib>, <&tsens_backup>;
+ nvmem-cell-names = "calib", "calib_backup";
+ #thermal-sensor-cells = <1>;
+ };
+
timer@f9020000 {
#address-cells = <1>;
#size-cells = <1>;
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 10/11] arm64: dts: msm8916: Add thermal zones, tsens and qfprom nodes
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
` (8 preceding siblings ...)
2016-04-14 9:31 ` [PATCH v5 09/11] arm: dts: apq8084: " Rajendra Nayak
@ 2016-04-14 9:31 ` Rajendra Nayak
2016-04-14 9:31 ` [PATCH v5 11/11] arm64: dts: msm8996: " Rajendra Nayak
` (2 subsequent siblings)
12 siblings, 0 replies; 26+ messages in thread
From: Rajendra Nayak @ 2016-04-14 9:31 UTC (permalink / raw)
To: edubezval
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal, Rajendra Nayak,
Andy Gross
Add thermal zones, tsens and qfprom nodes
Cc: Andy Gross <agross@codeaurora.org>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
arch/arm64/boot/dts/qcom/msm8916.dtsi | 64 +++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 9681200..9e9029e 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -91,6 +91,49 @@
};
};
+ thermal-zones {
+ cpu-thermal0 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 4>;
+
+ trips {
+ cpu_alert0: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit0: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal1 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 3>;
+
+ trips {
+ cpu_alert1: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit1: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ };
+
timer {
compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
@@ -537,6 +580,27 @@
clocks = <&gcc GCC_PRNG_AHB_CLK>;
clock-names = "core";
};
+
+ qfprom: qfprom@5c000 {
+ compatible = "qcom,qfprom";
+ reg = <0x5c000 0x1000>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ tsens_caldata: caldata@d0 {
+ reg = <0xd0 0x8>;
+ };
+ tsens_calsel: calsel@ec {
+ reg = <0xec 0x4>;
+ };
+ };
+
+ tsens: thermal-sensor@4a8000 {
+ compatible = "qcom,msm8916-tsens";
+ reg = <0x4a8000 0x2000>;
+ nvmem-cells = <&tsens_caldata>, <&tsens_calsel>;
+ nvmem-cell-names = "calib", "calib_sel";
+ #thermal-sensor-cells = <1>;
+ };
};
smd {
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH v5 11/11] arm64: dts: msm8996: Add thermal zones, tsens and qfprom nodes
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
` (9 preceding siblings ...)
2016-04-14 9:31 ` [PATCH v5 10/11] arm64: dts: msm8916: " Rajendra Nayak
@ 2016-04-14 9:31 ` Rajendra Nayak
2016-04-28 0:03 ` Eduardo Valentin
2016-04-20 23:51 ` [PATCH v5 00/11] qcom: Add support for TSENS driver Eduardo Valentin
2016-04-28 0:03 ` Eduardo Valentin
12 siblings, 1 reply; 26+ messages in thread
From: Rajendra Nayak @ 2016-04-14 9:31 UTC (permalink / raw)
To: edubezval
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal, Rajendra Nayak,
Andy Gross
Add thermal zones, tsens and qfprom nodes
Cc: Andy Gross <agross@codeaurora.org>
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
arch/arm64/boot/dts/qcom/msm8996.dtsi | 92 +++++++++++++++++++++++++++++++++++
1 file changed, 92 insertions(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 0506fb8..4b36929 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -97,6 +97,92 @@
};
};
+ thermal-zones {
+ cpu-thermal0 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens0 3>;
+
+ trips {
+ cpu_alert0: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+
+ cpu_crit0: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal1 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens0 5>;
+
+ trips {
+ cpu_alert1: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+
+ cpu_crit1: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal2 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens0 8>;
+
+ trips {
+ cpu_alert2: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+
+ cpu_crit2: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal3 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens0 10>;
+
+ trips {
+ cpu_alert3: trip@0 {
+ temperature = <75000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+
+ cpu_crit3: trip@1 {
+ temperature = <110000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+ };
+
timer {
compatible = "arm,armv8-timer";
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
@@ -151,6 +237,12 @@
reg = <0x300000 0x90000>;
};
+ tsens0: thermal-sensor@4a8000 {
+ compatible = "qcom,msm8996-tsens";
+ reg = <0x4a8000 0x2000>;
+ #thermal-sensor-cells = <1>;
+ };
+
blsp2_uart1: serial@75b0000 {
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
reg = <0x75b0000 0x1000>;
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH v5 11/11] arm64: dts: msm8996: Add thermal zones, tsens and qfprom nodes
2016-04-14 9:31 ` [PATCH v5 11/11] arm64: dts: msm8996: " Rajendra Nayak
@ 2016-04-28 0:03 ` Eduardo Valentin
2016-05-05 4:47 ` Rajendra Nayak
0 siblings, 1 reply; 26+ messages in thread
From: Eduardo Valentin @ 2016-04-28 0:03 UTC (permalink / raw)
To: Rajendra Nayak
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal, Andy Gross
On Thu, Apr 14, 2016 at 03:01:59PM +0530, Rajendra Nayak wrote:
> Add thermal zones, tsens and qfprom nodes
>
> Cc: Andy Gross <agross@codeaurora.org>
> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
> ---
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 92 +++++++++++++++++++++++++++++++++++
> 1 file changed, 92 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index 0506fb8..4b36929 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -97,6 +97,92 @@
> };
> };
>
> + thermal-zones {
> + cpu-thermal0 {
> + polling-delay-passive = <250>;
> + polling-delay = <1000>;
> +
> + thermal-sensors = <&tsens0 3>;
> +
> + trips {
> + cpu_alert0: trip@0 {
> + temperature = <75000>;
> + hysteresis = <2000>;
> + type = "passive";
> + };
> +
> + cpu_crit0: trip@1 {
> + temperature = <110000>;
> + hysteresis = <2000>;
> + type = "critical";
> + };
cooling devices?
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v5 11/11] arm64: dts: msm8996: Add thermal zones, tsens and qfprom nodes
2016-04-28 0:03 ` Eduardo Valentin
@ 2016-05-05 4:47 ` Rajendra Nayak
0 siblings, 0 replies; 26+ messages in thread
From: Rajendra Nayak @ 2016-05-05 4:47 UTC (permalink / raw)
To: Eduardo Valentin
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal, Andy Gross
On 04/28/2016 05:33 AM, Eduardo Valentin wrote:
> On Thu, Apr 14, 2016 at 03:01:59PM +0530, Rajendra Nayak wrote:
>> Add thermal zones, tsens and qfprom nodes
>>
>> Cc: Andy Gross <agross@codeaurora.org>
>> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
>> ---
>> arch/arm64/boot/dts/qcom/msm8996.dtsi | 92 +++++++++++++++++++++++++++++++++++
>> 1 file changed, 92 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
>> index 0506fb8..4b36929 100644
>> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
>> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
>> @@ -97,6 +97,92 @@
>> };
>> };
>>
>> + thermal-zones {
>> + cpu-thermal0 {
>> + polling-delay-passive = <250>;
>> + polling-delay = <1000>;
>> +
>> + thermal-sensors = <&tsens0 3>;
>> +
>> + trips {
>> + cpu_alert0: trip@0 {
>> + temperature = <75000>;
>> + hysteresis = <2000>;
>> + type = "passive";
>> + };
>> +
>> + cpu_crit0: trip@1 {
>> + temperature = <110000>;
>> + hysteresis = <2000>;
>> + type = "critical";
>> + };
>
>
> cooling devices?
We are still missing cpufreq support for these devices upstream
>
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v5 00/11] qcom: Add support for TSENS driver
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
` (10 preceding siblings ...)
2016-04-14 9:31 ` [PATCH v5 11/11] arm64: dts: msm8996: " Rajendra Nayak
@ 2016-04-20 23:51 ` Eduardo Valentin
2016-04-21 10:49 ` Nayak, Rajendra
2016-04-22 9:07 ` Srinivas Kandagatla
2016-04-28 0:03 ` Eduardo Valentin
12 siblings, 2 replies; 26+ messages in thread
From: Eduardo Valentin @ 2016-04-20 23:51 UTC (permalink / raw)
To: Rajendra Nayak
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal
On Thu, Apr 14, 2016 at 03:01:48PM +0530, Rajendra Nayak wrote:
> Current set of patches apply on 4.6-rc3. nvmem apis are currently
> broken and hence need to pull in the fixes for it as proposed here [1]
Could you please clarify this a bit?
Do I understand properly that we need to wait until [1] gets merged to
get the driver functional again after applying this series?
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v5 00/11] qcom: Add support for TSENS driver
2016-04-20 23:51 ` [PATCH v5 00/11] qcom: Add support for TSENS driver Eduardo Valentin
@ 2016-04-21 10:49 ` Nayak, Rajendra
2016-04-22 9:07 ` Srinivas Kandagatla
1 sibling, 0 replies; 26+ messages in thread
From: Nayak, Rajendra @ 2016-04-21 10:49 UTC (permalink / raw)
To: Eduardo Valentin
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal, srinivas.kandagatla
Hi Eduardo,
On 4/21/2016 5:21 AM, Eduardo Valentin wrote:
> On Thu, Apr 14, 2016 at 03:01:48PM +0530, Rajendra Nayak wrote:
>> Current set of patches apply on 4.6-rc3. nvmem apis are currently
>> broken and hence need to pull in the fixes for it as proposed here [1]
>
>
> Could you please clarify this a bit?
>
> Do I understand properly that we need to wait until [1] gets merged to
> get the driver functional again after applying this series?
Yes, thats correct. We need the nvmem apis to be functional for this
series to work.
I have added Srini who is working on fixing it and reworking [1] as
Mark wasn't happy with the current approach.
regards,
Rajendra
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v5 00/11] qcom: Add support for TSENS driver
2016-04-20 23:51 ` [PATCH v5 00/11] qcom: Add support for TSENS driver Eduardo Valentin
2016-04-21 10:49 ` Nayak, Rajendra
@ 2016-04-22 9:07 ` Srinivas Kandagatla
1 sibling, 0 replies; 26+ messages in thread
From: Srinivas Kandagatla @ 2016-04-22 9:07 UTC (permalink / raw)
To: Eduardo Valentin, Rajendra Nayak
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal
On 21/04/16 00:51, Eduardo Valentin wrote:
> On Thu, Apr 14, 2016 at 03:01:48PM +0530, Rajendra Nayak wrote:
>> Current set of patches apply on 4.6-rc3. nvmem apis are currently
>> broken and hence need to pull in the fixes for it as proposed here [1]
>
>
> Could you please clarify this a bit?
>
> Do I understand properly that we need to wait until [1] gets merged to
> get the driver functional again after applying this series?
I think nvmem regression fixes should not stop TSENS driver from going
to mainline.
I think you can take these patches if you are happy with them, I will
take care of the nvmem fixes.
thanks,
srini
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH v5 00/11] qcom: Add support for TSENS driver
2016-04-14 9:31 [PATCH v5 00/11] qcom: Add support for TSENS driver Rajendra Nayak
` (11 preceding siblings ...)
2016-04-20 23:51 ` [PATCH v5 00/11] qcom: Add support for TSENS driver Eduardo Valentin
@ 2016-04-28 0:03 ` Eduardo Valentin
2016-05-05 4:46 ` Rajendra Nayak
12 siblings, 1 reply; 26+ messages in thread
From: Eduardo Valentin @ 2016-04-28 0:03 UTC (permalink / raw)
To: Rajendra Nayak
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal
On Thu, Apr 14, 2016 at 03:01:48PM +0530, Rajendra Nayak wrote:
> Current set of patches apply on 4.6-rc3. nvmem apis are currently
> broken and hence need to pull in the fixes for it as proposed here [1]
>From a glance overview of your series, looks good to me, but before I
start triggering my local scripts to check them, I want to know what is
the path for merging this.
If I understand correctly the above statement, merging this right now,
means merging a non-functional driver, right?
>
> Changes since v4:
> * dropped qcom,tsens-slopes binding, used coefficients instead
> * dropped qcom,sensor-id binding
> * Added support for msm8996 family
> * Other minor review fixes from v4
>
> Changes since v3:
> * Dropped 'clk: qcom: create virtual child device for TSENS' which
> is picked up by Stephen
> * Updated GCC bindings with optional TSENS properties
>
> Changes since v2:
> * Minor review fixes from Stephen/Punit and rebase on 4.3-rc4
>
> Changes since v1:
> * Created virtual tsens device from gcc driver for 8960,
> with DT having a single node for gcc and tsens
> * Minor fixes with rebasing on 4.3-rc1
>
> Changes since RFC:
> * Added support for 8916 and 8084
> * Based off the latest nvmem framework patches [1]
> * Minor review fixes for comments mostly from Lina
>
> This is an attempt to have a single TSENS driver for
> the different versions of the TSENS IP that exist, on
> different qcom msm/apq SoCs'
> Support is added for msm8916, msm8960, msm8974 and msm8996 families.
>
> A lot of the work is based of original code from Stephen Boyd
> and Siddartha Mohanadoss. I have also picked some of what
> Narendran Rajan did in his attempt to upstream the support
> for 8960 family. I could not keep the original authorship on
> any of the patches because I ended up moving the code around
> quite a bit in an effort to have a single driver for the
> various devices. I would be glad to change the authorship
> for any of the patches if needed.
>
> [1] https://lkml.org/lkml/2016/4/13/654
>
> Rajendra Nayak (11):
> thermal: qcom: tsens: Add a skeletal TSENS drivers
> thermal: qcom: tsens-8916: Add support for 8916 family of SoCs
> thermal: qcom: tsens-8974: Add support for 8974 family of SoCs
> thermal: core: export apis to get slope and offset
> thermal: qcom: tsens-8960: Add support for 8960 family of SoCs
> thermal: qcom: tsens-8996: Add support for 8996 family of SoCs
> arm: dts: msm8974: Add thermal zones, tsens and qfprom nodes
> arm: dts: apq8064: Add thermal zones, tsens and qfprom nodes
> arm: dts: apq8084: Add thermal zones, tsens and qfprom nodes
> arm64: dts: msm8916: Add thermal zones, tsens and qfprom nodes
> arm64: dts: msm8996: Add thermal zones, tsens and qfprom nodes
>
> .../devicetree/bindings/clock/qcom,gcc.txt | 18 ++
> .../devicetree/bindings/thermal/qcom-tsens.txt | 21 ++
> arch/arm/boot/dts/qcom-apq8064.dtsi | 103 ++++++++
> arch/arm/boot/dts/qcom-apq8084.dtsi | 103 ++++++++
> arch/arm/boot/dts/qcom-msm8974.dtsi | 103 ++++++++
> arch/arm64/boot/dts/qcom/msm8916.dtsi | 64 +++++
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 92 +++++++
> drivers/thermal/Kconfig | 5 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/qcom/Kconfig | 11 +
> drivers/thermal/qcom/Makefile | 2 +
> drivers/thermal/qcom/tsens-8916.c | 113 ++++++++
> drivers/thermal/qcom/tsens-8960.c | 293 +++++++++++++++++++++
> drivers/thermal/qcom/tsens-8974.c | 244 +++++++++++++++++
> drivers/thermal/qcom/tsens-8996.c | 82 ++++++
> drivers/thermal/qcom/tsens-common.c | 135 ++++++++++
> drivers/thermal/qcom/tsens.c | 207 +++++++++++++++
> drivers/thermal/qcom/tsens.h | 92 +++++++
> drivers/thermal/thermal_core.c | 16 ++
> include/linux/thermal.h | 8 +
> 20 files changed, 1713 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/thermal/qcom-tsens.txt
> create mode 100644 drivers/thermal/qcom/Kconfig
> create mode 100644 drivers/thermal/qcom/Makefile
> create mode 100644 drivers/thermal/qcom/tsens-8916.c
> create mode 100644 drivers/thermal/qcom/tsens-8960.c
> create mode 100644 drivers/thermal/qcom/tsens-8974.c
> create mode 100644 drivers/thermal/qcom/tsens-8996.c
> create mode 100644 drivers/thermal/qcom/tsens-common.c
> create mode 100644 drivers/thermal/qcom/tsens.c
> create mode 100644 drivers/thermal/qcom/tsens.h
>
> --
> QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
> of Code Aurora Forum, hosted by The Linux Foundation
>
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH v5 00/11] qcom: Add support for TSENS driver
2016-04-28 0:03 ` Eduardo Valentin
@ 2016-05-05 4:46 ` Rajendra Nayak
0 siblings, 0 replies; 26+ messages in thread
From: Rajendra Nayak @ 2016-05-05 4:46 UTC (permalink / raw)
To: Eduardo Valentin
Cc: andy.gross, linux-arm-msm, linux-pm, linux-arm-kernel, rui.zhang,
sboyd, nrajan, lina.iyer, punit.agrawal
On 04/28/2016 05:33 AM, Eduardo Valentin wrote:
> On Thu, Apr 14, 2016 at 03:01:48PM +0530, Rajendra Nayak wrote:
>> Current set of patches apply on 4.6-rc3. nvmem apis are currently
>> broken and hence need to pull in the fixes for it as proposed here [1]
>
> From a glance overview of your series, looks good to me, but before I
> start triggering my local scripts to check them, I want to know what is
> the path for merging this.
Hey Eduardo, sorry for the delayed response, was out a few days.
So 1/11 to 6/11 would need to go through you, and the rest (dts changes)
via Andy's tree.
>
> If I understand correctly the above statement, merging this right now,
> means merging a non-functional driver, right?
So I see Srini has pushed fixes [1] for nvmem and Greg has them pulled in in his
-next [2]
[1] https://lkml.org/lkml/2016/4/24/103
[2] git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc-next
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 26+ messages in thread