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

Commit 30072fb9 authored by Zhang Rui's avatar Zhang Rui
Browse files

Merge branches 'for-rc' and 'ti-soc' of .git into next

parents e7cd7886 0c872507 ca0c7114

Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt

+13 −0
Original line number Diff line number Diff line
@@ -57,4 +57,17 @@ bandgap { 
		0x4a002380 0x2c

		0x4a0023C0 0x3c>;

	compatible = "ti,omap5430-bandgap";

	interrupts = <0 126 4>; /* talert */

};



DRA752:

bandgap {

	reg = <0x4a0021e0 0xc

		0x4a00232c 0xc

		0x4a002380 0x2c

		0x4a0023C0 0x3c

		0x4a002564 0x8

		0x4a002574 0x50>;

	compatible = "ti,dra752-bandgap";

	interrupts = <0 126 4>; /* talert */

};

drivers/thermal/cpu_cooling.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int get_property(unsigned int cpu, unsigned long input, 
			continue;



		/* get the frequency order */

		if (freq != CPUFREQ_ENTRY_INVALID && descend != -1)

		if (freq != CPUFREQ_ENTRY_INVALID && descend == -1)

			descend = !!(freq > table[i].frequency);



		freq = table[i].frequency;

drivers/thermal/thermal_core.c

+2 −1
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ int get_tz_trend(struct thermal_zone_device *tz, int trip) 
{

	enum thermal_trend trend;



	if (!tz->ops->get_trend || tz->ops->get_trend(tz, trip, &trend)) {

	if (tz->emul_temperature || !tz->ops->get_trend ||

	    tz->ops->get_trend(tz, trip, &trend)) {

		if (tz->temperature > tz->last_temperature)

			trend = THERMAL_TREND_RAISING;

		else if (tz->temperature < tz->last_temperature)

drivers/thermal/ti-soc-thermal/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -46,3 +46,15 @@ config OMAP5_THERMAL 


	  This includes alert interrupts generation and also the TSHUT

	  support.



config DRA752_THERMAL

	bool "Texas Instruments DRA752 thermal support"

	depends on TI_SOC_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



	  This includes alert interrupts generation and also the TSHUT

	  support.

drivers/thermal/ti-soc-thermal/Makefile

+1 −0
Original line number Diff line number Diff line 
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_OMAP4_THERMAL)	+= omap4-thermal-data.o

ti-soc-thermal-$(CONFIG_OMAP5_THERMAL)	+= omap5-thermal-data.o