3 files changed, 197 insertions, 55 deletions

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 514a691abea..3ab2bd540b5 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -23,6 +23,7 @@ config SPEAR_THERMAL
         bool "SPEAr thermal sensor driver"
         depends on THERMAL
         depends on PLAT_SPEAR
+        depends on OF
         help
           Enable this to plug the SPEAr thermal sensor driver into the Linux
           thermal framework
diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c
index c2e32df3b16..5f8ee39f200 100644
--- a/drivers/thermal/spear_thermal.c
+++ b/drivers/thermal/spear_thermal.c
@@ -20,9 +20,9 @@
 #include <linux/err.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
+#include <linux/of.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
-#include <linux/platform_data/spear_thermal.h>
 #include <linux/thermal.h>
 
 #define MD_FACTOR       1000
@@ -103,21 +103,20 @@ static int spear_thermal_probe(struct platform_device *pdev)
 {
         struct thermal_zone_device *spear_thermal = NULL;
         struct spear_thermal_dev *stdev;
-        struct spear_thermal_pdata *pdata;
-        int ret = 0;
+        struct device_node *np = pdev->dev.of_node;
         struct resource *stres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        int ret = 0, val;
+
+        if (!np || !of_property_read_u32(np, "st,thermal-flags", &val)) {
+                dev_err(&pdev->dev, "Failed: DT Pdata not passed\n");
+                return -EINVAL;
+        }
 
         if (!stres) {
                 dev_err(&pdev->dev, "memory resource missing\n");
                 return -ENODEV;
         }
 
-        pdata = dev_get_platdata(&pdev->dev);
-        if (!pdata) {
-                dev_err(&pdev->dev, "platform data is NULL\n");
-                return -EINVAL;
-        }
-
         stdev = devm_kzalloc(&pdev->dev, sizeof(*stdev), GFP_KERNEL);
         if (!stdev) {
                 dev_err(&pdev->dev, "kzalloc fail\n");
@@ -144,10 +143,10 @@ static int spear_thermal_probe(struct platform_device *pdev)
                 goto put_clk;
         }
 
-        stdev->flags = pdata->thermal_flags;
+        stdev->flags = val;
         writel_relaxed(stdev->flags, stdev->thermal_base);
 
-        spear_thermal = thermal_zone_device_register("spear_thermal", 0,
+        spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0,
                                 stdev, &ops, 0, 0, 0, 0);
         if (IS_ERR(spear_thermal)) {
                 dev_err(&pdev->dev, "thermal zone device is NULL\n");
@@ -189,6 +188,12 @@ static int spear_thermal_exit(struct platform_device *pdev)
         return 0;
 }
 
+static const struct of_device_id spear_thermal_id_table[] = {
+        { .compatible = "st,thermal-spear1340" },
+        {}
+};
+MODULE_DEVICE_TABLE(of, spear_thermal_id_table);
+
 static struct platform_driver spear_thermal_driver = {
         .probe = spear_thermal_probe,
         .remove = spear_thermal_exit,
@@ -196,6 +201,7 @@ static struct platform_driver spear_thermal_driver = {
                 .name = "spear_thermal",
                 .owner = THIS_MODULE,
                 .pm = &spear_thermal_pm_ops,
+                .of_match_table = of_match_ptr(spear_thermal_id_table),
         },
 };
 
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c
index 022bacb71a7..2d7a9fe8f36 100644
--- a/drivers/thermal/thermal_sys.c
+++ b/drivers/thermal/thermal_sys.c
@@ -196,6 +196,28 @@ trip_point_type_show(struct device *dev, struct device_attribute *attr,
 }
 
 static ssize_t
+trip_point_temp_store(struct device *dev, struct device_attribute *attr,
+                     const char *buf, size_t count)
+{
+        struct thermal_zone_device *tz = to_thermal_zone(dev);
+        int trip, ret;
+        unsigned long temperature;
+
+        if (!tz->ops->set_trip_temp)
+                return -EPERM;
+
+        if (!sscanf(attr->attr.name, "trip_point_%d_temp", &trip))
+                return -EINVAL;
+
+        if (kstrtoul(buf, 10, &temperature))
+                return -EINVAL;
+
+        ret = tz->ops->set_trip_temp(tz, trip, temperature);
+
+        return ret ? ret : count;
+}
+
+static ssize_t
 trip_point_temp_show(struct device *dev, struct device_attribute *attr,
                      char *buf)
 {
@@ -218,6 +240,52 @@ trip_point_temp_show(struct device *dev, struct device_attribute *attr,
 }
 
 static ssize_t
+trip_point_hyst_store(struct device *dev, struct device_attribute *attr,
+                        const char *buf, size_t count)
+{
+        struct thermal_zone_device *tz = to_thermal_zone(dev);
+        int trip, ret;
+        unsigned long temperature;
+
+        if (!tz->ops->set_trip_hyst)
+                return -EPERM;
+
+        if (!sscanf(attr->attr.name, "trip_point_%d_hyst", &trip))
+                return -EINVAL;
+
+        if (kstrtoul(buf, 10, &temperature))
+                return -EINVAL;
+
+        /*
+         * We are not doing any check on the 'temperature' value
+         * here. The driver implementing 'set_trip_hyst' has to
+         * take care of this.
+         */
+        ret = tz->ops->set_trip_hyst(tz, trip, temperature);
+
+        return ret ? ret : count;
+}
+
+static ssize_t
+trip_point_hyst_show(struct device *dev, struct device_attribute *attr,
+                        char *buf)
+{
+        struct thermal_zone_device *tz = to_thermal_zone(dev);
+        int trip, ret;
+        unsigned long temperature;
+
+        if (!tz->ops->get_trip_hyst)
+                return -EPERM;
+
+        if (!sscanf(attr->attr.name, "trip_point_%d_hyst", &trip))
+                return -EINVAL;
+
+        ret = tz->ops->get_trip_hyst(tz, trip, &temperature);
+
+        return ret ? ret : sprintf(buf, "%ld\n", temperature);
+}
+
+static ssize_t
 passive_store(struct device *dev, struct device_attribute *attr,
                     const char *buf, size_t count)
 {
@@ -283,33 +351,6 @@ static DEVICE_ATTR(temp, 0444, temp_show, NULL);
 static DEVICE_ATTR(mode, 0644, mode_show, mode_store);
 static DEVICE_ATTR(passive, S_IRUGO | S_IWUSR, passive_show, passive_store);
 
-static struct device_attribute trip_point_attrs[] = {
-        __ATTR(trip_point_0_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_0_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_1_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_1_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_2_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_2_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_3_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_3_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_4_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_4_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_5_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_5_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_6_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_6_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_7_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_7_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_8_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_8_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_9_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_9_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_10_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_10_temp, 0444, trip_point_temp_show, NULL),
-        __ATTR(trip_point_11_type, 0444, trip_point_type_show, NULL),
-        __ATTR(trip_point_11_temp, 0444, trip_point_temp_show, NULL),
-};
-
 /* sys I/F for cooling device */
 #define to_cooling_device(_dev) \
         container_of(_dev, struct thermal_cooling_device, device)
@@ -1089,9 +1130,113 @@ leave:
 EXPORT_SYMBOL(thermal_zone_device_update);
 
 /**
+ * create_trip_attrs - create attributes for trip points
+ * @tz:         the thermal zone device
+ * @mask:       Writeable trip point bitmap.
+ */
+static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
+{
+        int indx;
+        int size = sizeof(struct thermal_attr) * tz->trips;
+
+        tz->trip_type_attrs = kzalloc(size, GFP_KERNEL);
+        if (!tz->trip_type_attrs)
+                return -ENOMEM;
+
+        tz->trip_temp_attrs = kzalloc(size, GFP_KERNEL);
+        if (!tz->trip_temp_attrs) {
+                kfree(tz->trip_type_attrs);
+                return -ENOMEM;
+        }
+
+        if (tz->ops->get_trip_hyst) {
+                tz->trip_hyst_attrs = kzalloc(size, GFP_KERNEL);
+                if (!tz->trip_hyst_attrs) {
+                        kfree(tz->trip_type_attrs);
+                        kfree(tz->trip_temp_attrs);
+                        return -ENOMEM;
+                }
+        }
+
+
+        for (indx = 0; indx < tz->trips; indx++) {
+                /* create trip type attribute */
+                snprintf(tz->trip_type_attrs[indx].name, THERMAL_NAME_LENGTH,
+                         "trip_point_%d_type", indx);
+
+                sysfs_attr_init(&tz->trip_type_attrs[indx].attr.attr);
+                tz->trip_type_attrs[indx].attr.attr.name =
+                                                tz->trip_type_attrs[indx].name;
+                tz->trip_type_attrs[indx].attr.attr.mode = S_IRUGO;
+                tz->trip_type_attrs[indx].attr.show = trip_point_type_show;
+
+                device_create_file(&tz->device,
+                                   &tz->trip_type_attrs[indx].attr);
+
+                /* create trip temp attribute */
+                snprintf(tz->trip_temp_attrs[indx].name, THERMAL_NAME_LENGTH,
+                         "trip_point_%d_temp", indx);
+
+                sysfs_attr_init(&tz->trip_temp_attrs[indx].attr.attr);
+                tz->trip_temp_attrs[indx].attr.attr.name =
+                                                tz->trip_temp_attrs[indx].name;
+                tz->trip_temp_attrs[indx].attr.attr.mode = S_IRUGO;
+                tz->trip_temp_attrs[indx].attr.show = trip_point_temp_show;
+                if (mask & (1 << indx)) {
+                        tz->trip_temp_attrs[indx].attr.attr.mode |= S_IWUSR;
+                        tz->trip_temp_attrs[indx].attr.store =
+                                                        trip_point_temp_store;
+                }
+
+                device_create_file(&tz->device,
+                                   &tz->trip_temp_attrs[indx].attr);
+
+                /* create Optional trip hyst attribute */
+                if (!tz->ops->get_trip_hyst)
+                        continue;
+                snprintf(tz->trip_hyst_attrs[indx].name, THERMAL_NAME_LENGTH,
+                         "trip_point_%d_hyst", indx);
+
+                sysfs_attr_init(&tz->trip_hyst_attrs[indx].attr.attr);
+                tz->trip_hyst_attrs[indx].attr.attr.name =
+                                        tz->trip_hyst_attrs[indx].name;
+                tz->trip_hyst_attrs[indx].attr.attr.mode = S_IRUGO;
+                tz->trip_hyst_attrs[indx].attr.show = trip_point_hyst_show;
+                if (tz->ops->set_trip_hyst) {
+                        tz->trip_hyst_attrs[indx].attr.attr.mode |= S_IWUSR;
+                        tz->trip_hyst_attrs[indx].attr.store =
+                                        trip_point_hyst_store;
+                }
+
+                device_create_file(&tz->device,
+                                   &tz->trip_hyst_attrs[indx].attr);
+        }
+        return 0;
+}
+
+static void remove_trip_attrs(struct thermal_zone_device *tz)
+{
+        int indx;
+
+        for (indx = 0; indx < tz->trips; indx++) {
+                device_remove_file(&tz->device,
+                                   &tz->trip_type_attrs[indx].attr);
+                device_remove_file(&tz->device,
+                                   &tz->trip_temp_attrs[indx].attr);
+                if (tz->ops->get_trip_hyst)
+                        device_remove_file(&tz->device,
+                                  &tz->trip_hyst_attrs[indx].attr);
+        }
+        kfree(tz->trip_type_attrs);
+        kfree(tz->trip_temp_attrs);
+        kfree(tz->trip_hyst_attrs);
+}
+
+/**
  * thermal_zone_device_register - register a new thermal zone device
  * @type:       the thermal zone device type
  * @trips:      the number of trip points the thermal zone support
+ * @mask:       a bit string indicating the writeablility of trip points
  * @devdata:    private device data
  * @ops:        standard thermal zone device callbacks
  * @tc1:        thermal coefficient 1 for passive calculations
@@ -1107,7 +1252,7 @@ EXPORT_SYMBOL(thermal_zone_device_update);
  * section 11.1.5.1 of the ACPI specification 3.0.
  */
 struct thermal_zone_device *thermal_zone_device_register(char *type,
-        int trips, void *devdata,
+        int trips, int mask, void *devdata,
         const struct thermal_zone_device_ops *ops,
         int tc1, int tc2, int passive_delay, int polling_delay)
 {
@@ -1121,7 +1266,7 @@ struct thermal_zone_device *thermal_zone_device_register(char *type,
         if (strlen(type) >= THERMAL_NAME_LENGTH)
                 return ERR_PTR(-EINVAL);
 
-        if (trips > THERMAL_MAX_TRIPS || trips < 0)
+        if (trips > THERMAL_MAX_TRIPS || trips < 0 || mask >> trips)
                 return ERR_PTR(-EINVAL);
 
         if (!ops || !ops->get_temp)
@@ -1175,15 +1320,11 @@ struct thermal_zone_device *thermal_zone_device_register(char *type,
                         goto unregister;
         }
 
+        result = create_trip_attrs(tz, mask);
+        if (result)
+                goto unregister;
+
         for (count = 0; count < trips; count++) {
-                result = device_create_file(&tz->device,
-                                            &trip_point_attrs[count * 2]);
-                if (result)
-                        break;
-                result = device_create_file(&tz->device,
-                                            &trip_point_attrs[count * 2 + 1]);
-                if (result)
-                        goto unregister;
                 tz->ops->get_trip_type(tz, count, &trip_type);
                 if (trip_type == THERMAL_TRIP_PASSIVE)
                         passive = 1;
@@ -1232,7 +1373,6 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
 {
         struct thermal_cooling_device *cdev;
         struct thermal_zone_device *pos = NULL;
-        int count;
 
         if (!tz)
                 return;
@@ -1259,13 +1399,8 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
         device_remove_file(&tz->device, &dev_attr_temp);
         if (tz->ops->get_mode)
                 device_remove_file(&tz->device, &dev_attr_mode);
+        remove_trip_attrs(tz);
 
-        for (count = 0; count < tz->trips; count++) {
-                device_remove_file(&tz->device,
-                                   &trip_point_attrs[count * 2]);
-                device_remove_file(&tz->device,
-                                   &trip_point_attrs[count * 2 + 1]);
-        }
         thermal_remove_hwmon_sysfs(tz);
         release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
         idr_destroy(&tz->idr);