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

Commit 9245ac20 authored by Zhang Rui's avatar Zhang Rui
Browse files

Merge branches 'thermal-core', 'thermal-intel', 'thermal-soc-fixes' and 'thermal-reorg' into next

parents f37fabb8 7646ff2e 3aa53743 373f91d1

Documentation/devicetree/bindings/thermal/rockchip-thermal.txt

+3 −0
Original line number Diff line number Diff line
@@ -22,10 +22,13 @@ Required properties: 
	      TSADC controller.

- pinctrl-2 : The "sleep" pinctrl state, it will be in for suspend.

- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description.



Optional properties:

- rockchip,hw-tshut-temp : The hardware-controlled shutdown temperature value.

- rockchip,hw-tshut-mode : The hardware-controlled shutdown mode 0:CRU 1:GPIO.

- rockchip,hw-tshut-polarity : The hardware-controlled active polarity 0:LOW

			       1:HIGH.

- rockchip,grf : The phandle of the syscon node for the general register file.



Exiample:

tsadc: tsadc@ff280000 {

drivers/thermal/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -177,8 +177,10 @@ config THERMAL_EMULATION 


config HISI_THERMAL

	tristate "Hisilicon thermal driver"

	depends on (ARCH_HISI && CPU_THERMAL && OF) || COMPILE_TEST

	depends on ARCH_HISI || COMPILE_TEST

	depends on HAS_IOMEM

	depends on OF

	default y

	help

	  Enable this to plug hisilicon's thermal sensor driver into the Linux

	  thermal framework. cpufreq is used as the cooling device to throttle

drivers/thermal/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ 
#



obj-$(CONFIG_THERMAL)		+= thermal_sys.o

thermal_sys-y			+= thermal_core.o

thermal_sys-y			+= thermal_core.o thermal_sysfs.o \

					thermal_helpers.o



# interface to/from other layers providing sensors

thermal_sys-$(CONFIG_THERMAL_HWMON)		+= thermal_hwmon.o

drivers/thermal/db8500_thermal.c

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ static const struct of_device_id db8500_thermal_match[] = { 
	{ .compatible = "stericsson,db8500-thermal" },

	{},

};

MODULE_DEVICE_TABLE(of, db8500_thermal_match);

#endif



static struct platform_driver db8500_thermal_driver = {

drivers/thermal/devfreq_cooling.c

+3 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ get_static_power(struct devfreq_cooling_device *dfc, unsigned long freq) 
		return 0;

	}



	return dfc->power_ops->get_static_power(voltage);

	return dfc->power_ops->get_static_power(df, voltage);

}



/**
@@ -262,7 +262,8 @@ get_dynamic_power(struct devfreq_cooling_device *dfc, unsigned long freq, 
	struct devfreq_cooling_power *dfc_power = dfc->power_ops;



	if (dfc_power->get_dynamic_power)

		return dfc_power->get_dynamic_power(freq, voltage);

		return dfc_power->get_dynamic_power(dfc->devfreq, freq,

						    voltage);



	freq_mhz = freq / 1000000;

	power = (u64)dfc_power->dyn_power_coeff * freq_mhz * voltage * voltage;