24 files changed, 17 insertions, 22 deletions

diff --git a/drivers/staging/ti-soc-thermal/ti_soc_thermal.txt b/Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
index a4a33d1a0746..a4a33d1a0746 100644
--- a/drivers/staging/ti-soc-thermal/ti_soc_thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt
diff --git a/MAINTAINERS b/MAINTAINERS
index 3d7782b9f90d..311fb4512826 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8056,8 +8056,8 @@ F:	drivers/platform/x86/thinkpad_acpi.c
 TI BANDGAP AND THERMAL DRIVER
 M:      Eduardo Valentin <eduardo.valentin@ti.com>
 L:      linux-pm@vger.kernel.org
-S:      Maintained
-F:      drivers/staging/omap-thermal/
+S:      Supported
+F:      drivers/thermal/ti-soc-thermal/
 
 TI FLASH MEDIA INTERFACE DRIVER
 M:      Alex Dubov <oakad@yahoo.com>
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 4e8a1794f50a..79701de74855 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -118,8 +118,6 @@ source "drivers/staging/gdm72xx/Kconfig"
 
 source "drivers/staging/csr/Kconfig"
 
-source "drivers/staging/ti-soc-thermal/Kconfig"
-
 source "drivers/staging/silicom/Kconfig"
 
 source "drivers/staging/ced1401/Kconfig"
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 415772ea306d..f8b740c4ea7e 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -52,7 +52,6 @@ obj-$(CONFIG_ANDROID)		+= android/
 obj-$(CONFIG_USB_WPAN_HCD)      += ozwpan/
 obj-$(CONFIG_WIMAX_GDM72XX)     += gdm72xx/
 obj-$(CONFIG_CSR_WIFI)          += csr/
-obj-$(CONFIG_TI_SOC_THERMAL)    += ti-soc-thermal/
 obj-$(CONFIG_NET_VENDOR_SILICOM)        += silicom/
 obj-$(CONFIG_CED1401)           += ced1401/
 obj-$(CONFIG_DRM_IMX)           += imx-drm/
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 5e3c02554d99..7205c70a46a3 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -169,4 +169,7 @@ config INTEL_POWERCLAMP
           enforce idle time which results in more package C-state residency. The
           user interface is exposed via generic thermal framework.
 
+menu "Texas Instruments thermal drivers"
+source "drivers/thermal/ti-soc-thermal/Kconfig"
+endmenu
 endif
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index c054d410ac3f..85693941fda0 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -23,4 +23,4 @@ obj-$(CONFIG_DB8500_THERMAL)	+= db8500_thermal.o
 obj-$(CONFIG_ARMADA_THERMAL)    += armada_thermal.o
 obj-$(CONFIG_DB8500_CPUFREQ_COOLING)    += db8500_cpufreq_cooling.o
 obj-$(CONFIG_INTEL_POWERCLAMP)  += intel_powerclamp.o
-
+obj-$(CONFIG_TI_SOC_THERMAL)    += ti-soc-thermal/
diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index 54ffd64ca3f7..5e53212b984f 100644
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -200,7 +200,6 @@ static int armada_thermal_exit(struct platform_device *pdev)
                 platform_get_drvdata(pdev);
 
         thermal_zone_device_unregister(armada_thermal);
-        platform_set_drvdata(pdev, NULL);
 
         return 0;
 }
@@ -211,7 +210,7 @@ static struct platform_driver armada_thermal_driver = {
         .driver = {
                 .name = "armada_thermal",
                 .owner = THIS_MODULE,
-                .of_match_table = of_match_ptr(armada_thermal_id_table),
+                .of_match_table = armada_thermal_id_table,
         },
 };
 
diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c
index 8bf104d8a649..828f5e345c30 100644
--- a/drivers/thermal/dove_thermal.c
+++ b/drivers/thermal/dove_thermal.c
@@ -173,7 +173,6 @@ static int dove_thermal_exit(struct platform_device *pdev)
                 platform_get_drvdata(pdev);
 
         thermal_zone_device_unregister(dove_thermal);
