* [RFC 1/7] thermal: qcom: tsens: Add a skeletal tsens drivers
2015-04-23 13:46 [RFC 0/7] qcom: Add support for tsens driver Rajendra Nayak
@ 2015-04-23 13:46 ` Rajendra Nayak
2015-06-05 23:49 ` Kevin Hilman
2015-06-12 16:03 ` Lina Iyer
2015-04-23 13:46 ` [RFC 2/7] thermal: qcom: tsens-8916: Add support for 8916 family of SoCs Rajendra Nayak
` (7 subsequent siblings)
8 siblings, 2 replies; 19+ messages in thread
From: Rajendra Nayak @ 2015-04-23 13:46 UTC (permalink / raw)
To: linux-arm-msm, linux-arm-kernel, linux-pm
Cc: sboyd, srinivas.kandagatla, nrajan, lina.iyer, Rajendra Nayak
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 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 descibe the tsens device in DT.
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
.../devicetree/bindings/thermal/qcom-tsens.txt | 36 ++++
drivers/thermal/Kconfig | 5 +
drivers/thermal/Makefile | 1 +
drivers/thermal/qcom/Kconfig | 10 +
drivers/thermal/qcom/Makefile | 2 +
drivers/thermal/qcom/tsens.c | 206 +++++++++++++++++++++
drivers/thermal/qcom/tsens.h | 58 ++++++
7 files changed, 318 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.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..90ec469
--- /dev/null
+++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt
@@ -0,0 +1,36 @@
+* 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,msm8960-tsens" : For 8960 Family of SoCs
+
+- reg: Address range of the thermal registers
+- qcom,tsens-slopes : Must contain slope value for each of the sensors controlled
+ by this device
+- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description.
+- Refer to Documentation/devicetree/bindings/eeprom/eeprom.txt to know how to specify
+an eeprom cell
+
+Optional properties:
+- qcom,sensor-id: List of sensor instances used in a given SoC. A TSENS IP can
+ have a fixed number of sensors (like 11) but a given SoC can
+ use only 5 of these and they might not always the first 5. They
+ could be sensors 0, 1, 4, 8 and 9. This property is used to
+ describe the subset of the sensors used. If this property is
+ missing they are assumed to be the first 'n'
+ sensors numbered sequentially.
+
+Example:
+tsens: thermal-sesnor@900000 {
+ compatible = "qcom,msm8916-tsens";
+ qcom,tsens-slopes = <1176 1176 1154 1176 1111
+ 1132 1132 1199 1132 1199
+ 1132>;
+ calib_data = <&tsens_caldata>;
+ calib_sel = <&tsens_calsel>;
+ qcom,tsens-slopes = <3200 3200 3200 3200 3200>;
+ qcom,sensor-id = <0 1 2 4 5>;
+ #thermal-sensor-cells = <1>;
+ };
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index af40db0..46b63ff 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -299,4 +299,9 @@ depends on ARCH_STI && OF
source "drivers/thermal/st/Kconfig"
endmenu
+menu "Qualcomm thermal drivers"
+depends on ARCH_QCOM && OF
+source "drivers/thermal/qcom/Kconfig"
+endmenu
+
endif
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index fa0dc48..df83890 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -38,4 +38,5 @@ obj-$(CONFIG_INTEL_SOC_DTS_THERMAL) += intel_soc_dts_thermal.o
obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/
obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/
obj-$(CONFIG_ST_THERMAL) += st/
+obj-$(CONFIG_QCOM_TSENS) += qcom/
obj-$(CONFIG_TEGRA_SOCTHERM) += tegra_soctherm.o
diff --git a/drivers/thermal/qcom/Kconfig b/drivers/thermal/qcom/Kconfig
new file mode 100644
index 0000000..ade0a03
--- /dev/null
+++ b/drivers/thermal/qcom/Kconfig
@@ -0,0 +1,10 @@
+config QCOM_TSENS
+ tristate "Qualcomm Tsens Temperature Alarm"
+ depends on THERMAL
+ depends on QCOM_QFPROM
+ 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..401069b
--- /dev/null
+++ b/drivers/thermal/qcom/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o
+qcom_tsens-y += tsens.o
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
new file mode 100644
index 0000000..fa4a73a
--- /dev/null
+++ b/drivers/thermal/qcom/tsens.c
@@ -0,0 +1,206 @@
+/*
+ * 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, long *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 -ENOSYS;
+}
+
+#ifdef CONFIG_PM
+static int tsens_suspend(struct device *dev)
+{
+ struct tsens_device *tmdev = dev_get_drvdata(dev);
+
+ if (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);
+#define TSENS_PM_OPS (&tsens_pm_ops)
+
+#else /* CONFIG_PM_SLEEP */
+#define TSENS_PM_OPS NULL
+#endif /* CONFIG_PM_SLEEP */
+
+static const struct of_device_id tsens_table[] = {
+ {
+ .compatible = "qcom,msm8960-tsens",
+ }, {
+ .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, ret;
+ struct thermal_zone_device *tzd;
+ u32 *hw_id, n = tmdev->num_sensors;
+ struct device_node *np = tmdev->dev->of_node;
+
+ hw_id = devm_kcalloc(tmdev->dev, n, sizeof(u32), GFP_KERNEL);
+ if (!hw_id)
+ return -ENOMEM;
+
+ ret = of_property_read_u32_array(np, "qcom,sensor-id", hw_id, n);
+ if (ret)
+ for (i = 0; i < tmdev->num_sensors; i++)
+ tmdev->sensor[i].hw_id = i;
+ else
+ for (i = 0; i < tmdev->num_sensors; i++)
+ tmdev->sensor[i].hw_id = hw_id[i];
+
+ 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, num;
+ struct device_node *np = pdev->dev.of_node;
+ struct tsens_sensor *s;
+ struct tsens_device *tmdev;
+ const struct of_device_id *id;
+
+ num = of_property_count_u32_elems(np, "qcom,tsens-slopes");
+ if (num <= 0) {
+ dev_err(&pdev->dev, "invalid tsens slopes\n");
+ return -EINVAL;
+ }
+
+ tmdev = devm_kzalloc(&pdev->dev, sizeof(*tmdev) +
+ num * sizeof(*s), GFP_KERNEL);
+ if (!tmdev)
+ return -ENOMEM;
+
+ tmdev->dev = &pdev->dev;
+ tmdev->num_sensors = num;
+
+ for (i = 0, s = tmdev->sensor; i < tmdev->num_sensors; i++, s++)
+ of_property_read_u32_index(np, "qcom,tsens-slopes", i,
+ &s->slope);
+
+ id = of_match_node(tsens_table, np);
+ if (!id)
+ return -ENODEV;
+
+ tmdev->ops = id->data;
+ if (!tmdev->ops || !tmdev->ops->init || !tmdev->ops->calibrate ||
+ !tmdev->ops->get_temp)
+ return -EINVAL;
+
+ ret = tmdev->ops->init(tmdev);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "tsens init failed\n");
+ return ret;
+ }
+
+ ret = tmdev->ops->calibrate(tmdev);
+ if (ret < 0) {
+ dev_err(&pdev->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..6e3c365
--- /dev/null
+++ b/drivers/thermal/qcom/tsens.h
@@ -0,0 +1,58 @@
+/*
+ * 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__
+
+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 {
+ /* mandatory callbacks */
+ int (*init)(struct tsens_device *);
+ int (*calibrate)(struct tsens_device *);
+ int (*get_temp)(struct tsens_device *, int, long *);
+ /* 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 *);
+};
+
+/* 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 c;
+ bool trdy;
+ const struct tsens_ops *ops;
+ struct tsens_sensor sensor[0];
+};
+
+#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] 19+ messages in thread* Re: [RFC 1/7] thermal: qcom: tsens: Add a skeletal tsens drivers
2015-04-23 13:46 ` [RFC 1/7] thermal: qcom: tsens: Add a skeletal tsens drivers Rajendra Nayak
@ 2015-06-05 23:49 ` Kevin Hilman
2015-06-08 4:02 ` Rajendra Nayak
2015-06-12 16:03 ` Lina Iyer
1 sibling, 1 reply; 19+ messages in thread
From: Kevin Hilman @ 2015-06-05 23:49 UTC (permalink / raw)
To: Rajendra Nayak
Cc: linux-arm-msm, linux-arm-kernel, linux-pm, sboyd,
srinivas.kandagatla, nrajan, lina.iyer
Hi Rajendra,
Rajendra Nayak <rnayak@codeaurora.org> writes:
> 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 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 descibe the tsens device in DT.
>
> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
[...]
> + ret = tmdev->ops->calibrate(tmdev);
> + if (ret < 0) {
> + dev_err(&pdev->dev, "tsens calibration failed\n");
> + return ret;
> + }
I was trying this series on linux-next with Srini's eeprom v4 and my
first attempt was to build the eeprom, qfprom and tsens drivers as
built-in. Unfortunately, the tsens driver probed before the
eeprom/qfprom driver so failed here with the "calibration failed"
message.
Building things as modules worked better, but you might want to take a
look at possibly using -EPROBE_DEFER here?
Kevin
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [RFC 1/7] thermal: qcom: tsens: Add a skeletal tsens drivers
2015-06-05 23:49 ` Kevin Hilman
@ 2015-06-08 4:02 ` Rajendra Nayak
0 siblings, 0 replies; 19+ messages in thread
From: Rajendra Nayak @ 2015-06-08 4:02 UTC (permalink / raw)
To: Kevin Hilman
Cc: linux-arm-msm, linux-arm-kernel, linux-pm, sboyd,
srinivas.kandagatla, nrajan, lina.iyer
Hi Kevin,
>
> I was trying this series on linux-next with Srini's eeprom v4 and my
> first attempt was to build the eeprom, qfprom and tsens drivers as
> built-in. Unfortunately, the tsens driver probed before the
> eeprom/qfprom driver so failed here with the "calibration failed"
> message.
>
> Building things as modules worked better, but you might want to take a
> look at possibly using -EPROBE_DEFER here?
The driver does return -EPROBE_DEFER in case the calibration fails
when tsens is probed before qfprom. It does however also show the
error message "calibration failed" which is a little misleading and
needs fixing. What target were you trying this on? I will give it a
try again to make sure things work.
regards,
Rajendra
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC 1/7] thermal: qcom: tsens: Add a skeletal tsens drivers
2015-04-23 13:46 ` [RFC 1/7] thermal: qcom: tsens: Add a skeletal tsens drivers Rajendra Nayak
2015-06-05 23:49 ` Kevin Hilman
@ 2015-06-12 16:03 ` Lina Iyer
2015-06-15 3:01 ` Rajendra Nayak
1 sibling, 1 reply; 19+ messages in thread
From: Lina Iyer @ 2015-06-12 16:03 UTC (permalink / raw)
To: Rajendra Nayak
Cc: linux-arm-msm, linux-arm-kernel, linux-pm, sboyd,
srinivas.kandagatla, nrajan
On Thu, Apr 23 2015 at 07:51 -0600, Rajendra Nayak wrote:
>tsens is qualcomms' thermal temperature sensor device. It
/s/tsens/TSENS /s/qualcomm/Qualcomm
>supports reading temperatures from multiple thermal sensors
>present on various QCOM SoCs.
>Calibration data is generally read from a 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 descibe the tsens device in DT.
>
>Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
Minor nits. Otherwise,
Reviewed-by: Lina Iyer <lina.iyer@linaro.org>
>---
> .../devicetree/bindings/thermal/qcom-tsens.txt | 36 ++++
> drivers/thermal/Kconfig | 5 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/qcom/Kconfig | 10 +
> drivers/thermal/qcom/Makefile | 2 +
> drivers/thermal/qcom/tsens.c | 206 +++++++++++++++++++++
> drivers/thermal/qcom/tsens.h | 58 ++++++
> 7 files changed, 318 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.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..90ec469
>--- /dev/null
>+++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt
>@@ -0,0 +1,36 @@
>+* 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,msm8960-tsens" : For 8960 Family of SoCs
>+
>+- reg: Address range of the thermal registers
>+- qcom,tsens-slopes : Must contain slope value for each of the sensors controlled
>+ by this device
>+- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description.
>+- Refer to Documentation/devicetree/bindings/eeprom/eeprom.txt to know how to specify
>+an eeprom cell
>+
>+Optional properties:
>+- qcom,sensor-id: List of sensor instances used in a given SoC. A TSENS IP can
>+ have a fixed number of sensors (like 11) but a given SoC can
>+ use only 5 of these and they might not always the first 5. They
>+ could be sensors 0, 1, 4, 8 and 9. This property is used to
>+ describe the subset of the sensors used. If this property is
>+ missing they are assumed to be the first 'n'
>+ sensors numbered sequentially.
May want to explicitly call out that the numsensor defaults to number of
slope values.
>+
>+Example:
>+tsens: thermal-sesnor@900000 {
/s/sesnor/sensor
>+ compatible = "qcom,msm8916-tsens";
>+ qcom,tsens-slopes = <1176 1176 1154 1176 1111
>+ 1132 1132 1199 1132 1199
>+ 1132>;
>+ calib_data = <&tsens_caldata>;
>+ calib_sel = <&tsens_calsel>;
>+ qcom,tsens-slopes = <3200 3200 3200 3200 3200>;
>+ qcom,sensor-id = <0 1 2 4 5>;
>+ #thermal-sensor-cells = <1>;
>+ };
>diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
>index af40db0..46b63ff 100644
>--- a/drivers/thermal/Kconfig
>+++ b/drivers/thermal/Kconfig
>@@ -299,4 +299,9 @@ depends on ARCH_STI && OF
> source "drivers/thermal/st/Kconfig"
> endmenu
>
>+menu "Qualcomm thermal drivers"
>+depends on ARCH_QCOM && OF
>+source "drivers/thermal/qcom/Kconfig"
>+endmenu
>+
> endif
>diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
>index fa0dc48..df83890 100644
>--- a/drivers/thermal/Makefile
>+++ b/drivers/thermal/Makefile
>@@ -38,4 +38,5 @@ obj-$(CONFIG_INTEL_SOC_DTS_THERMAL) += intel_soc_dts_thermal.o
> obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/
> obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/
> obj-$(CONFIG_ST_THERMAL) += st/
>+obj-$(CONFIG_QCOM_TSENS) += qcom/
> obj-$(CONFIG_TEGRA_SOCTHERM) += tegra_soctherm.o
>diff --git a/drivers/thermal/qcom/Kconfig b/drivers/thermal/qcom/Kconfig
>new file mode 100644
>index 0000000..ade0a03
>--- /dev/null
>+++ b/drivers/thermal/qcom/Kconfig
>@@ -0,0 +1,10 @@
>+config QCOM_TSENS
>+ tristate "Qualcomm Tsens Temperature Alarm"
TSENS is the correct usage.
>+ depends on THERMAL
>+ depends on QCOM_QFPROM
>+ 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..401069b
>--- /dev/null
>+++ b/drivers/thermal/qcom/Makefile
>@@ -0,0 +1,2 @@
>+obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o
>+qcom_tsens-y += tsens.o
>diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
>new file mode 100644
>index 0000000..fa4a73a
>--- /dev/null
>+++ b/drivers/thermal/qcom/tsens.c
>@@ -0,0 +1,206 @@
>+/*
>+ * 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, long *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 -ENOSYS;
>+}
>+
>+#ifdef CONFIG_PM
>+static int tsens_suspend(struct device *dev)
>+{
>+ struct tsens_device *tmdev = dev_get_drvdata(dev);
>+
>+ if (tmdev->ops->suspend)
You seem to have checked for tmdev->ops in resume, why not here?
>+ 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);
>+#define TSENS_PM_OPS (&tsens_pm_ops)
>+
>+#else /* CONFIG_PM_SLEEP */
>+#define TSENS_PM_OPS NULL
>+#endif /* CONFIG_PM_SLEEP */
>+
>+static const struct of_device_id tsens_table[] = {
>+ {
>+ .compatible = "qcom,msm8960-tsens",
>+ }, {
>+ .compatible = "qcom,msm8916-tsens",
>+ }, {
>+ .compatible = "qcom,msm8974-tsens",
>+ },
{ .compatible = "..." },
Makes for an easier read, unless, you have ops that have long names.
>+ {}
>+};
>+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, ret;
>+ struct thermal_zone_device *tzd;
>+ u32 *hw_id, n = tmdev->num_sensors;
>+ struct device_node *np = tmdev->dev->of_node;
>+
>+ hw_id = devm_kcalloc(tmdev->dev, n, sizeof(u32), GFP_KERNEL);
>+ if (!hw_id)
>+ return -ENOMEM;
>+
>+ ret = of_property_read_u32_array(np, "qcom,sensor-id", hw_id, n);
>+ if (ret)
>+ for (i = 0; i < tmdev->num_sensors; i++)
>+ tmdev->sensor[i].hw_id = i;
>+ else
>+ for (i = 0; i < tmdev->num_sensors; i++)
>+ tmdev->sensor[i].hw_id = hw_id[i];
>+
>+ 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, num;
>+ struct device_node *np = pdev->dev.of_node;
>+ struct tsens_sensor *s;
>+ struct tsens_device *tmdev;
>+ const struct of_device_id *id;
>+
>+ num = of_property_count_u32_elems(np, "qcom,tsens-slopes");
>+ if (num <= 0) {
>+ dev_err(&pdev->dev, "invalid tsens slopes\n");
>+ return -EINVAL;
>+ }
>+
>+ tmdev = devm_kzalloc(&pdev->dev, sizeof(*tmdev) +
>+ num * sizeof(*s), GFP_KERNEL);
>+ if (!tmdev)
>+ return -ENOMEM;
>+
>+ tmdev->dev = &pdev->dev;
>+ tmdev->num_sensors = num;
>+
>+ for (i = 0, s = tmdev->sensor; i < tmdev->num_sensors; i++, s++)
>+ of_property_read_u32_index(np, "qcom,tsens-slopes", i,
>+ &s->slope);
>+
>+ id = of_match_node(tsens_table, np);
>+ if (!id)
>+ return -ENODEV;
>+
>+ tmdev->ops = id->data;
>+ if (!tmdev->ops || !tmdev->ops->init || !tmdev->ops->calibrate ||
>+ !tmdev->ops->get_temp)
>+ return -EINVAL;
>+
>+ ret = tmdev->ops->init(tmdev);
>+ if (ret < 0) {
>+ dev_err(&pdev->dev, "tsens init failed\n");
>+ return ret;
>+ }
>+
>+ ret = tmdev->ops->calibrate(tmdev);
>+ if (ret < 0) {
>+ dev_err(&pdev->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..6e3c365
>--- /dev/null
>+++ b/drivers/thermal/qcom/tsens.h
>@@ -0,0 +1,58 @@
>+/*
>+ * 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__
>+
>+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 {
>+ /* mandatory callbacks */
>+ int (*init)(struct tsens_device *);
>+ int (*calibrate)(struct tsens_device *);
>+ int (*get_temp)(struct tsens_device *, int, long *);
>+ /* 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 *);
>+};
>+
>+/* 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 c;
Could have had a better variable name - ctx, perhaps?
>+ bool trdy;
>+ const struct tsens_ops *ops;
>+ struct tsens_sensor sensor[0];
>+};
>+
>+#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] 19+ messages in thread* Re: [RFC 1/7] thermal: qcom: tsens: Add a skeletal tsens drivers
2015-06-12 16:03 ` Lina Iyer
@ 2015-06-15 3:01 ` Rajendra Nayak
0 siblings, 0 replies; 19+ messages in thread
From: Rajendra Nayak @ 2015-06-15 3:01 UTC (permalink / raw)
To: Lina Iyer
Cc: linux-arm-msm, linux-arm-kernel, linux-pm, sboyd,
srinivas.kandagatla, nrajan
On 06/12/2015 09:33 PM, Lina Iyer wrote:
> On Thu, Apr 23 2015 at 07:51 -0600, Rajendra Nayak wrote:
>> tsens is qualcomms' thermal temperature sensor device. It
> /s/tsens/TSENS /s/qualcomm/Qualcomm
>
>> supports reading temperatures from multiple thermal sensors
>> present on various QCOM SoCs.
>> Calibration data is generally read from a 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 descibe the tsens device in DT.
>>
>> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
>
> Minor nits. Otherwise,
>
> Reviewed-by: Lina Iyer <lina.iyer@linaro.org>
thanks for the review. will fix-up all of the below
issues with a repost.
>
>> ---
>> .../devicetree/bindings/thermal/qcom-tsens.txt | 36 ++++
>> drivers/thermal/Kconfig | 5 +
>> drivers/thermal/Makefile | 1 +
>> drivers/thermal/qcom/Kconfig | 10 +
>> drivers/thermal/qcom/Makefile | 2 +
>> drivers/thermal/qcom/tsens.c | 206
>> +++++++++++++++++++++
>> drivers/thermal/qcom/tsens.h | 58 ++++++
>> 7 files changed, 318 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.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..90ec469
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/thermal/qcom-tsens.txt
>> @@ -0,0 +1,36 @@
>> +* 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,msm8960-tsens" : For 8960 Family of SoCs
>> +
>> +- reg: Address range of the thermal registers
>> +- qcom,tsens-slopes : Must contain slope value for each of the
>> sensors controlled
>> + by this device
>> +- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a
>> description.
>> +- Refer to Documentation/devicetree/bindings/eeprom/eeprom.txt to
>> know how to specify
>> +an eeprom cell
>> +
>> +Optional properties:
>> +- qcom,sensor-id: List of sensor instances used in a given SoC. A
>> TSENS IP can
>> + have a fixed number of sensors (like 11) but a given SoC can
>> + use only 5 of these and they might not always the first 5.
>> They
>> + could be sensors 0, 1, 4, 8 and 9. This property is used to
>> + describe the subset of the sensors used. If this property is
>> + missing they are assumed to be the first 'n'
>> + sensors numbered sequentially.
>
> May want to explicitly call out that the numsensor defaults to number of
> slope values.
>
>> +
>> +Example:
>> +tsens: thermal-sesnor@900000 {
> /s/sesnor/sensor
>
>> + compatible = "qcom,msm8916-tsens";
>> + qcom,tsens-slopes = <1176 1176 1154 1176 1111
>> + 1132 1132 1199 1132 1199
>> + 1132>;
>> + calib_data = <&tsens_caldata>;
>> + calib_sel = <&tsens_calsel>;
>> + qcom,tsens-slopes = <3200 3200 3200 3200 3200>;
>> + qcom,sensor-id = <0 1 2 4 5>;
>> + #thermal-sensor-cells = <1>;
>> + };
>> diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
>> index af40db0..46b63ff 100644
>> --- a/drivers/thermal/Kconfig
>> +++ b/drivers/thermal/Kconfig
>> @@ -299,4 +299,9 @@ depends on ARCH_STI && OF
>> source "drivers/thermal/st/Kconfig"
>> endmenu
>>
>> +menu "Qualcomm thermal drivers"
>> +depends on ARCH_QCOM && OF
>> +source "drivers/thermal/qcom/Kconfig"
>> +endmenu
>> +
>> endif
>> diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
>> index fa0dc48..df83890 100644
>> --- a/drivers/thermal/Makefile
>> +++ b/drivers/thermal/Makefile
>> @@ -38,4 +38,5 @@ obj-$(CONFIG_INTEL_SOC_DTS_THERMAL) +=
>> intel_soc_dts_thermal.o
>> obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/
>> obj-$(CONFIG_INT340X_THERMAL) += int340x_thermal/
>> obj-$(CONFIG_ST_THERMAL) += st/
>> +obj-$(CONFIG_QCOM_TSENS) += qcom/
>> obj-$(CONFIG_TEGRA_SOCTHERM) += tegra_soctherm.o
>> diff --git a/drivers/thermal/qcom/Kconfig b/drivers/thermal/qcom/Kconfig
>> new file mode 100644
>> index 0000000..ade0a03
>> --- /dev/null
>> +++ b/drivers/thermal/qcom/Kconfig
>> @@ -0,0 +1,10 @@
>> +config QCOM_TSENS
>> + tristate "Qualcomm Tsens Temperature Alarm"
> TSENS is the correct usage.
>
>> + depends on THERMAL
>> + depends on QCOM_QFPROM
>> + 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..401069b
>> --- /dev/null
>> +++ b/drivers/thermal/qcom/Makefile
>> @@ -0,0 +1,2 @@
>> +obj-$(CONFIG_QCOM_TSENS) += qcom_tsens.o
>> +qcom_tsens-y += tsens.o
>> diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
>> new file mode 100644
>> index 0000000..fa4a73a
>> --- /dev/null
>> +++ b/drivers/thermal/qcom/tsens.c
>> @@ -0,0 +1,206 @@
>> +/*
>> + * 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, long *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 -ENOSYS;
>> +}
>> +
>> +#ifdef CONFIG_PM
>> +static int tsens_suspend(struct device *dev)
>> +{
>> + struct tsens_device *tmdev = dev_get_drvdata(dev);
>> +
>> + if (tmdev->ops->suspend)
> You seem to have checked for tmdev->ops in resume, why not here?
>
>> + 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);
>> +#define TSENS_PM_OPS (&tsens_pm_ops)
>> +
>> +#else /* CONFIG_PM_SLEEP */
>> +#define TSENS_PM_OPS NULL
>> +#endif /* CONFIG_PM_SLEEP */
>> +
>> +static const struct of_device_id tsens_table[] = {
>> + {
>> + .compatible = "qcom,msm8960-tsens",
>> + }, {
>> + .compatible = "qcom,msm8916-tsens",
>> + }, {
>> + .compatible = "qcom,msm8974-tsens",
>> + },
>
> { .compatible = "..." },
>
> Makes for an easier read, unless, you have ops that have long names.
>
>> + {}
>> +};
>> +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, ret;
>> + struct thermal_zone_device *tzd;
>> + u32 *hw_id, n = tmdev->num_sensors;
>> + struct device_node *np = tmdev->dev->of_node;
>> +
>> + hw_id = devm_kcalloc(tmdev->dev, n, sizeof(u32), GFP_KERNEL);
>> + if (!hw_id)
>> + return -ENOMEM;
>> +
>> + ret = of_property_read_u32_array(np, "qcom,sensor-id", hw_id, n);
>> + if (ret)
>> + for (i = 0; i < tmdev->num_sensors; i++)
>> + tmdev->sensor[i].hw_id = i;
>> + else
>> + for (i = 0; i < tmdev->num_sensors; i++)
>> + tmdev->sensor[i].hw_id = hw_id[i];
>> +
>> + 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, num;
>> + struct device_node *np = pdev->dev.of_node;
>> + struct tsens_sensor *s;
>> + struct tsens_device *tmdev;
>> + const struct of_device_id *id;
>> +
>> + num = of_property_count_u32_elems(np, "qcom,tsens-slopes");
>> + if (num <= 0) {
>> + dev_err(&pdev->dev, "invalid tsens slopes\n");
>> + return -EINVAL;
>> + }
>> +
>> + tmdev = devm_kzalloc(&pdev->dev, sizeof(*tmdev) +
>> + num * sizeof(*s), GFP_KERNEL);
>> + if (!tmdev)
>> + return -ENOMEM;
>> +
>> + tmdev->dev = &pdev->dev;
>> + tmdev->num_sensors = num;
>> +
>> + for (i = 0, s = tmdev->sensor; i < tmdev->num_sensors; i++, s++)
>> + of_property_read_u32_index(np, "qcom,tsens-slopes", i,
>> + &s->slope);
>> +
>> + id = of_match_node(tsens_table, np);
>> + if (!id)
>> + return -ENODEV;
>> +
>> + tmdev->ops = id->data;
>> + if (!tmdev->ops || !tmdev->ops->init || !tmdev->ops->calibrate ||
>> + !tmdev->ops->get_temp)
>> + return -EINVAL;
>> +
>> + ret = tmdev->ops->init(tmdev);
>> + if (ret < 0) {
>> + dev_err(&pdev->dev, "tsens init failed\n");
>> + return ret;
>> + }
>> +
>> + ret = tmdev->ops->calibrate(tmdev);
>> + if (ret < 0) {
>> + dev_err(&pdev->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..6e3c365
>> --- /dev/null
>> +++ b/drivers/thermal/qcom/tsens.h
>> @@ -0,0 +1,58 @@
>> +/*
>> + * 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__
>> +
>> +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 {
>> + /* mandatory callbacks */
>> + int (*init)(struct tsens_device *);
>> + int (*calibrate)(struct tsens_device *);
>> + int (*get_temp)(struct tsens_device *, int, long *);
>> + /* 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 *);
>> +};
>> +
>> +/* 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 c;
> Could have had a better variable name - ctx, perhaps?
>
>> + bool trdy;
>> + const struct tsens_ops *ops;
>> + struct tsens_sensor sensor[0];
>> +};
>> +
>> +#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
>>
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 19+ messages in thread
* [RFC 2/7] thermal: qcom: tsens-8916: Add support for 8916 family of SoCs
2015-04-23 13:46 [RFC 0/7] qcom: Add support for tsens driver Rajendra Nayak
2015-04-23 13:46 ` [RFC 1/7] thermal: qcom: tsens: Add a skeletal tsens drivers Rajendra Nayak
@ 2015-04-23 13:46 ` Rajendra Nayak
2015-04-23 13:46 ` [RFC 3/7] thermal: qcom: tsens-8974: Add support for 8974 " Rajendra Nayak
` (6 subsequent siblings)
8 siblings, 0 replies; 19+ messages in thread
From: Rajendra Nayak @ 2015-04-23 13:46 UTC (permalink / raw)
To: linux-arm-msm, linux-arm-kernel, linux-pm
Cc: sboyd, srinivas.kandagatla, nrajan, lina.iyer, 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 eeprom
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 | 107 ++++++++++++++++++++++++++++++
drivers/thermal/qcom/tsens-common.c | 128 ++++++++++++++++++++++++++++++++++++
drivers/thermal/qcom/tsens.c | 1 +
drivers/thermal/qcom/tsens.h | 11 ++++
5 files changed, 248 insertions(+), 1 deletion(-)
create mode 100644 drivers/thermal/qcom/tsens-8916.c
create mode 100644 drivers/thermal/qcom/tsens-common.c
diff --git a/drivers/thermal/qcom/Makefile b/drivers/thermal/qcom/Makefile
index 401069b..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
+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..a69aea3
--- /dev/null
+++ b/drivers/thermal/qcom/tsens-8916.c
@@ -0,0 +1,107 @@
+/*
+ * 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,
+};
diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
new file mode 100644
index 0000000..202f911
--- /dev/null
+++ b/drivers/thermal/qcom/tsens-common.c
@@ -0,0 +1,128 @@
+/*
+ * 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/eeprom-consumer.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/of_address.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
+
+char *qfprom_read(struct device *dev, const char *cname)
+{
+ struct eeprom_cell *cell;
+ ssize_t data;
+ char *ret;
+
+ cell = of_eeprom_cell_get(dev->of_node, cname);
+ if (IS_ERR(cell))
+ return ERR_CAST(cell);
+
+ ret = eeprom_cell_read(cell, &data);
+ eeprom_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]);
+
+ 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, long *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_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)
+ return -ENODEV;
+
+ return 0;
+}
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index fa4a73a..e190225 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -73,6 +73,7 @@ static const struct of_device_id tsens_table[] = {
.compatible = "qcom,msm8960-tsens",
}, {
.compatible = "qcom,msm8916-tsens",
+ .data = &ops_8916,
}, {
.compatible = "qcom,msm8974-tsens",
},
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index 6e3c365..39b031b 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -13,6 +13,10 @@
#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 {
@@ -55,4 +59,11 @@ struct tsens_device {
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, long *);
+
+extern const struct tsens_ops ops_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] 19+ messages in thread* [RFC 3/7] thermal: qcom: tsens-8974: Add support for 8974 family of SoCs
2015-04-23 13:46 [RFC 0/7] qcom: Add support for tsens driver Rajendra Nayak
2015-04-23 13:46 ` [RFC 1/7] thermal: qcom: tsens: Add a skeletal tsens drivers Rajendra Nayak
2015-04-23 13:46 ` [RFC 2/7] thermal: qcom: tsens-8916: Add support for 8916 family of SoCs Rajendra Nayak
@ 2015-04-23 13:46 ` Rajendra Nayak
2015-04-23 13:46 ` [RFC 4/7] thermal: qcom: tsens-8960: Add support for 8960 " Rajendra Nayak
` (5 subsequent siblings)
8 siblings, 0 replies; 19+ messages in thread
From: Rajendra Nayak @ 2015-04-23 13:46 UTC (permalink / raw)
To: linux-arm-msm, linux-arm-kernel, linux-pm
Cc: sboyd, srinivas.kandagatla, nrajan, lina.iyer, 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 | 239 ++++++++++++++++++++++++++++++++++++++
drivers/thermal/qcom/tsens.c | 1 +
drivers/thermal/qcom/tsens.h | 2 +-
4 files changed, 242 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..19d9258
--- /dev/null
+++ b/drivers/thermal/qcom/tsens-8974.c
@@ -0,0 +1,239 @@
+/*
+ * 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,
+};
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index e190225..aeb32a1 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -76,6 +76,7 @@ static const struct of_device_id tsens_table[] = {
.data = &ops_8916,
}, {
.compatible = "qcom,msm8974-tsens",
+ .data = &ops_8974,
},
{}
};
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index 39b031b..ee4ae14 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -64,6 +64,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, long *);
-extern const struct tsens_ops ops_8916;
+extern const struct tsens_ops ops_8916, ops_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] 19+ messages in thread* [RFC 4/7] thermal: qcom: tsens-8960: Add support for 8960 family of SoCs
2015-04-23 13:46 [RFC 0/7] qcom: Add support for tsens driver Rajendra Nayak
` (2 preceding siblings ...)
2015-04-23 13:46 ` [RFC 3/7] thermal: qcom: tsens-8974: Add support for 8974 " Rajendra Nayak
@ 2015-04-23 13:46 ` Rajendra Nayak
2015-04-23 13:46 ` [RFC 5/7] arm: dts: msm8974: Add thermal zones, tsens and eeprom nodes Rajendra Nayak
` (4 subsequent siblings)
8 siblings, 0 replies; 19+ messages in thread
From: Rajendra Nayak @ 2015-04-23 13:46 UTC (permalink / raw)
To: linux-arm-msm, linux-arm-kernel, linux-pm
Cc: sboyd, srinivas.kandagatla, nrajan, lina.iyer, Rajendra Nayak
8960 family of SoCs have the TSENS device as part of a domain
thats not always ON. Hence add .suspend and .resume hooks to
save and restore some of the inited register context.
8960 family has TSENS as part of GCC, hence reuse the GCC
regmap. Also 8960 family had 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 | 336 ++++++++++++++++++++++++++++++++++++++
drivers/thermal/qcom/tsens.c | 1 +
drivers/thermal/qcom/tsens.h | 2 +-
4 files changed, 339 insertions(+), 2 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..534b4ff
--- /dev/null
+++ b/drivers/thermal/qcom/tsens-8960.c
@@ -0,0 +1,336 @@
+/*
+ * 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 "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)
+
+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->c.threshold);
+ if (ret)
+ return ret;
+
+ ret = regmap_read(map, CNTL_ADDR, &tmdev->c.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;
+
+ tmdev->trdy = false;
+
+ return 0;
+}
+
+static int resume_8960(struct tsens_device *tmdev)
+{
+ int ret;
+ unsigned long reg_cntl;
+ struct regmap *map = tmdev->map;
+
+ ret = regmap_update_bits(map, CNTL_ADDR, SW_RST, SW_RST);
+ if (ret)
+ return ret;
+
+ ret = regmap_field_update_bits(tmdev->status_field,
+ MIN_STATUS_MASK | MAX_STATUS_MASK,
+ MIN_STATUS_MASK | MAX_STATUS_MASK);
+ 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->c.threshold);
+ if (ret)
+ return ret;
+
+ ret = regmap_write(map, CNTL_ADDR, tmdev->c.control);
+ if (ret)
+ return ret;
+
+ reg_cntl = tmdev->c.control;
+ reg_cntl >>= SENSOR0_SHIFT;
+
+ 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;
+
+ tmdev->trdy = false;
+ 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;
+ u32 reg_cntl, reg_thr;
+ struct reg_field *field;
+ static struct reg_field status_0 = {
+ .reg = STATUS_CNTL_ADDR_8064,
+ .lsb = 0,
+ .msb = 3,
+ };
+ static struct reg_field status_8 = {
+ .reg = CNTL_ADDR,
+ .lsb = 8,
+ .msb = 11,
+ };
+ int i;
+
+ tmdev->map = dev_get_regmap(tmdev->dev->parent, NULL);
+ if (!tmdev->map)
+ return -ENODEV;
+
+ /* Status bits move when the sensor bits next to them overlap */
+ if (tmdev->num_sensors > 5)
+ field = &status_0;
+ else
+ field = &status_8;
+
+ tmdev->status_field = devm_regmap_field_alloc(tmdev->dev, tmdev->map,
+ *field);
+ if (IS_ERR(tmdev->status_field)) {
+ dev_err(tmdev->dev, "regmap alloc failed\n");
+ return PTR_ERR(tmdev->status_field);
+ }
+
+ /*
+ * 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;
+
+ ret = regmap_field_update_bits(tmdev->status_field,
+ LOWER_STATUS_CLR | UPPER_STATUS_CLR |
+ MIN_STATUS_MASK | MAX_STATUS_MASK,
+ LOWER_STATUS_CLR | UPPER_STATUS_CLR |
+ MIN_STATUS_MASK | MAX_STATUS_MASK);
+
+ reg_cntl |= EN;
+ ret = regmap_write(tmdev->map, CNTL_ADDR, reg_cntl);
+ if (ret)
+ return ret;
+
+ reg_thr = (LOWER_LIMIT_TH << THRESHOLD_LOWER_LIMIT_SHIFT) |
+ (UPPER_LIMIT_TH << THRESHOLD_UPPER_LIMIT_SHIFT) |
+ (MIN_LIMIT_TH << THRESHOLD_MIN_LIMIT_SHIFT) |
+ (MAX_LIMIT_TH << THRESHOLD_MAX_LIMIT_SHIFT);
+ ret = regmap_write(tmdev->map, THRESHOLD_ADDR, reg_thr);
+ 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 = CAL_MDEGC - s->slope * 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)
+{
+ return adc_code * s->slope + s->offset;
+}
+
+static int get_temp_8960(struct tsens_device *tmdev, int id, long *temp)
+{
+ int ret;
+ u32 code, trdy;
+ const struct tsens_sensor *s = &tmdev->sensor[id];
+
+ if (!tmdev->trdy) {
+ ret = regmap_read(tmdev->map, INT_STATUS_ADDR, &trdy);
+ if (ret)
+ return ret;
+ while (!(trdy & TRDY_MASK)) {
+ usleep_range(1000, 1100);
+ regmap_read(tmdev->map, INT_STATUS_ADDR, &trdy);
+ }
+ tmdev->trdy = true;
+ }
+
+ ret = regmap_read(tmdev->map, s->status, &code);
+ if (ret)
+ return ret;
+
+ *temp = code_to_mdegC(code, s);
+
+ dev_dbg(tmdev->dev, "Sensor%d temp is: %ld", id, *temp);
+
+ return 0;
+}
+
+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,
+};
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
index aeb32a1..fa50588 100644
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -71,6 +71,7 @@ static SIMPLE_DEV_PM_OPS(tsens_pm_ops, tsens_suspend, tsens_resume);
static const struct of_device_id tsens_table[] = {
{
.compatible = "qcom,msm8960-tsens",
+ .data = &ops_8960,
}, {
.compatible = "qcom,msm8916-tsens",
.data = &ops_8916,
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
index ee4ae14..a1d6f7a 100644
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -64,6 +64,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, long *);
-extern const struct tsens_ops ops_8916, ops_8974;
+extern const struct tsens_ops ops_8960, ops_8916, ops_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] 19+ messages in thread* [RFC 5/7] arm: dts: msm8974: Add thermal zones, tsens and eeprom nodes
2015-04-23 13:46 [RFC 0/7] qcom: Add support for tsens driver Rajendra Nayak
` (3 preceding siblings ...)
2015-04-23 13:46 ` [RFC 4/7] thermal: qcom: tsens-8960: Add support for 8960 " Rajendra Nayak
@ 2015-04-23 13:46 ` Rajendra Nayak
2015-04-23 16:51 ` Lina Iyer
2015-04-23 13:46 ` [RFC 6/7] clk: qcom: gcc-msm8960: add child devices support Rajendra Nayak
` (3 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Rajendra Nayak @ 2015-04-23 13:46 UTC (permalink / raw)
To: linux-arm-msm, linux-arm-kernel, linux-pm
Cc: sboyd, srinivas.kandagatla, nrajan, lina.iyer, Rajendra Nayak
Add thermal zones, tsens and eeprom nodes
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
arch/arm/boot/dts/qcom-msm8974.dtsi | 105 ++++++++++++++++++++++++++++++++++++
1 file changed, 105 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index e265ec1..5716e89 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -57,6 +57,88 @@
};
};
+ thermal-zones {
+ cpu-thermal0 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 5>;
+
+ trips {
+ cpu_alert0: trip@0 {
+ temperature = <100000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit0: trip@1 {
+ temperature = <125000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal1 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 6>;
+
+ trips {
+ cpu_alert1: trip@0 {
+ temperature = <100000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit1: trip@1 {
+ temperature = <125000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal2 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 7>;
+
+ trips {
+ cpu_alert2: trip@0 {
+ temperature = <100000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit2: trip@1 {
+ temperature = <125000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal3 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 8>;
+
+ trips {
+ cpu_alert3: trip@0 {
+ temperature = <100000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit3: trip@1 {
+ temperature = <125000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+ };
+
cpu-pmu {
compatible = "qcom,krait-pmu";
interrupts = <1 7 0xf04>;
@@ -85,6 +167,29 @@
<0xf9002000 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>;
+ calib = <&tsens_calib>;
+ calib_backup = <&tsens_backup>;
+ qcom,tsens-slopes = <3200 3200 3200 3200 3200 3200
+ 3200 3200 3200 3200 3200>;
+ #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] 19+ messages in thread* Re: [RFC 5/7] arm: dts: msm8974: Add thermal zones, tsens and eeprom nodes
2015-04-23 13:46 ` [RFC 5/7] arm: dts: msm8974: Add thermal zones, tsens and eeprom nodes Rajendra Nayak
@ 2015-04-23 16:51 ` Lina Iyer
2015-04-24 2:49 ` Rajendra Nayak
0 siblings, 1 reply; 19+ messages in thread
From: Lina Iyer @ 2015-04-23 16:51 UTC (permalink / raw)
To: Rajendra Nayak
Cc: linux-arm-msm, linux-arm-kernel, linux-pm, sboyd,
srinivas.kandagatla, nrajan
On Thu, Apr 23 2015 at 07:52 -0600, Rajendra Nayak wrote:
>Add thermal zones, tsens and eeprom nodes
I dont see corresponding patches for 8084 and 8916.
-- Lina
>
>Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
>---
> arch/arm/boot/dts/qcom-msm8974.dtsi | 105 ++++++++++++++++++++++++++++++++++++
> 1 file changed, 105 insertions(+)
>
>diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
>index e265ec1..5716e89 100644
>--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
>+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
>@@ -57,6 +57,88 @@
> };
> };
>
>+ thermal-zones {
>+ cpu-thermal0 {
>+ polling-delay-passive = <250>;
>+ polling-delay = <1000>;
>+
>+ thermal-sensors = <&tsens 5>;
>+
>+ trips {
>+ cpu_alert0: trip@0 {
>+ temperature = <100000>;
>+ hysteresis = <2000>;
>+ type = "passive";
>+ };
>+ cpu_crit0: trip@1 {
>+ temperature = <125000>;
>+ hysteresis = <2000>;
>+ type = "critical";
>+ };
>+ };
>+ };
>+
>+ cpu-thermal1 {
>+ polling-delay-passive = <250>;
>+ polling-delay = <1000>;
>+
>+ thermal-sensors = <&tsens 6>;
>+
>+ trips {
>+ cpu_alert1: trip@0 {
>+ temperature = <100000>;
>+ hysteresis = <2000>;
>+ type = "passive";
>+ };
>+ cpu_crit1: trip@1 {
>+ temperature = <125000>;
>+ hysteresis = <2000>;
>+ type = "critical";
>+ };
>+ };
>+ };
>+
>+ cpu-thermal2 {
>+ polling-delay-passive = <250>;
>+ polling-delay = <1000>;
>+
>+ thermal-sensors = <&tsens 7>;
>+
>+ trips {
>+ cpu_alert2: trip@0 {
>+ temperature = <100000>;
>+ hysteresis = <2000>;
>+ type = "passive";
>+ };
>+ cpu_crit2: trip@1 {
>+ temperature = <125000>;
>+ hysteresis = <2000>;
>+ type = "critical";
>+ };
>+ };
>+ };
>+
>+ cpu-thermal3 {
>+ polling-delay-passive = <250>;
>+ polling-delay = <1000>;
>+
>+ thermal-sensors = <&tsens 8>;
>+
>+ trips {
>+ cpu_alert3: trip@0 {
>+ temperature = <100000>;
>+ hysteresis = <2000>;
>+ type = "passive";
>+ };
>+ cpu_crit3: trip@1 {
>+ temperature = <125000>;
>+ hysteresis = <2000>;
>+ type = "critical";
>+ };
>+ };
>+ };
>+ };
>+
> cpu-pmu {
> compatible = "qcom,krait-pmu";
> interrupts = <1 7 0xf04>;
>@@ -85,6 +167,29 @@
> <0xf9002000 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>;
>+ calib = <&tsens_calib>;
>+ calib_backup = <&tsens_backup>;
>+ qcom,tsens-slopes = <3200 3200 3200 3200 3200 3200
>+ 3200 3200 3200 3200 3200>;
>+ #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 [flat|nested] 19+ messages in thread* Re: [RFC 5/7] arm: dts: msm8974: Add thermal zones, tsens and eeprom nodes
2015-04-23 16:51 ` Lina Iyer
@ 2015-04-24 2:49 ` Rajendra Nayak
0 siblings, 0 replies; 19+ messages in thread
From: Rajendra Nayak @ 2015-04-24 2:49 UTC (permalink / raw)
To: Lina Iyer
Cc: linux-arm-msm, linux-arm-kernel, linux-pm, sboyd,
srinivas.kandagatla, nrajan
On 04/23/2015 10:21 PM, Lina Iyer wrote:
> On Thu, Apr 23 2015 at 07:52 -0600, Rajendra Nayak wrote:
>> Add thermal zones, tsens and eeprom nodes
>
> I dont see corresponding patches for 8084 and 8916.
I did not add 8916 as the dts for it isn't upstream (yet), and
I hadn't tested on 8084 but I can certainly do so and update the
dts files when I do a respin.
>
> -- Lina
>>
>> Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
>> ---
>> arch/arm/boot/dts/qcom-msm8974.dtsi | 105
>> ++++++++++++++++++++++++++++++++++++
>> 1 file changed, 105 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi
>> b/arch/arm/boot/dts/qcom-msm8974.dtsi
>> index e265ec1..5716e89 100644
>> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
>> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
>> @@ -57,6 +57,88 @@
>> };
>> };
>>
>> + thermal-zones {
>> + cpu-thermal0 {
>> + polling-delay-passive = <250>;
>> + polling-delay = <1000>;
>> +
>> + thermal-sensors = <&tsens 5>;
>> +
>> + trips {
>> + cpu_alert0: trip@0 {
>> + temperature = <100000>;
>> + hysteresis = <2000>;
>> + type = "passive";
>> + };
>> + cpu_crit0: trip@1 {
>> + temperature = <125000>;
>> + hysteresis = <2000>;
>> + type = "critical";
>> + };
>> + };
>> + };
>> +
>> + cpu-thermal1 {
>> + polling-delay-passive = <250>;
>> + polling-delay = <1000>;
>> +
>> + thermal-sensors = <&tsens 6>;
>> +
>> + trips {
>> + cpu_alert1: trip@0 {
>> + temperature = <100000>;
>> + hysteresis = <2000>;
>> + type = "passive";
>> + };
>> + cpu_crit1: trip@1 {
>> + temperature = <125000>;
>> + hysteresis = <2000>;
>> + type = "critical";
>> + };
>> + };
>> + };
>> +
>> + cpu-thermal2 {
>> + polling-delay-passive = <250>;
>> + polling-delay = <1000>;
>> +
>> + thermal-sensors = <&tsens 7>;
>> +
>> + trips {
>> + cpu_alert2: trip@0 {
>> + temperature = <100000>;
>> + hysteresis = <2000>;
>> + type = "passive";
>> + };
>> + cpu_crit2: trip@1 {
>> + temperature = <125000>;
>> + hysteresis = <2000>;
>> + type = "critical";
>> + };
>> + };
>> + };
>> +
>> + cpu-thermal3 {
>> + polling-delay-passive = <250>;
>> + polling-delay = <1000>;
>> +
>> + thermal-sensors = <&tsens 8>;
>> +
>> + trips {
>> + cpu_alert3: trip@0 {
>> + temperature = <100000>;
>> + hysteresis = <2000>;
>> + type = "passive";
>> + };
>> + cpu_crit3: trip@1 {
>> + temperature = <125000>;
>> + hysteresis = <2000>;
>> + type = "critical";
>> + };
>> + };
>> + };
>> + };
>> +
>> cpu-pmu {
>> compatible = "qcom,krait-pmu";
>> interrupts = <1 7 0xf04>;
>> @@ -85,6 +167,29 @@
>> <0xf9002000 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>;
>> + calib = <&tsens_calib>;
>> + calib_backup = <&tsens_backup>;
>> + qcom,tsens-slopes = <3200 3200 3200 3200 3200 3200
>> + 3200 3200 3200 3200 3200>;
>> + #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
>>
--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
^ permalink raw reply [flat|nested] 19+ messages in thread
* [RFC 6/7] clk: qcom: gcc-msm8960: add child devices support.
2015-04-23 13:46 [RFC 0/7] qcom: Add support for tsens driver Rajendra Nayak
` (4 preceding siblings ...)
2015-04-23 13:46 ` [RFC 5/7] arm: dts: msm8974: Add thermal zones, tsens and eeprom nodes Rajendra Nayak
@ 2015-04-23 13:46 ` Rajendra Nayak
2015-04-23 13:46 ` [RFC 7/7] arm: dts: apq8064: Add thermal zones, tsens and eeprom nodes Rajendra Nayak
` (2 subsequent siblings)
8 siblings, 0 replies; 19+ messages in thread
From: Rajendra Nayak @ 2015-04-23 13:46 UTC (permalink / raw)
To: linux-arm-msm, linux-arm-kernel, linux-pm
Cc: sboyd, srinivas.kandagatla, nrajan, lina.iyer
From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
This patch adds support to add child devices to gcc as some of the
registers mapped by gcc are used by things like thermal sensors.
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
drivers/clk/qcom/gcc-msm8960.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c
index eb6a4f9..2c80d03 100644
--- a/drivers/clk/qcom/gcc-msm8960.c
+++ b/drivers/clk/qcom/gcc-msm8960.c
@@ -15,6 +15,7 @@
#include <linux/bitops.h>
#include <linux/err.h>
#include <linux/platform_device.h>
+#include <linux/of_platform.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_device.h>
@@ -3520,7 +3521,8 @@ static int gcc_msm8960_probe(struct platform_device *pdev)
if (IS_ERR(clk))
return PTR_ERR(clk);
- return qcom_cc_probe(pdev, match->data);
+ qcom_cc_probe(pdev, match->data);
+ return of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev);
}
static int gcc_msm8960_remove(struct platform_device *pdev)
--
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] 19+ messages in thread* [RFC 7/7] arm: dts: apq8064: Add thermal zones, tsens and eeprom nodes
2015-04-23 13:46 [RFC 0/7] qcom: Add support for tsens driver Rajendra Nayak
` (5 preceding siblings ...)
2015-04-23 13:46 ` [RFC 6/7] clk: qcom: gcc-msm8960: add child devices support Rajendra Nayak
@ 2015-04-23 13:46 ` Rajendra Nayak
2015-04-23 16:52 ` [RFC 0/7] qcom: Add support for tsens driver Lina Iyer
2015-06-06 0:25 ` Kevin Hilman
8 siblings, 0 replies; 19+ messages in thread
From: Rajendra Nayak @ 2015-04-23 13:46 UTC (permalink / raw)
To: linux-arm-msm, linux-arm-kernel, linux-pm
Cc: sboyd, srinivas.kandagatla, nrajan, lina.iyer, Rajendra Nayak
Add thermal zones, tsens and eeprom nodes
Signed-off-by: Rajendra Nayak <rnayak@codeaurora.org>
---
arch/arm/boot/dts/qcom-apq8064.dtsi | 108 ++++++++++++++++++++++++++++++++++++
1 file changed, 108 insertions(+)
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index b3154c0..1aed325 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -61,6 +61,88 @@
};
};
+ thermal-zones {
+ cpu-thermal0 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 7>;
+
+ trips {
+ cpu_alert0: trip@0 {
+ temperature = <100000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit0: trip@1 {
+ temperature = <125000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal1 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 8>;
+
+ trips {
+ cpu_alert1: trip@0 {
+ temperature = <100000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit1: trip@1 {
+ temperature = <125000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal2 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 9>;
+
+ trips {
+ cpu_alert2: trip@0 {
+ temperature = <100000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit2: trip@1 {
+ temperature = <125000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+
+ cpu-thermal3 {
+ polling-delay-passive = <250>;
+ polling-delay = <1000>;
+
+ thermal-sensors = <&tsens 10>;
+
+ trips {
+ cpu_alert3: trip@0 {
+ temperature = <100000>;
+ hysteresis = <2000>;
+ type = "passive";
+ };
+ cpu_crit3: trip@1 {
+ temperature = <125000>;
+ hysteresis = <2000>;
+ type = "critical";
+ };
+ };
+ };
+ };
+
cpu-pmu {
compatible = "qcom,krait-pmu";
interrupts = <1 10 0x304>;
@@ -232,11 +314,37 @@
qcom,controller-type = "pmic-arbiter";
};
+ 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>;
#clock-cells = <1>;
#reset-cells = <1>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
+
+ tsens: thermal-sensor@900000 {
+ compatible = "qcom,msm8960-tsens";
+ calib = <&tsens_calib>;
+ calib_backup = <&tsens_backup>;
+ qcom,tsens-slopes = <1176 1176 1154 1176 1111
+ 1132 1132 1199 1132 1199 1132>;
+ #thermal-sensor-cells = <1>;
+ };
};
mmcc: clock-controller@4000000 {
--
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] 19+ messages in thread* Re: [RFC 0/7] qcom: Add support for tsens driver
2015-04-23 13:46 [RFC 0/7] qcom: Add support for tsens driver Rajendra Nayak
` (6 preceding siblings ...)
2015-04-23 13:46 ` [RFC 7/7] arm: dts: apq8064: Add thermal zones, tsens and eeprom nodes Rajendra Nayak
@ 2015-04-23 16:52 ` Lina Iyer
2015-06-06 0:25 ` Kevin Hilman
8 siblings, 0 replies; 19+ messages in thread
From: Lina Iyer @ 2015-04-23 16:52 UTC (permalink / raw)
To: Rajendra Nayak
Cc: linux-arm-msm, linux-arm-kernel, linux-pm, sboyd,
srinivas.kandagatla, nrajan
On Thu, Apr 23 2015 at 07:51 -0600, Rajendra Nayak wrote:
>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.
Thanks, I think the design looks good. Will take a look at the patches.
-- Lina
>Support is added for msm8916, msm8960 and msm8974 families.
>Based on top of the latest eeprom framework patches [1]
>
>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://lwn.net/Articles/638565/
>
>Rajendra Nayak (6):
> 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: qcom: tsens-8960: Add support for 8960 family of SoCs
> arm: dts: msm8974: Add thermal zones, tsens and eeprom nodes
> arm: dts: apq8064: Add thermal zones, tsens and eeprom nodes
>
>Srinivas Kandagatla (1):
> clk: qcom: gcc-msm8960: add child devices support.
>
> .../devicetree/bindings/thermal/qcom-tsens.txt | 36 +++
> arch/arm/boot/dts/qcom-apq8064.dtsi | 108 +++++++
> arch/arm/boot/dts/qcom-msm8974.dtsi | 105 +++++++
> drivers/clk/qcom/gcc-msm8960.c | 4 +-
> drivers/thermal/Kconfig | 5 +
> drivers/thermal/Makefile | 1 +
> drivers/thermal/qcom/Kconfig | 10 +
> drivers/thermal/qcom/Makefile | 2 +
> drivers/thermal/qcom/tsens-8916.c | 107 +++++++
> drivers/thermal/qcom/tsens-8960.c | 336 +++++++++++++++++++++
> drivers/thermal/qcom/tsens-8974.c | 239 +++++++++++++++
> drivers/thermal/qcom/tsens-common.c | 128 ++++++++
> drivers/thermal/qcom/tsens.c | 209 +++++++++++++
> drivers/thermal/qcom/tsens.h | 69 +++++
> 14 files changed, 1358 insertions(+), 1 deletion(-)
> 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-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] 19+ messages in thread* Re: [RFC 0/7] qcom: Add support for tsens driver
2015-04-23 13:46 [RFC 0/7] qcom: Add support for tsens driver Rajendra Nayak
` (7 preceding siblings ...)
2015-04-23 16:52 ` [RFC 0/7] qcom: Add support for tsens driver Lina Iyer
@ 2015-06-06 0:25 ` Kevin Hilman
2015-06-08 4:29 ` Rajendra Nayak
8 siblings, 1 reply; 19+ messages in thread
From: Kevin Hilman @ 2015-06-06 0:25 UTC (permalink / raw)
To: Rajendra Nayak
Cc: linux-arm-msm, linux-arm-kernel, linux-pm, sboyd,
srinivas.kandagatla, nrajan, lina.iyer, javi.merino,
punit.agrawal
[+ Javi, Punit for power_allocator questions ]
Hi Rajendra,
Rajendra Nayak <rnayak@codeaurora.org> writes:
> 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 and msm8974 families.
> Based on top of the latest eeprom framework patches [1]
Curious how are you testing this? with which thermal governor?
I'm experimenting with the new thermal power_allocator governor
currently in linux-next, and was hoping to use this to test it, but I'm
noticing it doesn't work with the power_allocator governor.
The first thing is that the power_allator goveror expects each thermal
zone to have a sustainable-power property in the DT, which this series
doesn't provide. Hacking some dummy values in there to see what happens
next, I then hit the "thermal zone cpu-thermal0 has wrong trip setup for
power allocator" error from the power_allocator driver.
I stopped there as that made it clear this isn't yet ready to be used
with the power_allocator governor.
Kevin
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [RFC 0/7] qcom: Add support for tsens driver
2015-06-06 0:25 ` Kevin Hilman
@ 2015-06-08 4:29 ` Rajendra Nayak
2015-06-08 16:05 ` Kevin Hilman
0 siblings, 1 reply; 19+ messages in thread
From: Rajendra Nayak @ 2015-06-08 4:29 UTC (permalink / raw)
To: Kevin Hilman
Cc: linux-arm-msm, linux-arm-kernel, linux-pm, sboyd,
srinivas.kandagatla, nrajan, lina.iyer, javi.merino,
punit.agrawal
Hi Kevin,
> Curious how are you testing this? with which thermal governor?
I have been mostly testing this with step wise on the db410c target
board.
>
> I'm experimenting with the new thermal power_allocator governor
> currently in linux-next, and was hoping to use this to test it, but I'm
> noticing it doesn't work with the power_allocator governor.
>
> The first thing is that the power_allator goveror expects each thermal
> zone to have a sustainable-power property in the DT, which this series
> doesn't provide. Hacking some dummy values in there to see what happens
> next, I then hit the "thermal zone cpu-thermal0 has wrong trip setup for
> power allocator" error from the power_allocator driver.
Right, the RFC I posted wasn't tested with IPA and hence does not have
some of the additional properties in DT which IPA expects.
The wrong trip setup error that you are seeing is because IPA expects
2 passive trip points, a "switch on" trip point and a "desired
temperature" trip point and the dts I posted with the RFC had
just one passive trip point.
I am in the process of testing this with IPA myself (on db410c mainly,
but will also test on db8074 and IFC6410/6540 as well) and will repost
in a few days with updated dts entries and a few other minor fixes
to the driver itself. Let me know what target board you are
interested to get this working on and I will make sure I test on it
before I repost.
regards,
Rajendra
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC 0/7] qcom: Add support for tsens driver
2015-06-08 4:29 ` Rajendra Nayak
@ 2015-06-08 16:05 ` Kevin Hilman
2015-06-09 5:15 ` Rajendra Nayak
0 siblings, 1 reply; 19+ messages in thread
From: Kevin Hilman @ 2015-06-08 16:05 UTC (permalink / raw)
To: Rajendra Nayak
Cc: linux-arm-msm, linux-arm-kernel, linux-pm, sboyd,
srinivas.kandagatla, nrajan, lina.iyer, javi.merino,
punit.agrawal
Rajendra Nayak <rnayak@codeaurora.org> writes:
> Hi Kevin,
>
>> Curious how are you testing this? with which thermal governor?
>
> I have been mostly testing this with step wise on the db410c target
> board.
>
>>
>> I'm experimenting with the new thermal power_allocator governor
>> currently in linux-next, and was hoping to use this to test it, but I'm
>> noticing it doesn't work with the power_allocator governor.
>>
>> The first thing is that the power_allator goveror expects each thermal
>> zone to have a sustainable-power property in the DT, which this series
>> doesn't provide. Hacking some dummy values in there to see what happens
>> next, I then hit the "thermal zone cpu-thermal0 has wrong trip setup for
>> power allocator" error from the power_allocator driver.
>
> Right, the RFC I posted wasn't tested with IPA and hence does not have
> some of the additional properties in DT which IPA expects.
> The wrong trip setup error that you are seeing is because IPA expects
> 2 passive trip points, a "switch on" trip point and a "desired
> temperature" trip point and the dts I posted with the RFC had
> just one passive trip point.
>
> I am in the process of testing this with IPA myself (on db410c mainly,
> but will also test on db8074 and IFC6410/6540 as well) and will repost
> in a few days with updated dts entries and a few other minor fixes
> to the driver itself. Let me know what target board you are
> interested to get this working on and I will make sure I test on it
> before I repost.
Great, thanks!
I tried on qcom-apq8064-ifc6410 and qcom-msm8974-sony-xperia-honami, and
would have also tried qcom-apq8084-ifc6540 but saw that Lina mentioned
there was missing support for 8084.
Kevin
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [RFC 0/7] qcom: Add support for tsens driver
2015-06-08 16:05 ` Kevin Hilman
@ 2015-06-09 5:15 ` Rajendra Nayak
0 siblings, 0 replies; 19+ messages in thread
From: Rajendra Nayak @ 2015-06-09 5:15 UTC (permalink / raw)
To: Kevin Hilman
Cc: linux-arm-msm, linux-arm-kernel, linux-pm, sboyd,
srinivas.kandagatla, nrajan, lina.iyer, javi.merino,
punit.agrawal
Hi Kevin,
>> I am in the process of testing this with IPA myself (on db410c mainly,
>> but will also test on db8074 and IFC6410/6540 as well) and will repost
>> in a few days with updated dts entries and a few other minor fixes
>> to the driver itself. Let me know what target board you are
>> interested to get this working on and I will make sure I test on it
>> before I repost.
>
> Great, thanks!
>
> I tried on qcom-apq8064-ifc6410 and qcom-msm8974-sony-xperia-honami, and
> would have also tried qcom-apq8084-ifc6540 but saw that Lina mentioned
> there was missing support for 8084.
I have done some testing on ifc6540 now, and will add support for 8084
as well with the repost.
regards,
Rajendra
^ permalink raw reply [flat|nested] 19+ messages in thread