[PATCHv2] thermal: add omap3 support
diff mbox

Message ID 20150118202824.GB29014@amd
State Changes Requested
Delegated to: Eduardo Valentin
Headers show

Commit Message

Pavel Machek Jan. 18, 2015, 8:28 p.m. UTC
Add support for omap3430 sensor. Tested on Nokia N900.

Fix help text to be closer to english.

Ifdefs in ti-bandgap.h are not neccessary, as users have #ifdefs,
already.

Signed-off-by: Pavel Machek <pavel@ucw.cz>

Comments

Eduardo Valentin March 13, 2015, 5:03 a.m. UTC | #1
On Sun, Jan 18, 2015 at 09:28:24PM +0100, Pavel Machek wrote:
> 
> Add support for omap3430 sensor. Tested on Nokia N900.
> 
> Fix help text to be closer to english.
> 
> Ifdefs in ti-bandgap.h are not neccessary, as users have #ifdefs,
> already.
> 
> Signed-off-by: Pavel Machek <pavel@ucw.cz>
> 
> diff --git a/drivers/thermal/ti-soc-thermal/Kconfig b/drivers/thermal/ti-soc-thermal/Kconfig
> index bd4c7be..65c478e 100644
> --- a/drivers/thermal/ti-soc-thermal/Kconfig
> +++ b/drivers/thermal/ti-soc-thermal/Kconfig
> @@ -21,13 +21,28 @@ config TI_THERMAL
>  	  This includes trip points definitions, extrapolation rules and
>  	  CPU cooling device bindings.
>  
> +config OMAP3_THERMAL
> +	bool "Texas Instruments OMAP3 thermal support"
> +	depends on TI_SOC_THERMAL
> +	depends on ARCH_OMAP3
> +	help
> +	  If you say yes here you get thermal support for the Texas Instruments
> +	  OMAP3 SoC family. The current chips supported are:
> +	   - OMAP3430
> +
> +	  OMAP3 chips normally don't need thermal management, and sensors in
> +	  this generation are not very accurate, nor they are very close to
> +	  the important hotspots.
> +
> +	  Say 'N' here.
> +
>  config OMAP4_THERMAL
>  	bool "Texas Instruments OMAP4 thermal support"
>  	depends on TI_SOC_THERMAL
>  	depends on ARCH_OMAP4
>  	help
>  	  If you say yes here you get thermal support for the Texas Instruments
> -	  OMAP4 SoC family. The current chip supported are:
> +	  OMAP4 SoC family. The current chips supported are:
>  	   - OMAP4430
>  	   - OMAP4460
>  	   - OMAP4470
> @@ -41,7 +56,7 @@ config OMAP5_THERMAL
>  	depends on SOC_OMAP5
>  	help
>  	  If you say yes here you get thermal support for the Texas Instruments
> -	  OMAP5 SoC family. The current chip supported are:
> +	  OMAP5 SoC family. The current chips supported are:
>  	   - OMAP5430
>  
>  	  This includes alert interrupts generation and also the TSHUT
> @@ -53,7 +68,7 @@ config DRA752_THERMAL
>  	depends on SOC_DRA7XX
>  	help
>  	  If you say yes here you get thermal support for the Texas Instruments
> -	  DRA752 SoC family. The current chip supported are:
> +	  DRA752 SoC family. The current chips supported are:
>  	   - DRA752
>  
>  	  This includes alert interrupts generation and also the TSHUT
> diff --git a/drivers/thermal/ti-soc-thermal/Makefile b/drivers/thermal/ti-soc-thermal/Makefile
> index 1226b24..0f89bdf 100644
> --- a/drivers/thermal/ti-soc-thermal/Makefile
> +++ b/drivers/thermal/ti-soc-thermal/Makefile
> @@ -2,5 +2,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-$(CONFIG_DRA752_THERMAL)	+= dra752-thermal-data.o
> +ti-soc-thermal-$(CONFIG_OMAP3_THERMAL)	+= omap3-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/omap3-thermal-data.c b/drivers/thermal/ti-soc-thermal/omap3-thermal-data.c
> new file mode 100644
> index 0000000..5cee2a35
> --- /dev/null
> +++ b/drivers/thermal/ti-soc-thermal/omap3-thermal-data.c
> @@ -0,0 +1,103 @@
> +/*
> + * OMAP3 thermal driver.
> + *
> + * Copyright (C) 2011-2012 Texas Instruments Inc.
> + * Copyright (C) 2014 Pavel Machek <pavel@ucw.cz>
> + *
> + * This software is licensed under the terms of the GNU General Public
> + * License version 2, as published by the Free Software Foundation, and
> + * may be copied, distributed, and modified under those terms.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * Note
> + * http://www.ti.com/lit/er/sprz278f/sprz278f.pdf "Advisory
> + * 3.1.1.186 MMC OCP Clock Not Gated When Thermal Sensor Is Used"
> + *
> + * Also TI says:
> + * Just be careful when you try to make thermal policy like decisions
> + * based on this sensor. Placement of the sensor w.r.t the actual logic
> + * generating heat has to be a factor as well. If you are just looking
> + * for an approximation temperature (thermometerish kind), you might be
> + * ok with this. I am not sure we'd find any TI data around this.. just a
> + * heads up.
> + */
> +
> +#include "ti-thermal.h"
> +#include "ti-bandgap.h"
> +
> +/*
> + * OMAP34XX has one instance of thermal sensor for MPU
> + * need to describe the individual bit fields
> + */
> +static struct temp_sensor_registers
> +omap34xx_mpu_temp_sensor_registers = {
> +	.temp_sensor_ctrl = 0,
> +	.bgap_soc_mask = BIT(8),
> +	.bgap_eocz_mask = BIT(7),
> +	.bgap_dtemp_mask = 0x7f,
> +
> +	.bgap_mode_ctrl = 0,
> +	.mode_ctrl_mask = BIT(9),
> +};
> +
> +/* Thresholds and limits for OMAP34XX MPU temperature sensor */
> +static struct temp_sensor_data omap34xx_mpu_temp_sensor_data = {
> +	.min_freq = 32768,
> +	.max_freq = 32768,
> +	.max_temp = -99000,
> +	.min_temp = 99000,
> +	.hyst_val = 5000,
> +};
> +
> +/*
> + * Temperature values in milli degree celsius
> + */
> +static const int
> +omap34xx_adc_to_temp[128] = {
> +	-40000, -40000, -40000, -40000, -40000, -39000, -38000, -36000,
> +	-34000, -32000, -31000,	-29000, -28000, -26000, -25000, -24000,
> +	-22000, -21000, -19000, -18000, -17000, -15000,	-14000, -12000,
> +	-11000, -9000, -8000, -7000, -5000, -4000, -2000, -1000, 0000,
> +	1000, 3000, 4000, 5000, 7000, 8000, 10000, 11000, 13000, 14000,
> +	15000, 17000, 18000, 20000, 21000, 22000, 24000, 25000, 27000,
> +	28000, 30000, 31000, 32000, 34000, 35000, 37000, 38000, 39000,
> +	41000, 42000, 44000, 45000, 47000, 48000, 49000, 51000, 52000,
> +	53000, 55000, 56000, 58000, 59000, 60000, 62000, 63000, 65000,
> +	66000, 67000, 69000, 70000, 72000, 73000, 74000, 76000, 77000,
> +	79000, 80000, 81000, 83000, 84000, 85000, 87000, 88000, 89000,
> +	91000, 92000, 94000, 95000, 96000, 98000, 99000, 100000,
> +	102000, 103000, 105000, 106000, 107000, 109000, 110000, 111000,
> +	113000, 114000, 116000, 117000, 118000, 120000, 121000, 122000,
> +	124000, 124000, 125000, 125000, 125000, 125000,	125000
> +};
> +
> +/* OMAP34XX data */
> +const struct ti_bandgap_data omap34xx_data = {
> +	.features = TI_BANDGAP_FEATURE_CLK_CTRL /* | TI_BANDGAP_FEATURE_MODE_CONFIG */,
> +	.fclock_name = "ts_fck",
> +	.div_ck_name = "ts_fck",
> +	.conv_table = omap34xx_adc_to_temp,
> +	.adc_start_val = 0,
> +	.adc_end_val = 127,
> +	.expose_sensor = ti_thermal_expose_sensor,
> +	.remove_sensor = ti_thermal_remove_sensor,
> +
> +	.sensors = {
> +		{
> +		.registers = &omap34xx_mpu_temp_sensor_registers,
> +		.ts_data = &omap34xx_mpu_temp_sensor_data,
> +		.domain = "cpu",
> +		.slope = 0,
> +		.constant = 20000,
> +		.slope_pcb = 0,
> +		.constant_pcb = 20000,
> +		.register_cooling = NULL,
> +		.unregister_cooling = NULL,
> +		},
> +	},
> +	.sensor_count = 1,
> +};
> diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
> index 634b6ce..2fde78c 100644
> --- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
> +++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
> @@ -1509,6 +1510,12 @@ static SIMPLE_DEV_PM_OPS(ti_bandgap_dev_pm_ops, ti_bandgap_suspend,
>  #endif
>  
>  static const struct of_device_id of_ti_bandgap_match[] = {
> +#ifdef CONFIG_OMAP3_THERMAL
> +	{
> +		.compatible = "ti,omap34xx-bandgap",
> +		.data = (void *)&omap34xx_data,
> +	},
> +#endif
>  #ifdef CONFIG_OMAP4_THERMAL
>  	{
>  		.compatible = "ti,omap4430-bandgap",
> diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.h b/drivers/thermal/ti-soc-thermal/ti-bandgap.h
> index b3adf72..9ba9a6b 100644
> --- a/drivers/thermal/ti-soc-thermal/ti-bandgap.h
> +++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.h
> @@ -331,6 +331,7 @@ struct ti_temp_sensor {
>  #define TI_BANDGAP_FEATURE_FREEZE_BIT		BIT(7)
>  #define TI_BANDGAP_FEATURE_COUNTER_DELAY	BIT(8)
>  #define TI_BANDGAP_FEATURE_HISTORY_BUFFER	BIT(9)
> +#define TI_BANDGAP_FEATURE_UNRELIABLE		BIT(10)
>  #define TI_BANDGAP_HAS(b, f)			\
>  			((b)->conf->features & TI_BANDGAP_FEATURE_ ## f)
>  
> @@ -384,25 +385,10 @@ int ti_bandgap_set_sensor_data(struct ti_bandgap *bgp, int id, void *data);
>  void *ti_bandgap_get_sensor_data(struct ti_bandgap *bgp, int id);
>  int ti_bandgap_get_trend(struct ti_bandgap *bgp, int id, int *trend);
>  
> -#ifdef CONFIG_OMAP4_THERMAL
> +extern const struct ti_bandgap_data omap34xx_data;
>  extern const struct ti_bandgap_data omap4430_data;
>  extern const struct ti_bandgap_data omap4460_data;
>  extern const struct ti_bandgap_data omap4470_data;
> -#else
> -#define omap4430_data					NULL
> -#define omap4460_data					NULL
> -#define omap4470_data					NULL
> -#endif
> -
> -#ifdef CONFIG_OMAP5_THERMAL
>  extern const struct ti_bandgap_data omap5430_data;
> -#else
> -#define omap5430_data					NULL
> -#endif
> -
> -#ifdef CONFIG_DRA752_THERMAL
>  extern const struct ti_bandgap_data dra752_data;
> -#else
> -#define dra752_data					NULL
> -#endif

Pavel,

Why do we need to remove the existing symbols for other chips in this file to get OMAP3 support in?

BR,

>  #endif
> 
> -- 
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Pavel Machek March 13, 2015, 12:09 p.m. UTC | #2
Hi!

I checked 4.0-rc3 and linux-next as of today, and can not see omap3
thermal support. Can you apply the patches?

Thanks,
									Pavel
Eduardo Valentin March 13, 2015, 4:53 p.m. UTC | #3
Hey Pavel,

On Fri, Mar 13, 2015 at 01:09:35PM +0100, Pavel Machek wrote:
> Hi!
> 
> I checked 4.0-rc3 and linux-next as of today, and can not see omap3
> thermal support. Can you apply the patches?

Yeah, it should be possible. Apologize, it really fell into the cracks.

There is a comment on it though. Please check my concern in you v2.

BR,

Eduardo


> 
> Thanks,
> 									Pavel
> -- 
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Pavel Machek March 13, 2015, 7:40 p.m. UTC | #4
Hi!

> > @@ -384,25 +385,10 @@ int ti_bandgap_set_sensor_data(struct ti_bandgap *bgp, int id, void *data);
> >  void *ti_bandgap_get_sensor_data(struct ti_bandgap *bgp, int id);
> >  int ti_bandgap_get_trend(struct ti_bandgap *bgp, int id, int *trend);
> >  
> > -#ifdef CONFIG_OMAP4_THERMAL
> > +extern const struct ti_bandgap_data omap34xx_data;
> >  extern const struct ti_bandgap_data omap4430_data;
> >  extern const struct ti_bandgap_data omap4460_data;
> >  extern const struct ti_bandgap_data omap4470_data;
> > -#else
> > -#define omap4430_data					NULL
> > -#define omap4460_data					NULL
> > -#define omap4470_data					NULL
> > -#endif
> > -
> > -#ifdef CONFIG_OMAP5_THERMAL
> >  extern const struct ti_bandgap_data omap5430_data;
> > -#else
> > -#define omap5430_data					NULL
> > -#endif
> > -
> > -#ifdef CONFIG_DRA752_THERMAL
> >  extern const struct ti_bandgap_data dra752_data;
> > -#else
> > -#define dra752_data					NULL
> > -#endif
> 
> Pavel,
> 
> Why do we need to remove the existing symbols for other chips in this file to get OMAP3 support in?
> 

No, I don't need to remove this, and you can safely drop this hunk.

OTOH those ifdefs are unneccessary and eye-sore: extern symbol
declarations do not really hurt, and .c files already contain enough
#ifdefs for other reasons that the symbols will not be needed when it
is not configured.

Try it, it should work ok.

Best regards,
								Pavel
Pavel Machek March 14, 2015, 6:02 p.m. UTC | #5
On Fri 2015-03-13 12:53:45, Eduardo Valentin wrote:
> 
> Hey Pavel,
> 
> On Fri, Mar 13, 2015 at 01:09:35PM +0100, Pavel Machek wrote:
> > Hi!
> > 
> > I checked 4.0-rc3 and linux-next as of today, and can not see omap3
> > thermal support. Can you apply the patches?
> 
> Yeah, it should be possible. Apologize, it really fell into the cracks.
> 
> There is a comment on it though. Please check my concern in you v2.

And there's explanation for that concern :-). Let me know what you
need.

Best regards,
									Pavel
Pavel Machek March 23, 2015, 11:25 a.m. UTC | #6
On Sat 2015-03-14 19:02:40, Pavel Machek wrote:
> On Fri 2015-03-13 12:53:45, Eduardo Valentin wrote:
> > 
> > Hey Pavel,
> > 
> > On Fri, Mar 13, 2015 at 01:09:35PM +0100, Pavel Machek wrote:
> > > Hi!
> > > 
> > > I checked 4.0-rc3 and linux-next as of today, and can not see omap3
> > > thermal support. Can you apply the patches?
> > 
> > Yeah, it should be possible. Apologize, it really fell into the cracks.
> > 
> > There is a comment on it though. Please check my concern in you v2.
> 
> And there's explanation for that concern :-). Let me know what you
> need.

...ping? It would be good to get this into 4.1.
									Pavel
Eduardo Valentin March 23, 2015, 2:31 p.m. UTC | #7
On Sun, Jan 18, 2015 at 09:28:24PM +0100, Pavel Machek wrote:
> 
> Add support for omap3430 sensor. Tested on Nokia N900.
> 
> Fix help text to be closer to english.
> 
> Ifdefs in ti-bandgap.h are not neccessary, as users have #ifdefs,
> already.
> 
> Signed-off-by: Pavel Machek <pavel@ucw.cz>

You need to update the driver device tree binding documentation. Please
include an example of its usage there.


Also, a separate patch with the required DT changes is always welcome.

> 
> diff --git a/drivers/thermal/ti-soc-thermal/Kconfig b/drivers/thermal/ti-soc-thermal/Kconfig
> index bd4c7be..65c478e 100644
> --- a/drivers/thermal/ti-soc-thermal/Kconfig
> +++ b/drivers/thermal/ti-soc-thermal/Kconfig
> @@ -21,13 +21,28 @@ config TI_THERMAL
>  	  This includes trip points definitions, extrapolation rules and
>  	  CPU cooling device bindings.
>  
> +config OMAP3_THERMAL
> +	bool "Texas Instruments OMAP3 thermal support"
> +	depends on TI_SOC_THERMAL
> +	depends on ARCH_OMAP3
> +	help
> +	  If you say yes here you get thermal support for the Texas Instruments
> +	  OMAP3 SoC family. The current chips supported are:
> +	   - OMAP3430
> +
> +	  OMAP3 chips normally don't need thermal management, and sensors in
> +	  this generation are not very accurate, nor they are very close to
> +	  the important hotspots.
> +
> +	  Say 'N' here.
> +
>  config OMAP4_THERMAL
>  	bool "Texas Instruments OMAP4 thermal support"
>  	depends on TI_SOC_THERMAL
>  	depends on ARCH_OMAP4
>  	help
>  	  If you say yes here you get thermal support for the Texas Instruments
> -	  OMAP4 SoC family. The current chip supported are:
> +	  OMAP4 SoC family. The current chips supported are:
>  	   - OMAP4430
>  	   - OMAP4460
>  	   - OMAP4470
> @@ -41,7 +56,7 @@ config OMAP5_THERMAL
>  	depends on SOC_OMAP5
>  	help
>  	  If you say yes here you get thermal support for the Texas Instruments
> -	  OMAP5 SoC family. The current chip supported are:
> +	  OMAP5 SoC family. The current chips supported are:
>  	   - OMAP5430
>  
>  	  This includes alert interrupts generation and also the TSHUT
> @@ -53,7 +68,7 @@ config DRA752_THERMAL
>  	depends on SOC_DRA7XX
>  	help
>  	  If you say yes here you get thermal support for the Texas Instruments
> -	  DRA752 SoC family. The current chip supported are:
> +	  DRA752 SoC family. The current chips supported are:

minor: I would prefer you fix this in a separate patch.

>  	   - DRA752
>  
>  	  This includes alert interrupts generation and also the TSHUT
> diff --git a/drivers/thermal/ti-soc-thermal/Makefile b/drivers/thermal/ti-soc-thermal/Makefile
> index 1226b24..0f89bdf 100644
> --- a/drivers/thermal/ti-soc-thermal/Makefile
> +++ b/drivers/thermal/ti-soc-thermal/Makefile
> @@ -2,5 +2,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-$(CONFIG_DRA752_THERMAL)	+= dra752-thermal-data.o
> +ti-soc-thermal-$(CONFIG_OMAP3_THERMAL)	+= omap3-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/omap3-thermal-data.c b/drivers/thermal/ti-soc-thermal/omap3-thermal-data.c
> new file mode 100644
> index 0000000..5cee2a35
> --- /dev/null
> +++ b/drivers/thermal/ti-soc-thermal/omap3-thermal-data.c
> @@ -0,0 +1,103 @@
> +/*
> + * OMAP3 thermal driver.
> + *
> + * Copyright (C) 2011-2012 Texas Instruments Inc.
> + * Copyright (C) 2014 Pavel Machek <pavel@ucw.cz>
> + *
> + * This software is licensed under the terms of the GNU General Public
> + * License version 2, as published by the Free Software Foundation, and
> + * may be copied, distributed, and modified under those terms.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * Note
> + * http://www.ti.com/lit/er/sprz278f/sprz278f.pdf "Advisory
> + * 3.1.1.186 MMC OCP Clock Not Gated When Thermal Sensor Is Used"
> + *
> + * Also TI says:
> + * Just be careful when you try to make thermal policy like decisions
> + * based on this sensor. Placement of the sensor w.r.t the actual logic
> + * generating heat has to be a factor as well. If you are just looking
> + * for an approximation temperature (thermometerish kind), you might be
> + * ok with this. I am not sure we'd find any TI data around this.. just a
> + * heads up.
> + */
> +
> +#include "ti-thermal.h"
> +#include "ti-bandgap.h"
> +
> +/*
> + * OMAP34XX has one instance of thermal sensor for MPU
> + * need to describe the individual bit fields
> + */
> +static struct temp_sensor_registers
> +omap34xx_mpu_temp_sensor_registers = {
> +	.temp_sensor_ctrl = 0,
> +	.bgap_soc_mask = BIT(8),
> +	.bgap_eocz_mask = BIT(7),
> +	.bgap_dtemp_mask = 0x7f,
> +
> +	.bgap_mode_ctrl = 0,
> +	.mode_ctrl_mask = BIT(9),
> +};
> +
> +/* Thresholds and limits for OMAP34XX MPU temperature sensor */
> +static struct temp_sensor_data omap34xx_mpu_temp_sensor_data = {
> +	.min_freq = 32768,
> +	.max_freq = 32768,
> +	.max_temp = -99000,
> +	.min_temp = 99000,
> +	.hyst_val = 5000,
> +};
> +
> +/*
> + * Temperature values in milli degree celsius
> + */
> +static const int
> +omap34xx_adc_to_temp[128] = {
> +	-40000, -40000, -40000, -40000, -40000, -39000, -38000, -36000,
> +	-34000, -32000, -31000,	-29000, -28000, -26000, -25000, -24000,
> +	-22000, -21000, -19000, -18000, -17000, -15000,	-14000, -12000,
> +	-11000, -9000, -8000, -7000, -5000, -4000, -2000, -1000, 0000,
> +	1000, 3000, 4000, 5000, 7000, 8000, 10000, 11000, 13000, 14000,
> +	15000, 17000, 18000, 20000, 21000, 22000, 24000, 25000, 27000,
> +	28000, 30000, 31000, 32000, 34000, 35000, 37000, 38000, 39000,
> +	41000, 42000, 44000, 45000, 47000, 48000, 49000, 51000, 52000,
> +	53000, 55000, 56000, 58000, 59000, 60000, 62000, 63000, 65000,
> +	66000, 67000, 69000, 70000, 72000, 73000, 74000, 76000, 77000,
> +	79000, 80000, 81000, 83000, 84000, 85000, 87000, 88000, 89000,
> +	91000, 92000, 94000, 95000, 96000, 98000, 99000, 100000,
> +	102000, 103000, 105000, 106000, 107000, 109000, 110000, 111000,
> +	113000, 114000, 116000, 117000, 118000, 120000, 121000, 122000,
> +	124000, 124000, 125000, 125000, 125000, 125000,	125000
> +};
> +
> +/* OMAP34XX data */
> +const struct ti_bandgap_data omap34xx_data = {
> +	.features = TI_BANDGAP_FEATURE_CLK_CTRL /* | TI_BANDGAP_FEATURE_MODE_CONFIG */,

Shouldn't this be unreliable?

> +	.fclock_name = "ts_fck",
> +	.div_ck_name = "ts_fck",
> +	.conv_table = omap34xx_adc_to_temp,
> +	.adc_start_val = 0,
> +	.adc_end_val = 127,
> +	.expose_sensor = ti_thermal_expose_sensor,
> +	.remove_sensor = ti_thermal_remove_sensor,
> +
> +	.sensors = {
> +		{
> +		.registers = &omap34xx_mpu_temp_sensor_registers,
> +		.ts_data = &omap34xx_mpu_temp_sensor_data,
> +		.domain = "cpu",
> +		.slope = 0,
> +		.constant = 20000,
> +		.slope_pcb = 0,
> +		.constant_pcb = 20000,
> +		.register_cooling = NULL,
> +		.unregister_cooling = NULL,
> +		},
> +	},
> +	.sensor_count = 1,
> +};
> diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c

You did not use the bit you created to warn the user about the chip.

> index 634b6ce..2fde78c 100644
> --- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
> +++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
> @@ -1509,6 +1510,12 @@ static SIMPLE_DEV_PM_OPS(ti_bandgap_dev_pm_ops, ti_bandgap_suspend,
>  #endif
>  
>  static const struct of_device_id of_ti_bandgap_match[] = {
> +#ifdef CONFIG_OMAP3_THERMAL
> +	{
> +		.compatible = "ti,omap34xx-bandgap",
> +		.data = (void *)&omap34xx_data,
> +	},
> +#endif
>  #ifdef CONFIG_OMAP4_THERMAL
>  	{
>  		.compatible = "ti,omap4430-bandgap",
> diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.h b/drivers/thermal/ti-soc-thermal/ti-bandgap.h
> index b3adf72..9ba9a6b 100644
> --- a/drivers/thermal/ti-soc-thermal/ti-bandgap.h
> +++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.h
> @@ -331,6 +331,7 @@ struct ti_temp_sensor {
>  #define TI_BANDGAP_FEATURE_FREEZE_BIT		BIT(7)
>  #define TI_BANDGAP_FEATURE_COUNTER_DELAY	BIT(8)
>  #define TI_BANDGAP_FEATURE_HISTORY_BUFFER	BIT(9)
> +#define TI_BANDGAP_FEATURE_UNRELIABLE		BIT(10)

This needs to go somewhere else too in your patch.

>  #define TI_BANDGAP_HAS(b, f)			\
>  			((b)->conf->features & TI_BANDGAP_FEATURE_ ## f)
>  
> @@ -384,25 +385,10 @@ int ti_bandgap_set_sensor_data(struct ti_bandgap *bgp, int id, void *data);
>  void *ti_bandgap_get_sensor_data(struct ti_bandgap *bgp, int id);
>  int ti_bandgap_get_trend(struct ti_bandgap *bgp, int id, int *trend);
>  
> -#ifdef CONFIG_OMAP4_THERMAL
> +extern const struct ti_bandgap_data omap34xx_data;

Please, keep one change per patch. If you think it is good to remove the
ifdefs here, send a separate patch. Keep in mind that, if you are
removing the ifdefs, I would prefer you remove from the .c file.

>  extern const struct ti_bandgap_data omap4430_data;
>  extern const struct ti_bandgap_data omap4460_data;
>  extern const struct ti_bandgap_data omap4470_data;
> -#else
> -#define omap4430_data					NULL
> -#define omap4460_data					NULL
> -#define omap4470_data					NULL
> -#endif
> -
> -#ifdef CONFIG_OMAP5_THERMAL
>  extern const struct ti_bandgap_data omap5430_data;
> -#else
> -#define omap5430_data					NULL
> -#endif
> -
> -#ifdef CONFIG_DRA752_THERMAL
>  extern const struct ti_bandgap_data dra752_data;
> -#else
> -#define dra752_data					NULL
> -#endif
>  #endif
> 
> -- 
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Pavel Machek March 23, 2015, 3:58 p.m. UTC | #8
On Mon 2015-03-23 10:31:51, Eduardo Valentin wrote:
> On Sun, Jan 18, 2015 at 09:28:24PM +0100, Pavel Machek wrote:
> > 
> > Add support for omap3430 sensor. Tested on Nokia N900.
> > 
> > Fix help text to be closer to english.
> > 
> > Ifdefs in ti-bandgap.h are not neccessary, as users have #ifdefs,
> > already.
> > 
> > Signed-off-by: Pavel Machek <pavel@ucw.cz>
> 
> You need to update the driver device tree binding documentation. Please
> include an example of its usage there.
> 
> Also, a separate patch with the required DT changes is always
> welcome.

I can do it, but can you merge:

Date: Sun, 18 Jan 2015 21:24:47 +0100
From: Pavel Machek <pavel@ucw.cz>
Subject: [PATCHv2] ti-soc-thermal: request temperature periodically if
hw can't do that itself


Date: Sun, 18 Jan 2015 21:20:51 +0100
From: Pavel Machek <pavel@ucw.cz>
Subject: [PATCHv2] ti-soc-thermal: implement eocz bit to make driver
useful on omap3

Date: Sun, 18 Jan 2015 21:17:10 +0100
From: Pavel Machek <pavel@ucw.cz>
Subject: [PATCHv2] cleanup ti-soc-thermal

First? They are nicely split, as you requested, and I already have too
many patches in flight.

Thanks for the comments, I'll fix them in my local tree.
								Pavel
Eduardo Valentin March 23, 2015, 5:55 p.m. UTC | #9
On Mon, Mar 23, 2015 at 04:58:30PM +0100, Pavel Machek wrote:
> On Mon 2015-03-23 10:31:51, Eduardo Valentin wrote:
> > On Sun, Jan 18, 2015 at 09:28:24PM +0100, Pavel Machek wrote:
> > > 
> > > Add support for omap3430 sensor. Tested on Nokia N900.
> > > 
> > > Fix help text to be closer to english.
> > > 
> > > Ifdefs in ti-bandgap.h are not neccessary, as users have #ifdefs,
> > > already.
> > > 
> > > Signed-off-by: Pavel Machek <pavel@ucw.cz>
> > 
> > You need to update the driver device tree binding documentation. Please
> > include an example of its usage there.
> > 
> > Also, a separate patch with the required DT changes is always
> > welcome.
> 
> I can do it, but can you merge:
> 
> Date: Sun, 18 Jan 2015 21:24:47 +0100
> From: Pavel Machek <pavel@ucw.cz>
> Subject: [PATCHv2] ti-soc-thermal: request temperature periodically if
> hw can't do that itself
> 
> 
> Date: Sun, 18 Jan 2015 21:20:51 +0100
> From: Pavel Machek <pavel@ucw.cz>
> Subject: [PATCHv2] ti-soc-thermal: implement eocz bit to make driver
> useful on omap3
> 
> Date: Sun, 18 Jan 2015 21:17:10 +0100
> From: Pavel Machek <pavel@ucw.cz>
> Subject: [PATCHv2] cleanup ti-soc-thermal
> 
> First? They are nicely split, as you requested, and I already have too
> many patches in flight.
> 
> Thanks for the comments, I'll fix them in my local tree.
> 								Pavel

Somehow I really thought I already sent those above. I really apologize
for the inconvenience. It seams like they've fallen into the cracks.


I will check those and apply accordingly.

> 
> -- 
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Patch
diff mbox

diff --git a/drivers/thermal/ti-soc-thermal/Kconfig b/drivers/thermal/ti-soc-thermal/Kconfig
index bd4c7be..65c478e 100644
--- a/drivers/thermal/ti-soc-thermal/Kconfig
+++ b/drivers/thermal/ti-soc-thermal/Kconfig
@@ -21,13 +21,28 @@  config TI_THERMAL
 	  This includes trip points definitions, extrapolation rules and
 	  CPU cooling device bindings.
 
+config OMAP3_THERMAL
+	bool "Texas Instruments OMAP3 thermal support"
+	depends on TI_SOC_THERMAL
+	depends on ARCH_OMAP3
+	help
+	  If you say yes here you get thermal support for the Texas Instruments
+	  OMAP3 SoC family. The current chips supported are:
+	   - OMAP3430
+
+	  OMAP3 chips normally don't need thermal management, and sensors in
+	  this generation are not very accurate, nor they are very close to
+	  the important hotspots.
+
+	  Say 'N' here.
+
 config OMAP4_THERMAL
 	bool "Texas Instruments OMAP4 thermal support"
 	depends on TI_SOC_THERMAL
 	depends on ARCH_OMAP4
 	help
 	  If you say yes here you get thermal support for the Texas Instruments
-	  OMAP4 SoC family. The current chip supported are:
+	  OMAP4 SoC family. The current chips supported are:
 	   - OMAP4430
 	   - OMAP4460
 	   - OMAP4470
@@ -41,7 +56,7 @@  config OMAP5_THERMAL
 	depends on SOC_OMAP5
 	help
 	  If you say yes here you get thermal support for the Texas Instruments
-	  OMAP5 SoC family. The current chip supported are:
+	  OMAP5 SoC family. The current chips supported are:
 	   - OMAP5430
 
 	  This includes alert interrupts generation and also the TSHUT
@@ -53,7 +68,7 @@  config DRA752_THERMAL
 	depends on SOC_DRA7XX
 	help
 	  If you say yes here you get thermal support for the Texas Instruments
-	  DRA752 SoC family. The current chip supported are:
+	  DRA752 SoC family. The current chips supported are:
 	   - DRA752
 
 	  This includes alert interrupts generation and also the TSHUT
diff --git a/drivers/thermal/ti-soc-thermal/Makefile b/drivers/thermal/ti-soc-thermal/Makefile
index 1226b24..0f89bdf 100644
--- a/drivers/thermal/ti-soc-thermal/Makefile
+++ b/drivers/thermal/ti-soc-thermal/Makefile
@@ -2,5 +2,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-$(CONFIG_DRA752_THERMAL)	+= dra752-thermal-data.o
+ti-soc-thermal-$(CONFIG_OMAP3_THERMAL)	+= omap3-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/omap3-thermal-data.c b/drivers/thermal/ti-soc-thermal/omap3-thermal-data.c
new file mode 100644
index 0000000..5cee2a35
--- /dev/null
+++ b/drivers/thermal/ti-soc-thermal/omap3-thermal-data.c
@@ -0,0 +1,103 @@ 
+/*
+ * OMAP3 thermal driver.
+ *
+ * Copyright (C) 2011-2012 Texas Instruments Inc.
+ * Copyright (C) 2014 Pavel Machek <pavel@ucw.cz>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Note
+ * http://www.ti.com/lit/er/sprz278f/sprz278f.pdf "Advisory
+ * 3.1.1.186 MMC OCP Clock Not Gated When Thermal Sensor Is Used"
+ *
+ * Also TI says:
+ * Just be careful when you try to make thermal policy like decisions
+ * based on this sensor. Placement of the sensor w.r.t the actual logic
+ * generating heat has to be a factor as well. If you are just looking
+ * for an approximation temperature (thermometerish kind), you might be
+ * ok with this. I am not sure we'd find any TI data around this.. just a
+ * heads up.
+ */
+
+#include "ti-thermal.h"
+#include "ti-bandgap.h"
+
+/*
+ * OMAP34XX has one instance of thermal sensor for MPU
+ * need to describe the individual bit fields
+ */
+static struct temp_sensor_registers
+omap34xx_mpu_temp_sensor_registers = {
+	.temp_sensor_ctrl = 0,
+	.bgap_soc_mask = BIT(8),
+	.bgap_eocz_mask = BIT(7),
+	.bgap_dtemp_mask = 0x7f,
+
+	.bgap_mode_ctrl = 0,
+	.mode_ctrl_mask = BIT(9),
+};
+
+/* Thresholds and limits for OMAP34XX MPU temperature sensor */
+static struct temp_sensor_data omap34xx_mpu_temp_sensor_data = {
+	.min_freq = 32768,
+	.max_freq = 32768,
+	.max_temp = -99000,
+	.min_temp = 99000,
+	.hyst_val = 5000,
+};
+
+/*
+ * Temperature values in milli degree celsius
+ */
+static const int
+omap34xx_adc_to_temp[128] = {
+	-40000, -40000, -40000, -40000, -40000, -39000, -38000, -36000,
+	-34000, -32000, -31000,	-29000, -28000, -26000, -25000, -24000,
+	-22000, -21000, -19000, -18000, -17000, -15000,	-14000, -12000,
+	-11000, -9000, -8000, -7000, -5000, -4000, -2000, -1000, 0000,
+	1000, 3000, 4000, 5000, 7000, 8000, 10000, 11000, 13000, 14000,
+	15000, 17000, 18000, 20000, 21000, 22000, 24000, 25000, 27000,
+	28000, 30000, 31000, 32000, 34000, 35000, 37000, 38000, 39000,
+	41000, 42000, 44000, 45000, 47000, 48000, 49000, 51000, 52000,
+	53000, 55000, 56000, 58000, 59000, 60000, 62000, 63000, 65000,
+	66000, 67000, 69000, 70000, 72000, 73000, 74000, 76000, 77000,
+	79000, 80000, 81000, 83000, 84000, 85000, 87000, 88000, 89000,
+	91000, 92000, 94000, 95000, 96000, 98000, 99000, 100000,
+	102000, 103000, 105000, 106000, 107000, 109000, 110000, 111000,
+	113000, 114000, 116000, 117000, 118000, 120000, 121000, 122000,
+	124000, 124000, 125000, 125000, 125000, 125000,	125000
+};
+
+/* OMAP34XX data */
+const struct ti_bandgap_data omap34xx_data = {
+	.features = TI_BANDGAP_FEATURE_CLK_CTRL /* | TI_BANDGAP_FEATURE_MODE_CONFIG */,
+	.fclock_name = "ts_fck",
+	.div_ck_name = "ts_fck",
+	.conv_table = omap34xx_adc_to_temp,
+	.adc_start_val = 0,
+	.adc_end_val = 127,
+	.expose_sensor = ti_thermal_expose_sensor,
+	.remove_sensor = ti_thermal_remove_sensor,
+
+	.sensors = {
+		{
+		.registers = &omap34xx_mpu_temp_sensor_registers,
+		.ts_data = &omap34xx_mpu_temp_sensor_data,
+		.domain = "cpu",
+		.slope = 0,
+		.constant = 20000,
+		.slope_pcb = 0,
+		.constant_pcb = 20000,
+		.register_cooling = NULL,
+		.unregister_cooling = NULL,
+		},
+	},
+	.sensor_count = 1,
+};
diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
index 634b6ce..2fde78c 100644
--- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
@@ -1509,6 +1510,12 @@  static SIMPLE_DEV_PM_OPS(ti_bandgap_dev_pm_ops, ti_bandgap_suspend,
 #endif
 
 static const struct of_device_id of_ti_bandgap_match[] = {
+#ifdef CONFIG_OMAP3_THERMAL
+	{
+		.compatible = "ti,omap34xx-bandgap",
+		.data = (void *)&omap34xx_data,
+	},
+#endif
 #ifdef CONFIG_OMAP4_THERMAL
 	{
 		.compatible = "ti,omap4430-bandgap",
diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.h b/drivers/thermal/ti-soc-thermal/ti-bandgap.h
index b3adf72..9ba9a6b 100644
--- a/drivers/thermal/ti-soc-thermal/ti-bandgap.h
+++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.h
@@ -331,6 +331,7 @@  struct ti_temp_sensor {
 #define TI_BANDGAP_FEATURE_FREEZE_BIT		BIT(7)
 #define TI_BANDGAP_FEATURE_COUNTER_DELAY	BIT(8)
 #define TI_BANDGAP_FEATURE_HISTORY_BUFFER	BIT(9)
+#define TI_BANDGAP_FEATURE_UNRELIABLE		BIT(10)
 #define TI_BANDGAP_HAS(b, f)			\
 			((b)->conf->features & TI_BANDGAP_FEATURE_ ## f)
 
@@ -384,25 +385,10 @@  int ti_bandgap_set_sensor_data(struct ti_bandgap *bgp, int id, void *data);
 void *ti_bandgap_get_sensor_data(struct ti_bandgap *bgp, int id);
 int ti_bandgap_get_trend(struct ti_bandgap *bgp, int id, int *trend);
 
-#ifdef CONFIG_OMAP4_THERMAL
+extern const struct ti_bandgap_data omap34xx_data;
 extern const struct ti_bandgap_data omap4430_data;
 extern const struct ti_bandgap_data omap4460_data;
 extern const struct ti_bandgap_data omap4470_data;
-#else
-#define omap4430_data					NULL
-#define omap4460_data					NULL
-#define omap4470_data					NULL
-#endif
-
-#ifdef CONFIG_OMAP5_THERMAL
 extern const struct ti_bandgap_data omap5430_data;
-#else
-#define omap5430_data					NULL
-#endif
-
-#ifdef CONFIG_DRA752_THERMAL
 extern const struct ti_bandgap_data dra752_data;
-#else
-#define dra752_data					NULL
-#endif
 #endif