[PATCH 5/9] thermal/drivers/hisi: perpare to add support for other hisi platform

[Tao Wang]

From: Kevin Wangtao 

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 
---
 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 
 #include 
 #include 
+#include 
 
 #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   (-6)
 #define HI6220_TEMP_RESET  (10)
 #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 = >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 = >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 = >sensor;
 
-   *temp = hi6220_thermal_get_temperature(data->regs);
+   *temp = data->get_temp(data);
 
dev_dbg(>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, 

[PATCH 5/9] thermal/drivers/hisi: perpare to add support for other hisi platform

[Tao Wang]

From: Kevin Wangtao 

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 
---
 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 
 #include 
 #include 
+#include 
 
 #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   (-6)
 #define HI6220_TEMP_RESET  (10)
 #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 = >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 = >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 = >sensor;
 
-   *temp = hi6220_thermal_get_temperature(data->regs);
+   *temp = data->get_temp(data);
 
dev_dbg(>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