[2/2] thermal: TI: always register sensor driver with core thermal framework
diff mbox

Message ID 1466554.jrelSVKzU4@amdc1032
State Rejected
Delegated to: Eduardo Valentin
Headers show

Commit Message

Bartlomiej Zolnierkiewicz Oct. 4, 2013, 12:40 p.m. UTC
There is little sense in having separate config option for
registering the sensor driver with the core thermal framework.
Fix it by integrating TI_THERMAL config option with TI_SOC_THERMAL
one.

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 drivers/thermal/ti-soc-thermal/Kconfig      | 15 +++-----------
 drivers/thermal/ti-soc-thermal/Makefile     |  2 +-
 drivers/thermal/ti-soc-thermal/ti-thermal.h | 31 -----------------------------
 3 files changed, 4 insertions(+), 44 deletions(-)

Comments

Eduardo Valentin Oct. 4, 2013, 6:25 p.m. UTC | #1
On 04-10-2013 08:40, Bartlomiej Zolnierkiewicz wrote:
> There is little sense in having separate config option for
> registering the sensor driver with the core thermal framework.
> Fix it by integrating TI_THERMAL config option with TI_SOC_THERMAL
> one.

I am a bit confused of what is exactly wrong or needs fixing. The code
organization is so that the file ti-bandgap.c adds the support for TI
Bandgap IP. It is not aware of thermal framework. And the
ti-thermal-common.c file is expected to talk to thermal framework. Can
you please elaborate a bit more why this split is hurting you?

> 
> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
>  drivers/thermal/ti-soc-thermal/Kconfig      | 15 +++-----------
>  drivers/thermal/ti-soc-thermal/Makefile     |  2 +-
>  drivers/thermal/ti-soc-thermal/ti-thermal.h | 31 -----------------------------
>  3 files changed, 4 insertions(+), 44 deletions(-)
> 
> diff --git a/drivers/thermal/ti-soc-thermal/Kconfig b/drivers/thermal/ti-soc-thermal/Kconfig
> index bf5d6e4..c64e78b 100644
> --- a/drivers/thermal/ti-soc-thermal/Kconfig
> +++ b/drivers/thermal/ti-soc-thermal/Kconfig
> @@ -7,18 +7,9 @@ config TI_SOC_THERMAL
>  	  OMAP4460+ on die bandgap temperature sensor support. The register
>  	  set is part of system control module.
>  
> -	  This includes alert interrupts generation and also the TSHUT
> -	  support.
> -
> -config TI_THERMAL
> -	bool "Texas Instruments SoCs thermal framework support"
> -	depends on TI_SOC_THERMAL
> -	help
> -	  If you say yes here you want to get support for generic thermal
> -	  framework for the Texas Instruments on die bandgap temperature sensor.
> -
> -	  This includes trip points definitions, extrapolation rules and
> -	  CPU cooling device bindings.
> +	  This includes alert interrupts generation, the TSHUT support,
> +	  trip points definitions, extrapolation rules and CPU cooling
> +	  device bindings.
>  
>  config OMAP4_THERMAL
>  	bool "Texas Instruments OMAP4 thermal support"
> diff --git a/drivers/thermal/ti-soc-thermal/Makefile b/drivers/thermal/ti-soc-thermal/Makefile
> index 1226b24..c75cc91 100644
> --- a/drivers/thermal/ti-soc-thermal/Makefile
> +++ b/drivers/thermal/ti-soc-thermal/Makefile
> @@ -1,6 +1,6 @@
>  obj-$(CONFIG_TI_SOC_THERMAL)		+= ti-soc-thermal.o
>  ti-soc-thermal-y			:= ti-bandgap.o
> -ti-soc-thermal-$(CONFIG_TI_THERMAL)	+= ti-thermal-common.o
> +ti-soc-thermal-y			+= ti-thermal-common.o
>  ti-soc-thermal-$(CONFIG_DRA752_THERMAL)	+= dra752-thermal-data.o
>  ti-soc-thermal-$(CONFIG_OMAP4_THERMAL)	+= omap4-thermal-data.o
>  ti-soc-thermal-$(CONFIG_OMAP5_THERMAL)	+= omap5-thermal-data.o
> diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal.h b/drivers/thermal/ti-soc-thermal/ti-thermal.h
> index f8b7ffe..5fb427c 100644
> --- a/drivers/thermal/ti-soc-thermal/ti-thermal.h
> +++ b/drivers/thermal/ti-soc-thermal/ti-thermal.h
> @@ -83,41 +83,10 @@
>  #define ti_thermal_is_valid_trip(trip)				\
>  	((trip) >= 0 && (trip) < OMAP_TRIP_NUMBER)
>  
> -#ifdef CONFIG_TI_THERMAL
>  int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, char *domain);
>  int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id);
>  int ti_thermal_report_sensor_temperature(struct ti_bandgap *bgp, int id);
>  int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id);
>  int ti_thermal_unregister_cpu_cooling(struct ti_bandgap *bgp, int id);
> -#else
> -static inline
> -int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, char *domain)
> -{
> -	return 0;
> -}
>  
> -static inline
> -int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id)
> -{
> -	return 0;
> -}
> -
> -static inline
> -int ti_thermal_report_sensor_temperature(struct ti_bandgap *bgp, int id)
> -{
> -	return 0;
> -}
> -
> -static inline
> -int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id)
> -{
> -	return 0;
> -}
> -
> -static inline
> -int ti_thermal_unregister_cpu_cooling(struct ti_bandgap *bgp, int id)
> -{
> -	return 0;
> -}
> -#endif
>  #endif
>
Bartlomiej Zolnierkiewicz Oct. 7, 2013, 10:08 a.m. UTC | #2
On Friday, October 04, 2013 02:25:06 PM Eduardo Valentin wrote:
> On 04-10-2013 08:40, Bartlomiej Zolnierkiewicz wrote:
> > There is little sense in having separate config option for
> > registering the sensor driver with the core thermal framework.
> > Fix it by integrating TI_THERMAL config option with TI_SOC_THERMAL
> > one.
> 
> I am a bit confused of what is exactly wrong or needs fixing. The code
> organization is so that the file ti-bandgap.c adds the support for TI
> Bandgap IP. It is not aware of thermal framework. And the
> ti-thermal-common.c file is expected to talk to thermal framework. Can
> you please elaborate a bit more why this split is hurting you?

The split seems artificial since both options have dependency on THERMAL.

Could you please tell me what is an advantage of having separate core
TI bandgap IP support without registration to thermal framework?

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

> > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > ---
> >  drivers/thermal/ti-soc-thermal/Kconfig      | 15 +++-----------
> >  drivers/thermal/ti-soc-thermal/Makefile     |  2 +-
> >  drivers/thermal/ti-soc-thermal/ti-thermal.h | 31 -----------------------------
> >  3 files changed, 4 insertions(+), 44 deletions(-)
> > 
> > diff --git a/drivers/thermal/ti-soc-thermal/Kconfig b/drivers/thermal/ti-soc-thermal/Kconfig
> > index bf5d6e4..c64e78b 100644
> > --- a/drivers/thermal/ti-soc-thermal/Kconfig
> > +++ b/drivers/thermal/ti-soc-thermal/Kconfig
> > @@ -7,18 +7,9 @@ config TI_SOC_THERMAL
> >  	  OMAP4460+ on die bandgap temperature sensor support. The register
> >  	  set is part of system control module.
> >  
> > -	  This includes alert interrupts generation and also the TSHUT
> > -	  support.
> > -
> > -config TI_THERMAL
> > -	bool "Texas Instruments SoCs thermal framework support"
> > -	depends on TI_SOC_THERMAL
> > -	help
> > -	  If you say yes here you want to get support for generic thermal
> > -	  framework for the Texas Instruments on die bandgap temperature sensor.
> > -
> > -	  This includes trip points definitions, extrapolation rules and
> > -	  CPU cooling device bindings.
> > +	  This includes alert interrupts generation, the TSHUT support,
> > +	  trip points definitions, extrapolation rules and CPU cooling
> > +	  device bindings.
> >  
> >  config OMAP4_THERMAL
> >  	bool "Texas Instruments OMAP4 thermal support"
> > diff --git a/drivers/thermal/ti-soc-thermal/Makefile b/drivers/thermal/ti-soc-thermal/Makefile
> > index 1226b24..c75cc91 100644
> > --- a/drivers/thermal/ti-soc-thermal/Makefile
> > +++ b/drivers/thermal/ti-soc-thermal/Makefile
> > @@ -1,6 +1,6 @@
> >  obj-$(CONFIG_TI_SOC_THERMAL)		+= ti-soc-thermal.o
> >  ti-soc-thermal-y			:= ti-bandgap.o
> > -ti-soc-thermal-$(CONFIG_TI_THERMAL)	+= ti-thermal-common.o
> > +ti-soc-thermal-y			+= ti-thermal-common.o
> >  ti-soc-thermal-$(CONFIG_DRA752_THERMAL)	+= dra752-thermal-data.o
> >  ti-soc-thermal-$(CONFIG_OMAP4_THERMAL)	+= omap4-thermal-data.o
> >  ti-soc-thermal-$(CONFIG_OMAP5_THERMAL)	+= omap5-thermal-data.o
> > diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal.h b/drivers/thermal/ti-soc-thermal/ti-thermal.h
> > index f8b7ffe..5fb427c 100644
> > --- a/drivers/thermal/ti-soc-thermal/ti-thermal.h
> > +++ b/drivers/thermal/ti-soc-thermal/ti-thermal.h
> > @@ -83,41 +83,10 @@
> >  #define ti_thermal_is_valid_trip(trip)				\
> >  	((trip) >= 0 && (trip) < OMAP_TRIP_NUMBER)
> >  
> > -#ifdef CONFIG_TI_THERMAL
> >  int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, char *domain);
> >  int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id);
> >  int ti_thermal_report_sensor_temperature(struct ti_bandgap *bgp, int id);
> >  int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id);
> >  int ti_thermal_unregister_cpu_cooling(struct ti_bandgap *bgp, int id);
> > -#else
> > -static inline
> > -int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, char *domain)
> > -{
> > -	return 0;
> > -}
> >  
> > -static inline
> > -int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id)
> > -{
> > -	return 0;
> > -}
> > -
> > -static inline
> > -int ti_thermal_report_sensor_temperature(struct ti_bandgap *bgp, int id)
> > -{
> > -	return 0;
> > -}
> > -
> > -static inline
> > -int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id)
> > -{
> > -	return 0;
> > -}
> > -
> > -static inline
> > -int ti_thermal_unregister_cpu_cooling(struct ti_bandgap *bgp, int id)
> > -{
> > -	return 0;
> > -}
> > -#endif
> >  #endif

--
To unsubscribe from this list: send the line "unsubscribe linux-pm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/drivers/thermal/ti-soc-thermal/Kconfig b/drivers/thermal/ti-soc-thermal/Kconfig
index bf5d6e4..c64e78b 100644
--- a/drivers/thermal/ti-soc-thermal/Kconfig
+++ b/drivers/thermal/ti-soc-thermal/Kconfig
@@ -7,18 +7,9 @@  config TI_SOC_THERMAL
 	  OMAP4460+ on die bandgap temperature sensor support. The register
 	  set is part of system control module.
 
-	  This includes alert interrupts generation and also the TSHUT
-	  support.
-
-config TI_THERMAL
-	bool "Texas Instruments SoCs thermal framework support"
-	depends on TI_SOC_THERMAL
-	help
-	  If you say yes here you want to get support for generic thermal
-	  framework for the Texas Instruments on die bandgap temperature sensor.
-
-	  This includes trip points definitions, extrapolation rules and
-	  CPU cooling device bindings.
+	  This includes alert interrupts generation, the TSHUT support,
+	  trip points definitions, extrapolation rules and CPU cooling
+	  device bindings.
 
 config OMAP4_THERMAL
 	bool "Texas Instruments OMAP4 thermal support"
diff --git a/drivers/thermal/ti-soc-thermal/Makefile b/drivers/thermal/ti-soc-thermal/Makefile
index 1226b24..c75cc91 100644
--- a/drivers/thermal/ti-soc-thermal/Makefile
+++ b/drivers/thermal/ti-soc-thermal/Makefile
@@ -1,6 +1,6 @@ 
 obj-$(CONFIG_TI_SOC_THERMAL)		+= ti-soc-thermal.o
 ti-soc-thermal-y			:= ti-bandgap.o
-ti-soc-thermal-$(CONFIG_TI_THERMAL)	+= ti-thermal-common.o
+ti-soc-thermal-y			+= ti-thermal-common.o
 ti-soc-thermal-$(CONFIG_DRA752_THERMAL)	+= dra752-thermal-data.o
 ti-soc-thermal-$(CONFIG_OMAP4_THERMAL)	+= omap4-thermal-data.o
 ti-soc-thermal-$(CONFIG_OMAP5_THERMAL)	+= omap5-thermal-data.o
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal.h b/drivers/thermal/ti-soc-thermal/ti-thermal.h
index f8b7ffe..5fb427c 100644
--- a/drivers/thermal/ti-soc-thermal/ti-thermal.h
+++ b/drivers/thermal/ti-soc-thermal/ti-thermal.h
@@ -83,41 +83,10 @@ 
 #define ti_thermal_is_valid_trip(trip)				\
 	((trip) >= 0 && (trip) < OMAP_TRIP_NUMBER)
 
-#ifdef CONFIG_TI_THERMAL
 int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, char *domain);
 int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id);
 int ti_thermal_report_sensor_temperature(struct ti_bandgap *bgp, int id);
 int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id);
 int ti_thermal_unregister_cpu_cooling(struct ti_bandgap *bgp, int id);
-#else
-static inline
-int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, char *domain)
-{
-	return 0;
-}
 
-static inline
-int ti_thermal_remove_sensor(struct ti_bandgap *bgp, int id)
-{
-	return 0;
-}
-
-static inline
-int ti_thermal_report_sensor_temperature(struct ti_bandgap *bgp, int id)
-{
-	return 0;
-}
-
-static inline
-int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id)
-{
-	return 0;
-}
-
-static inline
-int ti_thermal_unregister_cpu_cooling(struct ti_bandgap *bgp, int id)
-{
-	return 0;
-}
-#endif
 #endif