-        platform_set_drvdata(pdev, NULL);
 
         return 0;
 }
@@ -186,7 +185,7 @@ static struct platform_driver dove_thermal_driver = {
         .driver = {
                 .name = "dove_thermal",
                 .owner = THIS_MODULE,
-                .of_match_table = of_match_ptr(dove_thermal_id_table),
+                .of_match_table = dove_thermal_id_table,
         },
 };
 
diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c
index 788b1ddcac6c..03e4bbc08bf0 100644
--- a/drivers/thermal/exynos_thermal.c
+++ b/drivers/thermal/exynos_thermal.c
@@ -996,7 +996,6 @@ static int exynos_tmu_probe(struct platform_device *pdev)
 
         return 0;
 err_clk:
-        platform_set_drvdata(pdev, NULL);
         clk_unprepare(data->clk);
         return ret;
 }
@@ -1011,8 +1010,6 @@ static int exynos_tmu_remove(struct platform_device *pdev)
 
         clk_unprepare(data->clk);
 
-        platform_set_drvdata(pdev, NULL);
-
         return 0;
 }
 
diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c
index 9e4d98eef17a..3b034a0dfc94 100644
--- a/drivers/thermal/kirkwood_thermal.c
+++ b/drivers/thermal/kirkwood_thermal.c
@@ -103,7 +103,6 @@ static int kirkwood_thermal_exit(struct platform_device *pdev)
                 platform_get_drvdata(pdev);
 
         thermal_zone_device_unregister(kirkwood_thermal);
-        platform_set_drvdata(pdev, NULL);
 
         return 0;
 }
@@ -116,7 +115,7 @@ static struct platform_driver kirkwood_thermal_driver = {
         .driver = {
                 .name = "kirkwood_thermal",
                 .owner = THIS_MODULE,
-                .of_match_table = of_match_ptr(kirkwood_thermal_id_table),
+                .of_match_table = kirkwood_thermal_id_table,
         },
 };
 
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 72f50bc0456c..88f92e1a9944 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -454,7 +454,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, common);
 
-        dev_info(dev, "%d sensor proved\n", i);
+        dev_info(dev, "%d sensor probed\n", i);
 
         return 0;
 
@@ -483,8 +483,6 @@ static int rcar_thermal_remove(struct platform_device *pdev)
                         rcar_thermal_irq_disable(priv);
         }
 
-        platform_set_drvdata(pdev, NULL);
-
         pm_runtime_put_sync(dev);
         pm_runtime_disable(dev);
 
diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c
index 0f37c7279c96..ab79ea4701d9 100644
--- a/drivers/thermal/spear_thermal.c
+++ b/drivers/thermal/spear_thermal.c
@@ -167,7 +167,6 @@ static int spear_thermal_exit(struct platform_device *pdev)
         struct spear_thermal_dev *stdev = spear_thermal->devdata;
 
         thermal_zone_device_unregister(spear_thermal);
-        platform_set_drvdata(pdev, NULL);
 
         /* Disable SPEAr Thermal Sensor */
         actual_mask = readl_relaxed(stdev->thermal_base);
@@ -191,7 +190,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),
+                .of_match_table = spear_thermal_id_table,
         },
 };
 
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index d755440791b7..e56ded5984b5 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -33,6 +33,7 @@
 #include <linux/idr.h>
 #include <linux/thermal.h>
 #include <linux/reboot.h>
+#include <linux/string.h>
 #include <net/netlink.h>
 #include <net/genetlink.h>
 
