Skip to contentSkip to conversation

thermal: EXYNOS: always register TMU driver with core thermal framework

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 3 messages Oct 4, 2013 – Nov 26, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 thermal: EXYNOS: always register TMU driver with core thermal framework

There is little sense in having separate config option for registering EXYNOS TMU driver with the core thermal framework. Fix it by integrating EXYNOS_THERMAL_CORE config option with EXYNOS_THERMAL one.

---
 drivers/thermal/samsung/Kconfig                 | 14 +++-----------
 drivers/thermal/samsung/Makefile                |  2 +-
 drivers/thermal/samsung/exynos_thermal_common.h | 12 ------------
 3 files changed, 4 insertions(+), 24 deletions(-)
drivers/thermal/samsung/Kconfig +3 -11
index f760389..04eabee 100644
@@ -5,14 +5,6 @@ config EXYNOS_THERMAL
 	  If you say yes here you get support for the TMU (Thermal Management
 	  Unit) driver for SAMSUNG EXYNOS series of SoCs. This driver initialises
 	  the TMU, reports temperature and handles cooling action if defined.
-	  This driver uses the Exynos core thermal APIs and TMU configuration
-	  data from the supported SoCs.
-
-config EXYNOS_THERMAL_CORE
-	bool "Core thermal framework support for EXYNOS SOCs"
-	depends on EXYNOS_THERMAL
-	help
-	  If you say yes here you get support for EXYNOS TMU
-	  (Thermal Management Unit) common registration/unregistration
-	  functions to the core thermal layer and also to use the generic
-	  CPU cooling APIs.
+	  This driver uses the Exynos core thermal APIs, TMU configuration data
+	  from the supported SoCs, common registration/unregistration functions
+	  to the core thermal layer and also the generic CPU cooling APIs.
drivers/thermal/samsung/Makefile +1 -1
index c09d830..a829107 100644
@@ -4,4 +4,4 @@
 obj-$(CONFIG_EXYNOS_THERMAL)			+= exynos_thermal.o
 exynos_thermal-y				:= exynos_tmu.o
 exynos_thermal-y				+= exynos_tmu_data.o
-exynos_thermal-$(CONFIG_EXYNOS_THERMAL_CORE)	+= exynos_thermal_common.o
+exynos_thermal-y				+= exynos_thermal_common.o
drivers/thermal/samsung/exynos_thermal_common.h +0 -12
index 3eb2ed9..8681679 100644
@@ -88,20 +88,8 @@ struct thermal_sensor_conf {
 	struct device *dev;
 };
 
-/*Functions used exynos based thermal sensor driver*/
-#ifdef CONFIG_EXYNOS_THERMAL_CORE
 void exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf);
 int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf);
 void exynos_report_trigger(struct thermal_sensor_conf *sensor_conf);
-#else
-static inline void
-exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf) { return; }
 
-static inline int
-exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) { return 0; }
-
-static inline void
-exynos_report_trigger(struct thermal_sensor_conf *sensor_conf) { return; }
-
-#endif /* CONFIG_EXYNOS_THERMAL_CORE */
 #endif /* _EXYNOS_THERMAL_COMMON_H */
Signature · 1 line
1.8.2.3
#1 lore raw

Hi,

Could you please also apply this patch?

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

Quoted 70 lines · Bartlomiej Zolnierkiewicz

There is little sense in having separate config option for registering EXYNOS TMU driver with the core thermal framework. Fix it by integrating EXYNOS_THERMAL_CORE config option with EXYNOS_THERMAL one.

---
 drivers/thermal/samsung/Kconfig                 | 14 +++-----------
 drivers/thermal/samsung/Makefile                |  2 +-
 drivers/thermal/samsung/exynos_thermal_common.h | 12 ------------
 3 files changed, 4 insertions(+), 24 deletions(-)
drivers/thermal/samsung/Kconfig +3 -11
index f760389..04eabee 100644
@@ -5,14 +5,6 @@ config EXYNOS_THERMAL
 	  If you say yes here you get support for the TMU (Thermal Management
 	  Unit) driver for SAMSUNG EXYNOS series of SoCs. This driver initialises
 	  the TMU, reports temperature and handles cooling action if defined.
-	  This driver uses the Exynos core thermal APIs and TMU configuration
-	  data from the supported SoCs.
-
-config EXYNOS_THERMAL_CORE
-	bool "Core thermal framework support for EXYNOS SOCs"
-	depends on EXYNOS_THERMAL
-	help
-	  If you say yes here you get support for EXYNOS TMU
-	  (Thermal Management Unit) common registration/unregistration
-	  functions to the core thermal layer and also to use the generic
-	  CPU cooling APIs.
+	  This driver uses the Exynos core thermal APIs, TMU configuration data
+	  from the supported SoCs, common registration/unregistration functions
+	  to the core thermal layer and also the generic CPU cooling APIs.
drivers/thermal/samsung/Makefile +1 -1
index c09d830..a829107 100644
@@ -4,4 +4,4 @@
 obj-$(CONFIG_EXYNOS_THERMAL)			+= exynos_thermal.o
 exynos_thermal-y				:= exynos_tmu.o
 exynos_thermal-y				+= exynos_tmu_data.o
-exynos_thermal-$(CONFIG_EXYNOS_THERMAL_CORE)	+= exynos_thermal_common.o
+exynos_thermal-y				+= exynos_thermal_common.o
drivers/thermal/samsung/exynos_thermal_common.h +0 -12
index 3eb2ed9..8681679 100644
@@ -88,20 +88,8 @@ struct thermal_sensor_conf {
 	struct device *dev;
 };
 
-/*Functions used exynos based thermal sensor driver*/
-#ifdef CONFIG_EXYNOS_THERMAL_CORE
 void exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf);
 int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf);
 void exynos_report_trigger(struct thermal_sensor_conf *sensor_conf);
-#else
-static inline void
-exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf) { return; }
 
-static inline int
-exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) { return 0; }
-
-static inline void
-exynos_report_trigger(struct thermal_sensor_conf *sensor_conf) { return; }
-
-#endif /* CONFIG_EXYNOS_THERMAL_CORE */
 #endif /* _EXYNOS_THERMAL_COMMON_H */
#2 lore raw
Quoted 5 lines · Bartlomiej Zolnierkiewicz

Hi,

Could you please also apply this patch?

Quoted 12 lines

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

Quoted 5 lines · Bartlomiej Zolnierkiewicz

There is little sense in having separate config option for registering EXYNOS TMU driver with the core thermal framework. Fix it by integrating EXYNOS_THERMAL_CORE config option with EXYNOS_THERMAL one.

Sorry for the late reply but this patch is not needed as in my opinion as it is just decreasing the flexibility when only sensor hardware needs to be initialised and all cooling is hw controlled.

Thanks,
Amit D

Quoted 79 lines
Quoted 69 lines
---
 drivers/thermal/samsung/Kconfig                 | 14 +++-----------
 drivers/thermal/samsung/Makefile                |  2 +-
 drivers/thermal/samsung/exynos_thermal_common.h | 12 ------------
 3 files changed, 4 insertions(+), 24 deletions(-)
drivers/thermal/samsung/Kconfig +0 -0
index f760389..04eabee 100644
@@ -5,14 +5,6 @@ config EXYNOS_THERMAL
 	  If you say yes here you get support for the TMU (Thermal Management
 	  Unit) driver for SAMSUNG EXYNOS series of SoCs. This driver

initialises

drivers/thermal/samsung/Kconfig +3 -11
 	  the TMU, reports temperature and handles cooling action if defined.
-	  This driver uses the Exynos core thermal APIs and TMU configuration
-	  data from the supported SoCs.
-
-config EXYNOS_THERMAL_CORE
-	bool "Core thermal framework support for EXYNOS SOCs"
-	depends on EXYNOS_THERMAL
-	help
-	  If you say yes here you get support for EXYNOS TMU
-	  (Thermal Management Unit) common registration/unregistration
-	  functions to the core thermal layer and also to use the generic
-	  CPU cooling APIs.
+	  This driver uses the Exynos core thermal APIs, TMU configuration data
+	  from the supported SoCs, common registration/unregistration functions
+	  to the core thermal layer and also the generic CPU cooling APIs.
drivers/thermal/samsung/Makefile +1 -1
index c09d830..a829107 100644
@@ -4,4 +4,4 @@
 obj-$(CONFIG_EXYNOS_THERMAL)			+= exynos_thermal.o
 exynos_thermal-y				:= exynos_tmu.o
 exynos_thermal-y				+= exynos_tmu_data.o
-exynos_thermal-$(CONFIG_EXYNOS_THERMAL_CORE)	+= exynos_thermal_common.o
+exynos_thermal-y				+= exynos_thermal_common.o
drivers/thermal/samsung/exynos_thermal_common.h +0 -7
index 3eb2ed9..8681679 100644
@@ -88,20 +88,8 @@ struct thermal_sensor_conf {
 	struct device *dev;
 };
 
-/*Functions used exynos based thermal sensor driver*/
-#ifdef CONFIG_EXYNOS_THERMAL_CORE
 void exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf);
 int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf);
 void exynos_report_trigger(struct thermal_sensor_conf *sensor_conf);
-#else
-static inline void
-exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf) {
 return; }
 
-static inline int
-exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) { return

0; }

drivers/thermal/samsung/exynos_thermal_common.h +0 -3
-
-static inline void
-exynos_report_trigger(struct thermal_sensor_conf *sensor_conf) { return;

}

drivers/thermal/samsung/exynos_thermal_common.h struct thermal_sensor_conf { · line 95

Quoted 3 lines
drivers/thermal/samsung/exynos_thermal_common.h +0 -2
-
-#endif /* CONFIG_EXYNOS_THERMAL_CORE */
 #endif /* _EXYNOS_THERMAL_COMMON_H */

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html