* [PATCH 1/9] thermal/drivers/hisi: move clk operation to related function
2017-09-22 9:42 [PATCH 0/9] add support for Hi3660 tsensor Tao Wang
@ 2017-09-22 9:42 ` Tao Wang
2017-09-22 9:42 ` [PATCH 2/9] thermal/drivers/hisi: use round up step value Tao Wang
` (7 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tao Wang @ 2017-09-22 9:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Kevin Wangtao <kevin.wangtao@linaro.org>
The sensor's clock is enabled and disabled outside of the probe and
disable function. Moving the corresponding action in the
hisi_thermal_setup() and hisi_thermal_disable_sensor(), factors out
some lines of code and makes the code more symmetric.
Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
---
drivers/thermal/hisi_thermal.c | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index 39f4627..c43e3df 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -203,6 +203,8 @@ static void hisi_thermal_disable_sensor(struct hisi_thermal_data *data)
hisi_thermal_enable(data->regs, 0);
hisi_thermal_alarm_enable(data->regs, 0);
hisi_thermal_reset_enable(data->regs, 0);
+
+ clk_disable_unprepare(data->clk);
}
static int hisi_thermal_get_temp(void *__data, int *temp)
@@ -297,9 +299,13 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor,
static int hisi_thermal_setup(struct hisi_thermal_data *data)
{
- struct hisi_thermal_sensor *sensor;
+ struct hisi_thermal_sensor *sensor = &data->sensor;
+ int ret;
- sensor = &data->sensor;
+ /* enable clock for tsensor */
+ ret = clk_prepare_enable(data->clk);
+ if (ret)
+ return ret;
/* disable module firstly */
hisi_thermal_reset_enable(data->regs, 0);
@@ -363,13 +369,6 @@ static int hisi_thermal_probe(struct platform_device *pdev)
return ret;
}
- /* enable clock for thermal */
- ret = clk_prepare_enable(data->clk);
- if (ret) {
- dev_err(&pdev->dev, "failed to enable thermal clk: %d\n", ret);
- return ret;
- }
-
ret = hisi_thermal_register_sensor(pdev, data,
&data->sensor,
HISI_DEFAULT_SENSOR);
@@ -405,7 +404,6 @@ static int hisi_thermal_remove(struct platform_device *pdev)
hisi_thermal_toggle_sensor(sensor, false);
hisi_thermal_disable_sensor(data);
- clk_disable_unprepare(data->clk);
return 0;
}
@@ -417,23 +415,14 @@ static int hisi_thermal_suspend(struct device *dev)
hisi_thermal_disable_sensor(data);
- clk_disable_unprepare(data->clk);
-
return 0;
}
static int hisi_thermal_resume(struct device *dev)
{
struct hisi_thermal_data *data = dev_get_drvdata(dev);
- int ret;
- ret = clk_prepare_enable(data->clk);
- if (ret)
- return ret;
-
- hisi_thermal_setup(data);
-
- return 0;
+ return hisi_thermal_setup(data);
}
#endif
--
2.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/9] thermal/drivers/hisi: use round up step value
2017-09-22 9:42 [PATCH 0/9] add support for Hi3660 tsensor Tao Wang
2017-09-22 9:42 ` [PATCH 1/9] thermal/drivers/hisi: move clk operation to related function Tao Wang
@ 2017-09-22 9:42 ` Tao Wang
2017-09-22 9:42 ` [PATCH 3/9] thermal/drivers/hisi: put platform code together Tao Wang
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tao Wang @ 2017-09-22 9:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Kevin Wangtao <kevin.wangtao@linaro.org>
Use round up divide to ensure the programmed value of threshold and
lag not less than we set, and in order to keep the accuracy while
using round up divide, the step value should also be a round up value.
Then there is no need to use hisi_thermal_round_temp.
Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
---
drivers/thermal/hisi_thermal.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index c43e3df..c8b651d 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -40,7 +40,7 @@
#define HISI_TEMP_BASE (-60000)
#define HISI_TEMP_RESET (100000)
-#define HISI_TEMP_STEP (784)
+#define HISI_TEMP_STEP (785)
#define HISI_TEMP_LAG (3500)
#define HISI_MAX_SENSORS 4
@@ -63,19 +63,19 @@ struct hisi_thermal_data {
/*
* The temperature computation on the tsensor is as follow:
* Unit: millidegree Celsius
- * Step: 255/200 (0.7843)
+ * Step: 200/255 (0.7843)
* Temperature base: -60??C
*
- * The register is programmed in temperature steps, every step is 784
+ * The register is programmed in temperature steps, every step is 785
* millidegree and begins at -60 000 m??C
*
* The temperature from the steps:
*
- * Temp = TempBase + (steps x 784)
+ * Temp = TempBase + (steps x 785)
*
* and the steps from the temperature:
*
- * steps = (Temp - TempBase) / 784
+ * steps = (Temp - TempBase) / 785
*
*/
static inline int hisi_thermal_step_to_temp(int step)
@@ -85,13 +85,7 @@ static inline int hisi_thermal_step_to_temp(int step)
static inline int hisi_thermal_temp_to_step(int temp)
{
- return (temp - HISI_TEMP_BASE) / HISI_TEMP_STEP;
-}
-
-static inline int hisi_thermal_round_temp(int temp)
-{
- return hisi_thermal_step_to_temp(
- hisi_thermal_temp_to_step(temp));
+ return DIV_ROUND_UP(temp - HISI_TEMP_BASE, HISI_TEMP_STEP);
}
/*
@@ -127,7 +121,7 @@ static inline int hisi_thermal_round_temp(int temp)
*/
static inline void hisi_thermal_set_lag(void __iomem *addr, int value)
{
- writel((value / HISI_TEMP_STEP) & 0x1F, addr + TEMP0_LAG);
+ writel(DIV_ROUND_UP(value, HISI_TEMP_STEP) & 0x1F, addr + TEMP0_LAG);
}
static inline void hisi_thermal_alarm_clear(void __iomem *addr, int value)
@@ -274,7 +268,7 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
for (i = 0; i < of_thermal_get_ntrips(sensor->tzd); i++) {
if (trip[i].type == THERMAL_TRIP_PASSIVE) {
- sensor->thres_temp = hisi_thermal_round_temp(trip[i].temperature);
+ sensor->thres_temp = trip[i].temperature;
break;
}
}
--
2.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/9] thermal/drivers/hisi: put platform code together
2017-09-22 9:42 [PATCH 0/9] add support for Hi3660 tsensor Tao Wang
2017-09-22 9:42 ` [PATCH 1/9] thermal/drivers/hisi: move clk operation to related function Tao Wang
2017-09-22 9:42 ` [PATCH 2/9] thermal/drivers/hisi: use round up step value Tao Wang
@ 2017-09-22 9:42 ` Tao Wang
2017-09-22 9:42 ` [PATCH 4/9] thermal/drivers/hisi: add platform prefix to function name Tao Wang
` (5 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tao Wang @ 2017-09-22 9:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Kevin Wangtao <kevin.wangtao@linaro.org>
reorganize code for follow-up patch, there is no functional change here.
Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
---
drivers/thermal/hisi_thermal.c | 76 +++++++++++++++++++++---------------------
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index c8b651d..96904b4 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -201,6 +201,44 @@ static void hisi_thermal_disable_sensor(struct hisi_thermal_data *data)
clk_disable_unprepare(data->clk);
}
+
+static int hisi_thermal_setup(struct hisi_thermal_data *data)
+{
+ struct hisi_thermal_sensor *sensor = &data->sensor;
+ int ret;
+
+ /* enable clock for tsensor */
+ ret = clk_prepare_enable(data->clk);
+ if (ret)
+ return ret;
+
+ /* disable module firstly */
+ hisi_thermal_reset_enable(data->regs, 0);
+ hisi_thermal_enable(data->regs, 0);
+
+ /* select sensor id */
+ hisi_thermal_sensor_select(data->regs, sensor->id);
+
+ /* setting the hdak time */
+ hisi_thermal_hdak_set(data->regs, 0);
+
+ /* setting lag value between current temp and the threshold */
+ hisi_thermal_set_lag(data->regs, HISI_TEMP_LAG);
+
+ /* enable for interrupt */
+ hisi_thermal_alarm_set(data->regs, sensor->thres_temp);
+
+ hisi_thermal_reset_set(data->regs, HISI_TEMP_RESET);
+
+ /* enable module */
+ hisi_thermal_reset_enable(data->regs, 1);
+ hisi_thermal_enable(data->regs, 1);
+
+ hisi_thermal_alarm_clear(data->regs, 0);
+ hisi_thermal_alarm_enable(data->regs, 1);
+
+ return 0;
+}
static int hisi_thermal_get_temp(void *__data, int *temp)
{
struct hisi_thermal_data *data = __data;
@@ -291,44 +329,6 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor,
on ? THERMAL_DEVICE_ENABLED : THERMAL_DEVICE_DISABLED);
}
-static int hisi_thermal_setup(struct hisi_thermal_data *data)
-{
- struct hisi_thermal_sensor *sensor = &data->sensor;
- int ret;
-
- /* enable clock for tsensor */
- ret = clk_prepare_enable(data->clk);
- if (ret)
- return ret;
-
- /* disable module firstly */
- hisi_thermal_reset_enable(data->regs, 0);
- hisi_thermal_enable(data->regs, 0);
-
- /* select sensor id */
- hisi_thermal_sensor_select(data->regs, sensor->id);
-
- /* setting the hdak time */
- hisi_thermal_hdak_set(data->regs, 0);
-
- /* setting lag value between current temp and the threshold */
- hisi_thermal_set_lag(data->regs, HISI_TEMP_LAG);
-
- /* enable for interrupt */
- hisi_thermal_alarm_set(data->regs, sensor->thres_temp);
-
- hisi_thermal_reset_set(data->regs, HISI_TEMP_RESET);
-
- /* enable module */
- hisi_thermal_reset_enable(data->regs, 1);
- hisi_thermal_enable(data->regs, 1);
-
- hisi_thermal_alarm_clear(data->regs, 0);
- hisi_thermal_alarm_enable(data->regs, 1);
-
- return 0;
-}
-
static int hisi_thermal_probe(struct platform_device *pdev)
{
struct hisi_thermal_data *data;
--
2.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/9] thermal/drivers/hisi: add platform prefix to function name
2017-09-22 9:42 [PATCH 0/9] add support for Hi3660 tsensor Tao Wang
` (2 preceding siblings ...)
2017-09-22 9:42 ` [PATCH 3/9] thermal/drivers/hisi: put platform code together Tao Wang
@ 2017-09-22 9:42 ` Tao Wang
2017-09-22 9:42 ` [PATCH 5/9] thermal/drivers/hisi: perpare to add support for other hisi platform Tao Wang
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tao Wang @ 2017-09-22 9:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Kevin Wangtao <kevin.wangtao@linaro.org>
reorganize code for follow-up patch, there is no functional change here.
Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
---
drivers/thermal/hisi_thermal.c | 145 +++++++++++++++++++++--------------------
1 file changed, 73 insertions(+), 72 deletions(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index 96904b4..4635839 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -26,25 +26,24 @@
#include "thermal_core.h"
-#define TEMP0_LAG (0x0)
-#define TEMP0_TH (0x4)
-#define TEMP0_RST_TH (0x8)
-#define TEMP0_CFG (0xC)
-#define TEMP0_CFG_SS_MSK (0xF000)
-#define TEMP0_CFG_HDAK_MSK (0x30)
-#define TEMP0_EN (0x10)
-#define TEMP0_INT_EN (0x14)
-#define TEMP0_INT_CLR (0x18)
-#define TEMP0_RST_MSK (0x1C)
-#define TEMP0_VALUE (0x28)
-
-#define HISI_TEMP_BASE (-60000)
-#define HISI_TEMP_RESET (100000)
-#define HISI_TEMP_STEP (785)
-#define HISI_TEMP_LAG (3500)
-
-#define HISI_MAX_SENSORS 4
-#define HISI_DEFAULT_SENSOR 2
+#define HI6220_TEMP0_LAG (0x0)
+#define HI6220_TEMP0_TH (0x4)
+#define HI6220_TEMP0_RST_TH (0x8)
+#define HI6220_TEMP0_CFG (0xC)
+#define HI6220_TEMP0_CFG_SS_MSK (0xF000)
+#define HI6220_TEMP0_CFG_HDAK_MSK (0x30)
+#define HI6220_TEMP0_EN (0x10)
+#define HI6220_TEMP0_INT_EN (0x14)
+#define HI6220_TEMP0_INT_CLR (0x18)
+#define HI6220_TEMP0_RST_MSK (0x1C)
+#define HI6220_TEMP0_VALUE (0x28)
+
+#define HI6220_TEMP_BASE (-60000)
+#define HI6220_TEMP_RESET (100000)
+#define HI6220_TEMP_STEP (785)
+#define HI6220_TEMP_LAG (3500)
+
+#define HI6220_DEFAULT_SENSOR 2
struct hisi_thermal_sensor {
struct thermal_zone_device *tzd;
@@ -78,14 +77,14 @@ struct hisi_thermal_data {
* steps = (Temp - TempBase) / 785
*
*/
-static inline int hisi_thermal_step_to_temp(int step)
+static inline int hi6220_thermal_step_to_temp(int step)
{
- return HISI_TEMP_BASE + (step * HISI_TEMP_STEP);
+ return HI6220_TEMP_BASE + (step * HI6220_TEMP_STEP);
}
-static inline int hisi_thermal_temp_to_step(int temp)
+static inline int hi6220_thermal_temp_to_step(int temp)
{
- return DIV_ROUND_UP(temp - HISI_TEMP_BASE, HISI_TEMP_STEP);
+ return DIV_ROUND_UP(temp - HI6220_TEMP_BASE, HI6220_TEMP_STEP);
}
/*
@@ -112,51 +111,53 @@ static inline int hisi_thermal_temp_to_step(int temp)
*
* [0:4] : lag register
*
- * The temperature is coded in steps, cf. HISI_TEMP_STEP.
+ * The temperature is coded in steps, cf. HI6220_TEMP_STEP.
*
* Min : 0x00 : 0.0 ??C
* Max : 0x1F : 24.3 ??C
*
* The 'value' parameter is in milliCelsius.
*/
-static inline void hisi_thermal_set_lag(void __iomem *addr, int value)
+static inline void hi6220_thermal_set_lag(void __iomem *addr, int value)
{
- writel(DIV_ROUND_UP(value, HISI_TEMP_STEP) & 0x1F, addr + TEMP0_LAG);
+ writel(DIV_ROUND_UP(value, HI6220_TEMP_STEP) & 0x1F,
+ addr + HI6220_TEMP0_LAG);
}
-static inline void hisi_thermal_alarm_clear(void __iomem *addr, int value)
+static inline void hi6220_thermal_alarm_clear(void __iomem *addr, int value)
{
- writel(value, addr + TEMP0_INT_CLR);
+ writel(value, addr + HI6220_TEMP0_INT_CLR);
}
-static inline void hisi_thermal_alarm_enable(void __iomem *addr, int value)
+static inline void hi6220_thermal_alarm_enable(void __iomem *addr, int value)
{
- writel(value, addr + TEMP0_INT_EN);
+ writel(value, addr + HI6220_TEMP0_INT_EN);
}
-static inline void hisi_thermal_alarm_set(void __iomem *addr, int temp)
+static inline void hi6220_thermal_alarm_set(void __iomem *addr, int temp)
{
- writel(hisi_thermal_temp_to_step(temp) | 0x0FFFFFF00, addr + TEMP0_TH);
+ writel(hi6220_thermal_temp_to_step(temp) | 0x0FFFFFF00,
+ addr + HI6220_TEMP0_TH);
}
-static inline void hisi_thermal_reset_set(void __iomem *addr, int temp)
+static inline void hi6220_thermal_reset_set(void __iomem *addr, int temp)
{
- writel(hisi_thermal_temp_to_step(temp), addr + TEMP0_RST_TH);
+ writel(hi6220_thermal_temp_to_step(temp), addr + HI6220_TEMP0_RST_TH);
}
-static inline void hisi_thermal_reset_enable(void __iomem *addr, int value)
+static inline void hi6220_thermal_reset_enable(void __iomem *addr, int value)
{
- writel(value, addr + TEMP0_RST_MSK);
+ writel(value, addr + HI6220_TEMP0_RST_MSK);
}
-static inline void hisi_thermal_enable(void __iomem *addr, int value)
+static inline void hi6220_thermal_enable(void __iomem *addr, int value)
{
- writel(value, addr + TEMP0_EN);
+ writel(value, addr + HI6220_TEMP0_EN);
}
-static inline int hisi_thermal_get_temperature(void __iomem *addr)
+static inline int hi6220_thermal_get_temperature(void __iomem *addr)
{
- return hisi_thermal_step_to_temp(readl(addr + TEMP0_VALUE));
+ return hi6220_thermal_step_to_temp(readl(addr + HI6220_TEMP0_VALUE));
}
/*
@@ -169,10 +170,10 @@ static inline int hisi_thermal_get_temperature(void __iomem *addr)
* 0x2: remote sensor 2 (ACPU cluster 0)
* 0x3: remote sensor 3 (G3D)
*/
-static inline void hisi_thermal_sensor_select(void __iomem *addr, int sensor)
+static inline void hi6220_thermal_sensor_select(void __iomem *addr, int sensor)
{
- writel((readl(addr + TEMP0_CFG) & ~TEMP0_CFG_SS_MSK ) |
- (sensor << 12), addr + TEMP0_CFG);
+ writel((readl(addr + HI6220_TEMP0_CFG) & ~HI6220_TEMP0_CFG_SS_MSK) |
+ (sensor << 12), addr + HI6220_TEMP0_CFG);
}
/*
@@ -185,24 +186,24 @@ static inline void hisi_thermal_sensor_select(void __iomem *addr, int sensor)
* 0x2 : 49.152 ms
* 0x3 : 393.216 ms
*/
-static inline void hisi_thermal_hdak_set(void __iomem *addr, int value)
+static inline void hi6220_thermal_hdak_set(void __iomem *addr, int value)
{
- writel((readl(addr + TEMP0_CFG) & ~TEMP0_CFG_HDAK_MSK) |
- (value << 4), addr + TEMP0_CFG);
+ writel((readl(addr + HI6220_TEMP0_CFG) & ~HI6220_TEMP0_CFG_HDAK_MSK) |
+ (value << 4), addr + HI6220_TEMP0_CFG);
}
-static void hisi_thermal_disable_sensor(struct hisi_thermal_data *data)
+static void hi6220_thermal_disable_sensor(struct hisi_thermal_data *data)
{
/* disable sensor module */
- hisi_thermal_enable(data->regs, 0);
- hisi_thermal_alarm_enable(data->regs, 0);
- hisi_thermal_reset_enable(data->regs, 0);
+ hi6220_thermal_enable(data->regs, 0);
+ hi6220_thermal_alarm_enable(data->regs, 0);
+ hi6220_thermal_reset_enable(data->regs, 0);
clk_disable_unprepare(data->clk);
}
-static int hisi_thermal_setup(struct hisi_thermal_data *data)
+static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data)
{
struct hisi_thermal_sensor *sensor = &data->sensor;
int ret;
@@ -213,29 +214,29 @@ static int hisi_thermal_setup(struct hisi_thermal_data *data)
return ret;
/* disable module firstly */
- hisi_thermal_reset_enable(data->regs, 0);
- hisi_thermal_enable(data->regs, 0);
+ hi6220_thermal_reset_enable(data->regs, 0);
+ hi6220_thermal_enable(data->regs, 0);
/* select sensor id */
- hisi_thermal_sensor_select(data->regs, sensor->id);
+ hi6220_thermal_sensor_select(data->regs, sensor->id);
/* setting the hdak time */
- hisi_thermal_hdak_set(data->regs, 0);
+ hi6220_thermal_hdak_set(data->regs, 0);
/* setting lag value between current temp and the threshold */
- hisi_thermal_set_lag(data->regs, HISI_TEMP_LAG);
+ hi6220_thermal_set_lag(data->regs, HI6220_TEMP_LAG);
/* enable for interrupt */
- hisi_thermal_alarm_set(data->regs, sensor->thres_temp);
+ hi6220_thermal_alarm_set(data->regs, sensor->thres_temp);
- hisi_thermal_reset_set(data->regs, HISI_TEMP_RESET);
+ hi6220_thermal_reset_set(data->regs, HI6220_TEMP_RESET);
/* enable module */
- hisi_thermal_reset_enable(data->regs, 1);
- hisi_thermal_enable(data->regs, 1);
+ hi6220_thermal_reset_enable(data->regs, 1);
+ hi6220_thermal_enable(data->regs, 1);
- hisi_thermal_alarm_clear(data->regs, 0);
- hisi_thermal_alarm_enable(data->regs, 1);
+ hi6220_thermal_alarm_clear(data->regs, 0);
+ hi6220_thermal_alarm_enable(data->regs, 1);
return 0;
}
@@ -244,7 +245,7 @@ static int hisi_thermal_get_temp(void *__data, int *temp)
struct hisi_thermal_data *data = __data;
struct hisi_thermal_sensor *sensor = &data->sensor;
- *temp = hisi_thermal_get_temperature(data->regs);
+ *temp = hi6220_thermal_get_temperature(data->regs);
dev_dbg(&data->pdev->dev, "id=%d, temp=%d, thres=%d\n",
sensor->id, *temp, sensor->thres_temp);
@@ -260,11 +261,11 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
{
struct hisi_thermal_data *data = dev;
struct hisi_thermal_sensor *sensor = &data->sensor;
- int temp;
+ int temp = 0;
- hisi_thermal_alarm_clear(data->regs, 1);
+ hi6220_thermal_alarm_clear(data->regs, 1);
- temp = hisi_thermal_get_temperature(data->regs);
+ hisi_thermal_get_temp(data, &temp);
if (temp >= sensor->thres_temp) {
dev_crit(&data->pdev->dev, "THERMAL ALARM: %d > %d\n",
@@ -273,7 +274,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
thermal_zone_device_update(data->sensor.tzd,
THERMAL_EVENT_UNSPECIFIED);
- } else if (temp < sensor->thres_temp) {
+ } else {
dev_crit(&data->pdev->dev, "THERMAL ALARM stopped: %d < %d\n",
temp, sensor->thres_temp);
}
@@ -365,14 +366,14 @@ static int hisi_thermal_probe(struct platform_device *pdev)
ret = hisi_thermal_register_sensor(pdev, data,
&data->sensor,
- HISI_DEFAULT_SENSOR);
+ HI6220_DEFAULT_SENSOR);
if (ret) {
dev_err(&pdev->dev, "failed to register thermal sensor: %d\n",
ret);
return ret;
}
- ret = hisi_thermal_setup(data);
+ ret = hi6220_thermal_enable_sensor(data);
if (ret) {
dev_err(&pdev->dev, "Failed to setup the sensor: %d\n", ret);
return ret;
@@ -397,7 +398,7 @@ static int hisi_thermal_remove(struct platform_device *pdev)
struct hisi_thermal_sensor *sensor = &data->sensor;
hisi_thermal_toggle_sensor(sensor, false);
- hisi_thermal_disable_sensor(data);
+ hi6220_thermal_disable_sensor(data);
return 0;
}
@@ -407,7 +408,7 @@ static int hisi_thermal_suspend(struct device *dev)
{
struct hisi_thermal_data *data = dev_get_drvdata(dev);
- hisi_thermal_disable_sensor(data);
+ hi6220_thermal_disable_sensor(data);
return 0;
}
@@ -416,7 +417,7 @@ static int hisi_thermal_resume(struct device *dev)
{
struct hisi_thermal_data *data = dev_get_drvdata(dev);
- return hisi_thermal_setup(data);
+ return hi6220_thermal_enable_sensor(data);
}
#endif
--
2.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/9] thermal/drivers/hisi: perpare to add support for other hisi platform
2017-09-22 9:42 [PATCH 0/9] add support for Hi3660 tsensor Tao Wang
` (3 preceding siblings ...)
2017-09-22 9:42 ` [PATCH 4/9] thermal/drivers/hisi: add platform prefix to function name Tao Wang
@ 2017-09-22 9:42 ` Tao Wang
2017-09-22 9:42 ` [PATCH 6/9] thermal/drivers/hisi: add support for multi temp threshold Tao Wang
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tao Wang @ 2017-09-22 9:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Kevin Wangtao <kevin.wangtao@linaro.org>
For platform compatibility, add tsensor operation function pointer to
thermal data, and each platform has its own probe function to register
proper tsensor operation function to the pointer, platform related
resource request are also implemented in the platform probe function.
Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
---
drivers/thermal/hisi_thermal.c | 135 +++++++++++++++++++++++++++--------------
1 file changed, 89 insertions(+), 46 deletions(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index 4635839..f9d9fd6 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -23,6 +23,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/io.h>
+#include <linux/of_device.h>
#include "thermal_core.h"
@@ -30,7 +31,7 @@
#define HI6220_TEMP0_TH (0x4)
#define HI6220_TEMP0_RST_TH (0x8)
#define HI6220_TEMP0_CFG (0xC)
-#define HI6220_TEMP0_CFG_SS_MSK (0xF000)
+#define HI6220_TEMP0_CFG_SS_MSK (0xF000)
#define HI6220_TEMP0_CFG_HDAK_MSK (0x30)
#define HI6220_TEMP0_EN (0x10)
#define HI6220_TEMP0_INT_EN (0x14)
@@ -41,7 +42,7 @@
#define HI6220_TEMP_BASE (-60000)
#define HI6220_TEMP_RESET (100000)
#define HI6220_TEMP_STEP (785)
-#define HI6220_TEMP_LAG (3500)
+#define HI6220_TEMP_LAG (3500)
#define HI6220_DEFAULT_SENSOR 2
@@ -52,6 +53,10 @@ struct hisi_thermal_sensor {
};
struct hisi_thermal_data {
+ int (*get_temp)(struct hisi_thermal_data *data);
+ int (*enable_sensor)(struct hisi_thermal_data *data);
+ int (*disable_sensor)(struct hisi_thermal_data *data);
+ int (*irq_handler)(struct hisi_thermal_data *data);
struct platform_device *pdev;
struct clk *clk;
struct hisi_thermal_sensor sensor;
@@ -59,6 +64,7 @@ struct hisi_thermal_data {
int irq;
};
+
/*
* The temperature computation on the tsensor is as follow:
* Unit: millidegree Celsius
@@ -192,7 +198,18 @@ static inline void hi6220_thermal_hdak_set(void __iomem *addr, int value)
(value << 4), addr + HI6220_TEMP0_CFG);
}
-static void hi6220_thermal_disable_sensor(struct hisi_thermal_data *data)
+static int hi6220_thermal_irq_handler(struct hisi_thermal_data *data)
+{
+ hi6220_thermal_alarm_clear(data->regs, 1);
+ return 0;
+}
+
+static int hi6220_thermal_get_temp(struct hisi_thermal_data *data)
+{
+ return hi6220_thermal_get_temperature(data->regs);
+}
+
+static int hi6220_thermal_disable_sensor(struct hisi_thermal_data *data)
{
/* disable sensor module */
hi6220_thermal_enable(data->regs, 0);
@@ -200,9 +217,9 @@ static void hi6220_thermal_disable_sensor(struct hisi_thermal_data *data)
hi6220_thermal_reset_enable(data->regs, 0);
clk_disable_unprepare(data->clk);
+ return 0;
}
-
static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data)
{
struct hisi_thermal_sensor *sensor = &data->sensor;
@@ -240,12 +257,50 @@ static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data)
return 0;
}
+
+static int hi6220_thermal_probe(struct hisi_thermal_data *data)
+{
+ struct platform_device *pdev = data->pdev;
+ struct device *dev = &pdev->dev;
+ struct resource *res;
+ int ret;
+
+ data->get_temp = hi6220_thermal_get_temp;
+ data->enable_sensor = hi6220_thermal_enable_sensor;
+ data->disable_sensor = hi6220_thermal_disable_sensor;
+ data->irq_handler = hi6220_thermal_irq_handler;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ data->regs = devm_ioremap_resource(dev, res);
+ if (IS_ERR(data->regs)) {
+ dev_err(dev, "failed to get io address\n");
+ return PTR_ERR(data->regs);
+ }
+
+ data->clk = devm_clk_get(dev, "thermal_clk");
+ if (IS_ERR(data->clk)) {
+ ret = PTR_ERR(data->clk);
+ if (ret != -EPROBE_DEFER)
+ dev_err(dev, "failed to get thermal clk: %d\n", ret);
+ return ret;
+ }
+
+ data->irq = platform_get_irq(pdev, 0);
+ if (data->irq < 0)
+ return data->irq;
+
+ data->sensor.id = HI6220_DEFAULT_SENSOR;
+
+ return 0;
+}
+
+
static int hisi_thermal_get_temp(void *__data, int *temp)
{
struct hisi_thermal_data *data = __data;
struct hisi_thermal_sensor *sensor = &data->sensor;
- *temp = hi6220_thermal_get_temperature(data->regs);
+ *temp = data->get_temp(data);
dev_dbg(&data->pdev->dev, "id=%d, temp=%d, thres=%d\n",
sensor->id, *temp, sensor->thres_temp);
@@ -263,7 +318,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
struct hisi_thermal_sensor *sensor = &data->sensor;
int temp = 0;
- hi6220_thermal_alarm_clear(data->regs, 1);
+ data->irq_handler(data);
hisi_thermal_get_temp(data, &temp);
@@ -284,14 +339,11 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
static int hisi_thermal_register_sensor(struct platform_device *pdev,
struct hisi_thermal_data *data,
- struct hisi_thermal_sensor *sensor,
- int index)
+ struct hisi_thermal_sensor *sensor)
{
int ret, i;
const struct thermal_trip *trip;
- sensor->id = index;
-
sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev,
sensor->id, data,
&hisi_of_thermal_ops);
@@ -316,7 +368,7 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
}
static const struct of_device_id of_hisi_thermal_match[] = {
- { .compatible = "hisilicon,tsensor" },
+ { .compatible = "hisilicon,tsensor", .data = hi6220_thermal_probe },
{ /* end */ }
};
MODULE_DEVICE_TABLE(of, of_hisi_thermal_match);
@@ -333,58 +385,48 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor,
static int hisi_thermal_probe(struct platform_device *pdev)
{
struct hisi_thermal_data *data;
- struct resource *res;
+ int (*platform_probe)(struct hisi_thermal_data *);
+ struct device *dev = &pdev->dev;
int ret;
- data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+ data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
if (!data)
return -ENOMEM;
data->pdev = pdev;
+ platform_set_drvdata(pdev, data);
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- data->regs = devm_ioremap_resource(&pdev->dev, res);
- if (IS_ERR(data->regs)) {
- dev_err(&pdev->dev, "failed to get io address\n");
- return PTR_ERR(data->regs);
+ platform_probe = of_device_get_match_data(dev);
+ if (!platform_probe) {
+ dev_err(dev, "failed to get probe func\n");
+ return -EINVAL;
}
- data->irq = platform_get_irq(pdev, 0);
- if (data->irq < 0)
- return data->irq;
-
- platform_set_drvdata(pdev, data);
-
- data->clk = devm_clk_get(&pdev->dev, "thermal_clk");
- if (IS_ERR(data->clk)) {
- ret = PTR_ERR(data->clk);
- if (ret != -EPROBE_DEFER)
- dev_err(&pdev->dev,
- "failed to get thermal clk: %d\n", ret);
+ ret = platform_probe(data);
+ if (ret)
return ret;
- }
ret = hisi_thermal_register_sensor(pdev, data,
- &data->sensor,
- HI6220_DEFAULT_SENSOR);
+ &data->sensor);
if (ret) {
- dev_err(&pdev->dev, "failed to register thermal sensor: %d\n",
- ret);
+ dev_err(dev, "failed to register thermal sensor: %d\n", ret);
return ret;
}
- ret = hi6220_thermal_enable_sensor(data);
+ ret = data->enable_sensor(data);
if (ret) {
- dev_err(&pdev->dev, "Failed to setup the sensor: %d\n", ret);
+ dev_err(dev, "Failed to setup the sensor: %d\n", ret);
return ret;
}
- ret = devm_request_threaded_irq(&pdev->dev, data->irq, NULL,
- hisi_thermal_alarm_irq_thread,
- IRQF_ONESHOT, "hisi_thermal", data);
- if (ret < 0) {
- dev_err(&pdev->dev, "failed to request alarm irq: %d\n", ret);
- return ret;
+ if (data->irq) {
+ ret = devm_request_threaded_irq(dev, data->irq, NULL,
+ hisi_thermal_alarm_irq_thread,
+ IRQF_ONESHOT, "hisi_thermal", data);
+ if (ret < 0) {
+ dev_err(dev, "failed to request alarm irq: %d\n", ret);
+ return ret;
+ }
}
hisi_thermal_toggle_sensor(&data->sensor, true);
@@ -398,7 +440,8 @@ static int hisi_thermal_remove(struct platform_device *pdev)
struct hisi_thermal_sensor *sensor = &data->sensor;
hisi_thermal_toggle_sensor(sensor, false);
- hi6220_thermal_disable_sensor(data);
+
+ data->disable_sensor(data);
return 0;
}
@@ -408,7 +451,7 @@ static int hisi_thermal_suspend(struct device *dev)
{
struct hisi_thermal_data *data = dev_get_drvdata(dev);
- hi6220_thermal_disable_sensor(data);
+ data->disable_sensor(data);
return 0;
}
@@ -417,7 +460,7 @@ static int hisi_thermal_resume(struct device *dev)
{
struct hisi_thermal_data *data = dev_get_drvdata(dev);
- return hi6220_thermal_enable_sensor(data);
+ return data->enable_sensor(data);
}
#endif
--
2.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 6/9] thermal/drivers/hisi: add support for multi temp threshold
2017-09-22 9:42 [PATCH 0/9] add support for Hi3660 tsensor Tao Wang
` (4 preceding siblings ...)
2017-09-22 9:42 ` [PATCH 5/9] thermal/drivers/hisi: perpare to add support for other hisi platform Tao Wang
@ 2017-09-22 9:42 ` Tao Wang
2017-09-22 9:42 ` [PATCH 7/9] dt-bindings: Document the hi3660 thermal sensor binding Tao Wang
` (2 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tao Wang @ 2017-09-22 9:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Kevin Wangtao <kevin.wangtao@linaro.org>
tsensor may have multi alarm levels, so we can support
more trip point interrupt.
Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
---
drivers/thermal/hisi_thermal.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index f9d9fd6..718376b 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -46,10 +46,12 @@
#define HI6220_DEFAULT_SENSOR 2
+#define MAX_THRES_NUM 2
+
struct hisi_thermal_sensor {
struct thermal_zone_device *tzd;
uint32_t id;
- uint32_t thres_temp;
+ uint32_t thres_temp[MAX_THRES_NUM];
};
struct hisi_thermal_data {
@@ -244,7 +246,7 @@ static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data)
hi6220_thermal_set_lag(data->regs, HI6220_TEMP_LAG);
/* enable for interrupt */
- hi6220_thermal_alarm_set(data->regs, sensor->thres_temp);
+ hi6220_thermal_alarm_set(data->regs, sensor->thres_temp[0]);
hi6220_thermal_reset_set(data->regs, HI6220_TEMP_RESET);
@@ -303,7 +305,7 @@ static int hisi_thermal_get_temp(void *__data, int *temp)
*temp = data->get_temp(data);
dev_dbg(&data->pdev->dev, "id=%d, temp=%d, thres=%d\n",
- sensor->id, *temp, sensor->thres_temp);
+ sensor->id, *temp, sensor->thres_temp[0]);
return 0;
}
@@ -322,16 +324,16 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
hisi_thermal_get_temp(data, &temp);
- if (temp >= sensor->thres_temp) {
+ if (temp >= sensor->thres_temp[0]) {
dev_crit(&data->pdev->dev, "THERMAL ALARM: %d > %d\n",
- temp, sensor->thres_temp);
+ temp, sensor->thres_temp[0]);
thermal_zone_device_update(data->sensor.tzd,
THERMAL_EVENT_UNSPECIFIED);
} else {
dev_crit(&data->pdev->dev, "THERMAL ALARM stopped: %d < %d\n",
- temp, sensor->thres_temp);
+ temp, sensor->thres_temp[0]);
}
return IRQ_HANDLED;
@@ -341,7 +343,7 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
struct hisi_thermal_data *data,
struct hisi_thermal_sensor *sensor)
{
- int ret, i;
+ int ret, i, thres_idx = 0;
const struct thermal_trip *trip;
sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev,
@@ -359,8 +361,9 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
for (i = 0; i < of_thermal_get_ntrips(sensor->tzd); i++) {
if (trip[i].type == THERMAL_TRIP_PASSIVE) {
- sensor->thres_temp = trip[i].temperature;
- break;
+ sensor->thres_temp[thres_idx++] = trip[i].temperature;
+ if (thres_idx >= MAX_THRES_NUM)
+ break;
}
}
--
2.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 7/9] dt-bindings: Document the hi3660 thermal sensor binding
2017-09-22 9:42 [PATCH 0/9] add support for Hi3660 tsensor Tao Wang
` (5 preceding siblings ...)
2017-09-22 9:42 ` [PATCH 6/9] thermal/drivers/hisi: add support for multi temp threshold Tao Wang
@ 2017-09-22 9:42 ` Tao Wang
2017-10-03 21:59 ` Rob Herring
2017-09-22 9:42 ` [PATCH 8/9] thermal/drivers/hisi: add support for hi3660 SoC Tao Wang
2017-09-22 9:42 ` [PATCH 9/9] arm64: dts: register Hi3660's thermal sensor Tao Wang
8 siblings, 1 reply; 13+ messages in thread
From: Tao Wang @ 2017-09-22 9:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Kevin Wangtao <kevin.wangtao@linaro.org>
This adds documentation of device tree bindings for the
thermal sensor controller of hi3660 SoC.
Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
---
Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt b/Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt
index d48fc52..cef716a 100644
--- a/Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt
@@ -13,6 +13,7 @@
Example :
+for Hi6220:
tsensor: tsensor at 0,f7030700 {
compatible = "hisilicon,tsensor";
reg = <0x0 0xf7030700 0x0 0x1000>;
@@ -21,3 +22,11 @@ Example :
clock-names = "thermal_clk";
#thermal-sensor-cells = <1>;
}
+
+for Hi3660:
+ tsensor: tsensor at fff30000 {
+ compatible = "hisilicon,hi3660-tsensor";
+ reg = <0x0 0xfff30000 0x0 0x1000>;
+ interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
+ #thermal-sensor-cells = <1>;
+ };
--
2.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 8/9] thermal/drivers/hisi: add support for hi3660 SoC
2017-09-22 9:42 [PATCH 0/9] add support for Hi3660 tsensor Tao Wang
` (6 preceding siblings ...)
2017-09-22 9:42 ` [PATCH 7/9] dt-bindings: Document the hi3660 thermal sensor binding Tao Wang
@ 2017-09-22 9:42 ` Tao Wang
2017-09-22 9:42 ` [PATCH 9/9] arm64: dts: register Hi3660's thermal sensor Tao Wang
8 siblings, 0 replies; 13+ messages in thread
From: Tao Wang @ 2017-09-22 9:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Kevin Wangtao <kevin.wangtao@linaro.org>
This patch adds the support for thermal sensor of Hi3660 SoC.
Hi3660 tsensor support alarm interrupt and have three configurable
alarm thresholds, it also has a configurable hysteresis interval,
interrupt will be triggered when temperature rise above the alarm
threshold or fall below the hysteresis threshold.
Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
---
drivers/thermal/hisi_thermal.c | 146 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 145 insertions(+), 1 deletion(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index 718376b..133238a 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -39,12 +39,24 @@
#define HI6220_TEMP0_RST_MSK (0x1C)
#define HI6220_TEMP0_VALUE (0x28)
+#define HI3660_OFFSET(chan) ((chan) * 0x40)
+#define HI3660_TEMP(chan) (HI3660_OFFSET(chan) + 0x1C)
+#define HI3660_TH(chan) (HI3660_OFFSET(chan) + 0x20)
+#define HI3660_LAG(chan) (HI3660_OFFSET(chan) + 0x28)
+#define HI3660_INT_EN(chan) (HI3660_OFFSET(chan) + 0x2C)
+#define HI3660_INT_CLR(chan) (HI3660_OFFSET(chan) + 0x30)
+
#define HI6220_TEMP_BASE (-60000)
#define HI6220_TEMP_RESET (100000)
#define HI6220_TEMP_STEP (785)
#define HI6220_TEMP_LAG (3500)
+#define HI3660_TEMP_BASE (-63780)
+#define HI3660_TEMP_STEP (205)
+#define HI3660_TEMP_LAG (4000)
+
#define HI6220_DEFAULT_SENSOR 2
+#define HI3660_DEFAULT_SENSOR 1
#define MAX_THRES_NUM 2
@@ -96,6 +108,24 @@ static inline int hi6220_thermal_temp_to_step(int temp)
}
/*
+ * for Hi3660,
+ * Step: 189/922 (0.205)
+ * Temperature base: -63.780??C
+ *
+ * The register is programmed in temperature steps, every step is 205
+ * millidegree and begins at -63 780 m??C
+ */
+static inline int hi3660_thermal_step_to_temp(int step)
+{
+ return HI3660_TEMP_BASE + step * HI3660_TEMP_STEP;
+}
+
+static inline int hi3660_thermal_temp_to_step(int temp)
+{
+ return DIV_ROUND_UP(temp - HI3660_TEMP_BASE, HI3660_TEMP_STEP);
+}
+
+/*
* The lag register contains 5 bits encoding the temperature in steps.
*
* Each time the temperature crosses the threshold boundary, an
@@ -169,6 +199,45 @@ static inline int hi6220_thermal_get_temperature(void __iomem *addr)
}
/*
+ * [0:6] lag register
+ *
+ * The temperature is coded in steps, cf. HI3660_TEMP_STEP.
+ *
+ * Min : 0x00 : 0.0 ??C
+ * Max : 0x7F : 26.0 ??C
+ *
+ */
+static inline void hi3660_thermal_set_lag(void __iomem *addr,
+ int id, int value)
+{
+ writel(DIV_ROUND_UP(value, HI3660_TEMP_STEP) & 0x7F,
+ addr + HI3660_LAG(id));
+}
+
+static inline void hi3660_thermal_alarm_clear(void __iomem *addr,
+ int id, int value)
+{
+ writel(value, addr + HI3660_INT_CLR(id));
+}
+
+static inline void hi3660_thermal_alarm_enable(void __iomem *addr,
+ int id, int value)
+{
+ writel(value, addr + HI3660_INT_EN(id));
+}
+
+static inline void hi3660_thermal_alarm_set(void __iomem *addr,
+ int id, int value)
+{
+ writel(value, addr + HI3660_TH(id));
+}
+
+static inline int hi3660_thermal_get_temperature(void __iomem *addr, int id)
+{
+ return hi3660_thermal_step_to_temp(readl(addr + HI3660_TEMP(id)));
+}
+
+/*
* Temperature configuration register - Sensor selection
*
* Bits [19:12]
@@ -206,11 +275,22 @@ static int hi6220_thermal_irq_handler(struct hisi_thermal_data *data)
return 0;
}
+static int hi3660_thermal_irq_handler(struct hisi_thermal_data *data)
+{
+ hi3660_thermal_alarm_clear(data->regs, data->sensor.id, 1);
+ return 0;
+}
+
static int hi6220_thermal_get_temp(struct hisi_thermal_data *data)
{
return hi6220_thermal_get_temperature(data->regs);
}
+static int hi3660_thermal_get_temp(struct hisi_thermal_data *data)
+{
+ return hi3660_thermal_get_temperature(data->regs, data->sensor.id);
+}
+
static int hi6220_thermal_disable_sensor(struct hisi_thermal_data *data)
{
/* disable sensor module */
@@ -222,6 +302,13 @@ static int hi6220_thermal_disable_sensor(struct hisi_thermal_data *data)
return 0;
}
+static int hi3660_thermal_disable_sensor(struct hisi_thermal_data *data)
+{
+ /* disable sensor module */
+ hi3660_thermal_alarm_enable(data->regs, data->sensor.id, 0);
+ return 0;
+}
+
static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data)
{
struct hisi_thermal_sensor *sensor = &data->sensor;
@@ -260,6 +347,29 @@ static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data)
return 0;
}
+static int hi3660_thermal_enable_sensor(struct hisi_thermal_data *data)
+{
+ unsigned int value;
+ struct hisi_thermal_sensor *sensor = &data->sensor;
+
+ /* disable interrupt */
+ hi3660_thermal_alarm_enable(data->regs, sensor->id, 0);
+
+ /* setting lag value between current temp and the threshold */
+ hi3660_thermal_set_lag(data->regs, sensor->id, HI3660_TEMP_LAG);
+
+ /* set interrupt threshold */
+ value = hi3660_thermal_temp_to_step(sensor->thres_temp[0]);
+ value |= hi3660_thermal_temp_to_step(sensor->thres_temp[1]) << 10;
+ hi3660_thermal_alarm_set(data->regs, sensor->id, value);
+
+ /* enable interrupt */
+ hi3660_thermal_alarm_clear(data->regs, sensor->id, 1);
+ hi3660_thermal_alarm_enable(data->regs, sensor->id, 1);
+
+ return 0;
+}
+
static int hi6220_thermal_probe(struct hisi_thermal_data *data)
{
struct platform_device *pdev = data->pdev;
@@ -296,6 +406,33 @@ static int hi6220_thermal_probe(struct hisi_thermal_data *data)
return 0;
}
+static int hi3660_thermal_probe(struct hisi_thermal_data *data)
+{
+ struct platform_device *pdev = data->pdev;
+ struct device *dev = &pdev->dev;
+ struct resource *res;
+
+ data->get_temp = hi3660_thermal_get_temp;
+ data->enable_sensor = hi3660_thermal_enable_sensor;
+ data->disable_sensor = hi3660_thermal_disable_sensor;
+ data->irq_handler = hi3660_thermal_irq_handler;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ data->regs = devm_ioremap_resource(dev, res);
+ if (IS_ERR(data->regs)) {
+ dev_err(dev, "failed to get io address\n");
+ return PTR_ERR(data->regs);
+ }
+
+ data->irq = platform_get_irq(pdev, 0);
+ if (data->irq < 0)
+ return data->irq;
+
+ data->sensor.id = HI3660_DEFAULT_SENSOR;
+
+ return 0;
+}
+
static int hisi_thermal_get_temp(void *__data, int *temp)
{
@@ -371,7 +508,14 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
}
static const struct of_device_id of_hisi_thermal_match[] = {
- { .compatible = "hisilicon,tsensor", .data = hi6220_thermal_probe },
+ {
+ .compatible = "hisilicon,tsensor",
+ .data = hi6220_thermal_probe
+ },
+ {
+ .compatible = "hisilicon,hi3660-tsensor",
+ .data = hi3660_thermal_probe
+ },
{ /* end */ }
};
MODULE_DEVICE_TABLE(of, of_hisi_thermal_match);
--
2.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 9/9] arm64: dts: register Hi3660's thermal sensor
2017-09-22 9:42 [PATCH 0/9] add support for Hi3660 tsensor Tao Wang
` (7 preceding siblings ...)
2017-09-22 9:42 ` [PATCH 8/9] thermal/drivers/hisi: add support for hi3660 SoC Tao Wang
@ 2017-09-22 9:42 ` Tao Wang
2017-10-02 19:06 ` Daniel Lezcano
8 siblings, 1 reply; 13+ messages in thread
From: Tao Wang @ 2017-09-22 9:42 UTC (permalink / raw)
To: linux-arm-kernel
From: Kevin Wangtao <kevin.wangtao@linaro.org>
add binding for tsensor on H3660, this tsensor is used for
SoC thermal control, it supports alarm interrupt.
Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
---
arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index b7a90d6..ae90991 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -978,5 +978,13 @@
clocks = <&crg_ctrl HI3660_OSC32K>;
clock-names = "apb_pclk";
};
+
+ tsensor: tsensor at fff30000 {
+ compatible = "hisilicon,hi3660-tsensor";
+ reg = <0x0 0xfff30000 0x0 0x1000>;
+ interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
+ #thermal-sensor-cells = <1>;
+ };
+
};
};
--
2.8.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 9/9] arm64: dts: register Hi3660's thermal sensor
2017-09-22 9:42 ` [PATCH 9/9] arm64: dts: register Hi3660's thermal sensor Tao Wang
@ 2017-10-02 19:06 ` Daniel Lezcano
2017-10-09 2:38 ` Wangtao (Kevin, Kirin)
0 siblings, 1 reply; 13+ messages in thread
From: Daniel Lezcano @ 2017-10-02 19:06 UTC (permalink / raw)
To: linux-arm-kernel
On 22/09/2017 11:42, Tao Wang wrote:
> From: Kevin Wangtao <kevin.wangtao@linaro.org>
>
> add binding for tsensor on H3660, this tsensor is used for
> SoC thermal control, it supports alarm interrupt.
>
> Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
I'm not able to apply this patch. Does it rely on another patch?
> ---
> arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
> index b7a90d6..ae90991 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
> +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
> @@ -978,5 +978,13 @@
> clocks = <&crg_ctrl HI3660_OSC32K>;
> clock-names = "apb_pclk";
> };
> +
> + tsensor: tsensor at fff30000 {
> + compatible = "hisilicon,hi3660-tsensor";
> + reg = <0x0 0xfff30000 0x0 0x1000>;
> + interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
> + #thermal-sensor-cells = <1>;
> + };
> +
> };
> };
>
--
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 9/9] arm64: dts: register Hi3660's thermal sensor
2017-10-02 19:06 ` Daniel Lezcano
@ 2017-10-09 2:38 ` Wangtao (Kevin, Kirin)
0 siblings, 0 replies; 13+ messages in thread
From: Wangtao (Kevin, Kirin) @ 2017-10-09 2:38 UTC (permalink / raw)
To: linux-arm-kernel
on 2017/10/3 3:06, Daniel Lezcano wrote:
> On 22/09/2017 11:42, Tao Wang wrote:
>> From: Kevin Wangtao <kevin.wangtao@linaro.org>
>>
>> add binding for tsensor on H3660, this tsensor is used for
>> SoC thermal control, it supports alarm interrupt.
>>
>> Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
>
> I'm not able to apply this patch. Does it rely on another patch?
No, This patch is based on linux-next
>
>> ---
>> arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 8 ++++++++
>> 1 file changed, 8 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
>> index b7a90d6..ae90991 100644
>> --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
>> +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
>> @@ -978,5 +978,13 @@
>> clocks = <&crg_ctrl HI3660_OSC32K>;
>> clock-names = "apb_pclk";
>> };
>> +
>> + tsensor: tsensor at fff30000 {
>> + compatible = "hisilicon,hi3660-tsensor";
>> + reg = <0x0 0xfff30000 0x0 0x1000>;
>> + interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
>> + #thermal-sensor-cells = <1>;
>> + };
>> +
>> };
>> };
>>
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread