Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c75960aa authored by Zhang Rui's avatar Zhang Rui
Browse files

Merge branch 'linus' of... 

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
parents 049e6dde 8fb2b9ac

Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt

+14 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ to the silicon temperature. 


Required properties:

- compatible : Should be:

  - "ti,omap34xx-bandgap" : for OMAP34xx bandgap

  - "ti,omap36xx-bandgap" : for OMAP36xx bandgap

  - "ti,omap4430-bandgap" : for OMAP4430 bandgap

  - "ti,omap4460-bandgap" : for OMAP4460 bandgap

  - "ti,omap4470-bandgap" : for OMAP4470 bandgap
@@ -25,6 +27,18 @@ to each bandgap version, because the mapping may change from 
soc to soc, apart of depending on available features.



Example:

OMAP34xx:

bandgap {

	reg = <0x48002524 0x4>;

	compatible = "ti,omap34xx-bandgap";

};



OMAP36xx:

bandgap {

	reg = <0x48002524 0x4>;

	compatible = "ti,omap36xx-bandgap";

};



OMAP4430:

bandgap {

	reg = <0x4a002260 0x4 0x4a00232C 0x4>;

drivers/base/power/opp.c

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static struct device_opp *_find_device_opp(struct device *dev) 
}



/**

 * dev_pm_opp_get_voltage() - Gets the voltage corresponding to an available opp

 * dev_pm_opp_get_voltage() - Gets the voltage corresponding to an opp

 * @opp:	opp for which voltage has to be returned for

 *

 * Return: voltage in micro volt corresponding to the opp, else
@@ -239,7 +239,7 @@ unsigned long dev_pm_opp_get_voltage(struct dev_pm_opp *opp) 
	opp_rcu_lockdep_assert();



	tmp_opp = rcu_dereference(opp);

	if (IS_ERR_OR_NULL(tmp_opp) || !tmp_opp->available)

	if (IS_ERR_OR_NULL(tmp_opp))

		pr_err("%s: Invalid parameters\n", __func__);

	else

		v = tmp_opp->u_volt;

drivers/thermal/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -147,6 +147,20 @@ config CLOCK_THERMAL 
	  device that is configured to use this cooling mechanism will be

	  controlled to reduce clock frequency whenever temperature is high.



config DEVFREQ_THERMAL

	bool "Generic device cooling support"

	depends on PM_DEVFREQ

	depends on PM_OPP

	help

	  This implements the generic devfreq cooling mechanism through

	  frequency reduction for devices using devfreq.



	  This will throttle the device by limiting the maximum allowed DVFS

	  frequency corresponding to the cooling level.



	  In order to use the power extensions of the cooling device,

	  devfreq should use the simple_ondemand governor.



	  If you want this support, you should say Y here.



config THERMAL_EMULATION

drivers/thermal/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ thermal_sys-$(CONFIG_CPU_THERMAL) += cpu_cooling.o 
# clock cooling

thermal_sys-$(CONFIG_CLOCK_THERMAL)	+= clock_cooling.o



# devfreq cooling

thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o



# platform thermal drivers

obj-$(CONFIG_QCOM_SPMI_TEMP_ALARM)	+= qcom-spmi-temp-alarm.o

obj-$(CONFIG_SPEAR_THERMAL)	+= spear_thermal.o

drivers/thermal/armada_thermal.c

+3 −3
Original line number Diff line number Diff line
@@ -224,9 +224,9 @@ static const struct armada_thermal_data armada380_data = { 
	.is_valid_shift = 10,

	.temp_shift = 0,

	.temp_mask = 0x3ff,

	.coef_b = 2931108200UL,

	.coef_m = 5000000UL,

	.coef_div = 10502,

	.coef_b = 1172499100UL,

	.coef_m = 2000096UL,

	.coef_div = 4201,

	.inverted = true,

};