@@ -713,10 +714,13 @@ policy_store(struct device *dev, struct device_attribute *attr,
         int ret = -EINVAL;
         struct thermal_zone_device *tz = to_thermal_zone(dev);
         struct thermal_governor *gov;
+        char name[THERMAL_NAME_LENGTH];
+
+        snprintf(name, sizeof(name), "%s", buf);
 
         mutex_lock(&thermal_governor_lock);
 
-        gov = __find_governor(buf);
+        gov = __find_governor(strim(name));
         if (!gov)
                 goto exit;
 
@@ -1624,7 +1628,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
         if (!ops || !ops->get_temp)
                 return ERR_PTR(-EINVAL);
 
-        if (trips > 0 && !ops->get_trip_type)
+        if (trips > 0 && (!ops->get_trip_type || !ops->get_trip_temp))
                 return ERR_PTR(-EINVAL);
 
         tz = kzalloc(sizeof(struct thermal_zone_device), GFP_KERNEL);
diff --git a/drivers/staging/ti-soc-thermal/Kconfig b/drivers/thermal/ti-soc-thermal/Kconfig
index e81375fb2155..e81375fb2155 100644
--- a/drivers/staging/ti-soc-thermal/Kconfig
+++ b/drivers/thermal/ti-soc-thermal/Kconfig
diff --git a/drivers/staging/ti-soc-thermal/Makefile b/drivers/thermal/ti-soc-thermal/Makefile
index 0ca034fb419d..0ca034fb419d 100644
--- a/drivers/staging/ti-soc-thermal/Makefile
+++ b/drivers/thermal/ti-soc-thermal/Makefile
diff --git a/drivers/staging/ti-soc-thermal/TODO b/drivers/thermal/ti-soc-thermal/TODO
index 7da787d19241..7da787d19241 100644
--- a/drivers/staging/ti-soc-thermal/TODO
+++ b/drivers/thermal/ti-soc-thermal/TODO
diff --git a/drivers/staging/ti-soc-thermal/omap4-thermal-data.c b/drivers/thermal/ti-soc-thermal/omap4-thermal-data.c
index d255d33da9eb..d255d33da9eb 100644
--- a/drivers/staging/ti-soc-thermal/omap4-thermal-data.c
+++ b/drivers/thermal/ti-soc-thermal/omap4-thermal-data.c
diff --git a/drivers/staging/ti-soc-thermal/omap4xxx-bandgap.h b/drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h
index 6f2de3a3356d..6f2de3a3356d 100644
--- a/drivers/staging/ti-soc-thermal/omap4xxx-bandgap.h
+++ b/drivers/thermal/ti-soc-thermal/omap4xxx-bandgap.h
diff --git a/drivers/staging/ti-soc-thermal/omap5-thermal-data.c b/drivers/thermal/ti-soc-thermal/omap5-thermal-data.c
index eff0c80fd4af..eff0c80fd4af 100644
--- a/drivers/staging/ti-soc-thermal/omap5-thermal-data.c
+++ b/drivers/thermal/ti-soc-thermal/omap5-thermal-data.c
diff --git a/drivers/staging/ti-soc-thermal/omap5xxx-bandgap.h b/drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h
index 400b55dffadd..400b55dffadd 100644
--- a/drivers/staging/ti-soc-thermal/omap5xxx-bandgap.h
+++ b/drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h
diff --git a/drivers/staging/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
index f20c1cfe9800..f20c1cfe9800 100644
--- a/drivers/staging/ti-soc-thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
diff --git a/drivers/staging/ti-soc-thermal/ti-bandgap.h b/drivers/thermal/ti-soc-thermal/ti-bandgap.h
index 5f4794abf583..5f4794abf583 100644
--- a/drivers/staging/ti-soc-thermal/ti-bandgap.h
+++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.h
diff --git a/drivers/staging/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
index e3c5e677eaa5..e3c5e677eaa5 100644
--- a/drivers/staging/ti-soc-thermal/ti-thermal-common.c
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
diff --git a/drivers/staging/ti-soc-thermal/ti-thermal.h b/drivers/thermal/ti-soc-thermal/ti-thermal.h
index 5055777727cc..5055777727cc 100644
--- a/drivers/staging/ti-soc-thermal/ti-thermal.h
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal.h