Commit 3d883483 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal 

Pull more thermal managament updates from Zhang Rui:
 "Specifics:

   - Exynos thermal driver refactoring.  Several cleanups, code
     optimization, unused symbols removal, and unused feature removal in
     Exynos thermal driver.  Thanks Lukasz for this effort.

   - Exynos thermal driver support to OF thermal.  After the code
     refactoring, the driver earned the support to OF thermal.  Chip
     thermal data were moved from driver code to DTS, reducing the code
     footprint.  Thanks Lukasz for this.

   - After receiving the OF thermal support, the exynos thermal driver
     now must allow modular build.  Thanks Arnd for detecting, reporting
     and fixing this.

   - Exynos thermal driver support to Exynos 7 SoC.  Thanks Abhilash for
     this.

   - Accurate temperature reporting on Rockchip thermal driver, thanks
     to Caesar.

   - Fix on how OF thermal enables its zones, thanks Lukasz for fixing.

   - Fixes in OF thermal examples under Documentation/.  Thanks Srinivas
     for fixing"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  thermal: exynos: Add TMU support for Exynos7 SoC
  dts: Documentation: Add documentation for Exynos7 SoC thermal bindings
  cpufreq: exynos: allow modular build
  thermal: Fix examples in DT documentation
  thermal: exynos: Correct sanity check at exynos_report_trigger() function
  thermal: Kconfig: Remove config for not used EXYNOS_THERMAL_CORE
  thermal: exynos: Remove exynos_tmu_data.c file
  thermal: rockchip: make temperature reporting much more accurate
  thermal: exynos: Remove exynos_thermal_common.[c|h] files
  thermal: samsung: core: Exynos TMU rework to use device tree for configuration
  dts: Documentation: Update exynos-thermal.txt example for Exynos5440
  dts: Documentation: Extending documentation entry for exynos-thermal
  cpufreq: exynos: Use device tree to determine if cpufreq cooling should be registered
  thermal: exynos: Modify exynos thermal code to use device tree for cpu cooling configuration
  thermal: exynos: Provide thermal_exynos.h file to be included in device tree files
  thermal: exynos: cosmetic: Correct comment format
  thermal: of: Enable thermal_zoneX when sensor is correctly added
parents e3a1f6ca 6c247393

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

+21 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
	       "samsung,exynos5420-tmu-ext-triminfo" for TMU channels 2, 3 and 4

			Exynos5420 (Must pass triminfo base and triminfo clock)

	       "samsung,exynos5440-tmu"

	       "samsung,exynos7-tmu"

- interrupt-parent : The phandle for the interrupt controller

- reg : Address range of the thermal registers. For soc's which has multiple

	instances of TMU and some registers are shared across all TMU's like
@@ -32,13 +33,28 @@ 
- clocks : The main clocks for TMU device

	-- 1. operational clock for TMU channel

	-- 2. optional clock to access the shared registers of TMU channel

	-- 3. optional special clock for functional operation

- clock-names : Thermal system clock name

	-- "tmu_apbif" operational clock for current TMU channel

	-- "tmu_triminfo_apbif" clock to access the shared triminfo register

		for current TMU channel

	-- "tmu_sclk" clock for functional operation of the current TMU

		channel

- vtmu-supply: This entry is optional and provides the regulator node supplying

		voltage to TMU. If needed this entry can be placed inside

		board/platform specific dts file.

Following properties are mandatory (depending on SoC):

- samsung,tmu_gain: Gain value for internal TMU operation.

- samsung,tmu_reference_voltage: Value of TMU IP block's reference voltage

- samsung,tmu_noise_cancel_mode: Mode for noise cancellation

- samsung,tmu_efuse_value: Default level of temperature - it is needed when

			   in factory fusing produced wrong value

- samsung,tmu_min_efuse_value: Minimum temperature fused value

- samsung,tmu_max_efuse_value: Maximum temperature fused value

- samsung,tmu_first_point_trim: First point trimming value

- samsung,tmu_second_point_trim: Second point trimming value

- samsung,tmu_default_temp_offset: Default temperature offset

- samsung,tmu_cal_type: Callibration type



Example 1):
@@ -51,6 +67,7 @@ Example 1): 
		clock-names = "tmu_apbif";

		status = "disabled";

		vtmu-supply = <&tmu_regulator_node>;

		#include "exynos4412-tmu-sensor-conf.dtsi"

	};



Example 2):
@@ -61,6 +78,7 @@ Example 2): 
		interrupts = <0 58 0>;

		clocks = <&clock 21>;

		clock-names = "tmu_apbif";

		#include "exynos5440-tmu-sensor-conf.dtsi"

	};



Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
@@ -70,6 +88,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") 
		interrupts = <0 184 0>;

		clocks = <&clock 318>, <&clock 318>;

		clock-names = "tmu_apbif", "tmu_triminfo_apbif";

		#include "exynos4412-tmu-sensor-conf.dtsi"

	};



	tmu_cpu3: tmu@1006c000 {
@@ -78,6 +97,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") 
		interrupts = <0 185 0>;

		clocks = <&clock 318>, <&clock 319>;

		clock-names = "tmu_apbif", "tmu_triminfo_apbif";

		#include "exynos4412-tmu-sensor-conf.dtsi"

	};



	tmu_gpu: tmu@100a0000 {
@@ -86,6 +106,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") 
		interrupts = <0 215 0>;

		clocks = <&clock 319>, <&clock 318>;

		clock-names = "tmu_apbif", "tmu_triminfo_apbif";

		#include "exynos4412-tmu-sensor-conf.dtsi"

	};



Note: For multi-instance tmu each instance should have an alias correctly

Documentation/devicetree/bindings/thermal/thermal.txt

+37 −37
Original line number Diff line number Diff line
@@ -251,24 +251,24 @@ ocp { 
};



thermal-zones {

	cpu-thermal: cpu-thermal {

	cpu_thermal: cpu-thermal {

		polling-delay-passive = <250>; /* milliseconds */

		polling-delay = <1000>; /* milliseconds */



		thermal-sensors = <&bandgap0>;



		trips {

			cpu-alert0: cpu-alert {

			cpu_alert0: cpu-alert0 {

				temperature = <90000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "active";

			};

			cpu-alert1: cpu-alert {

			cpu_alert1: cpu-alert1 {

				temperature = <100000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "passive";

			};

			cpu-crit: cpu-crit {

			cpu_crit: cpu-crit {

				temperature = <125000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "critical";
@@ -277,17 +277,17 @@ thermal-zones { 


		cooling-maps {

			map0 {

				trip = <&cpu-alert0>;

				cooling-device = <&fan0 THERMAL_NO_LIMITS 4>;

				trip = <&cpu_alert0>;

				cooling-device = <&fan0 THERMAL_NO_LIMIT 4>;

			};

			map1 {

				trip = <&cpu-alert1>;

				cooling-device = <&fan0 5 THERMAL_NO_LIMITS>;

				trip = <&cpu_alert1>;

				cooling-device = <&fan0 5 THERMAL_NO_LIMIT>;

			};

			map2 {

				trip = <&cpu-alert1>;

				trip = <&cpu_alert1>;

				cooling-device =

				    <&cpu0 THERMAL_NO_LIMITS THERMAL_NO_LIMITS>;

				    <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;

			};

		};

	};
@@ -298,13 +298,13 @@ used to monitor the zone 'cpu-thermal' using its sole sensor. A fan 
device (fan0) is controlled via I2C bus 1, at address 0x48, and has ten

different cooling states 0-9. It is used to remove the heat out of

the thermal zone 'cpu-thermal' using its cooling states

from its minimum to 4, when it reaches trip point 'cpu-alert0'

from its minimum to 4, when it reaches trip point 'cpu_alert0'

at 90C, as an example of active cooling. The same cooling device is used at

'cpu-alert1', but from 5 to its maximum state. The cpu@0 device is also

'cpu_alert1', but from 5 to its maximum state. The cpu@0 device is also

linked to the same thermal zone, 'cpu-thermal', as a passive cooling device,

using all its cooling states at trip point 'cpu-alert1',

using all its cooling states at trip point 'cpu_alert1',

which is a trip point at 100C. On the thermal zone 'cpu-thermal', at the

temperature of 125C, represented by the trip point 'cpu-crit', the silicon

temperature of 125C, represented by the trip point 'cpu_crit', the silicon

is not reliable anymore.



(b) - IC with several internal sensors
@@ -329,7 +329,7 @@ ocp { 
};



thermal-zones {

	cpu-thermal: cpu-thermal {

	cpu_thermal: cpu-thermal {

		polling-delay-passive = <250>; /* milliseconds */

		polling-delay = <1000>; /* milliseconds */
@@ -338,12 +338,12 @@ thermal-zones { 


		trips {

			/* each zone within the SoC may have its own trips */

			cpu-alert: cpu-alert {

			cpu_alert: cpu-alert {

				temperature = <100000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "passive";

			};

			cpu-crit: cpu-crit {

			cpu_crit: cpu-crit {

				temperature = <125000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "critical";
@@ -356,7 +356,7 @@ thermal-zones { 
		};

	};



	gpu-thermal: gpu-thermal {

	gpu_thermal: gpu-thermal {

		polling-delay-passive = <120>; /* milliseconds */

		polling-delay = <1000>; /* milliseconds */
@@ -365,12 +365,12 @@ thermal-zones { 


		trips {

			/* each zone within the SoC may have its own trips */

			gpu-alert: gpu-alert {

			gpu_alert: gpu-alert {

				temperature = <90000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "passive";

			};

			gpu-crit: gpu-crit {

			gpu_crit: gpu-crit {

				temperature = <105000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "critical";
@@ -383,7 +383,7 @@ thermal-zones { 
		};

	};



	dsp-thermal: dsp-thermal {

	dsp_thermal: dsp-thermal {

		polling-delay-passive = <50>; /* milliseconds */

		polling-delay = <1000>; /* milliseconds */
@@ -392,12 +392,12 @@ thermal-zones { 


		trips {

			/* each zone within the SoC may have its own trips */

			dsp-alert: gpu-alert {

			dsp_alert: dsp-alert {

				temperature = <90000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "passive";

			};

			dsp-crit: gpu-crit {

			dsp_crit: gpu-crit {

				temperature = <135000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "critical";
@@ -457,7 +457,7 @@ ocp { 
};



thermal-zones {

	cpu-thermal: cpu-thermal {

	cpu_thermal: cpu-thermal {

		polling-delay-passive = <250>; /* milliseconds */

		polling-delay = <1000>; /* milliseconds */
@@ -508,7 +508,7 @@ with many sensors and many cooling devices. 
	/*

	 * An IC with several temperature sensor.

	 */

	adc-dummy: sensor@0x50 {

	adc_dummy: sensor@0x50 {

		...

		#thermal-sensor-cells = <1>; /* sensor internal ID */

	};
@@ -520,7 +520,7 @@ thermal-zones { 
		polling-delay = <2500>; /* milliseconds */



				/* sensor       ID */

		thermal-sensors = <&adc-dummy     4>;

		thermal-sensors = <&adc_dummy     4>;



		trips {

			...
@@ -531,14 +531,14 @@ thermal-zones { 
		};

	};



	board-thermal: board-thermal {

	board_thermal: board-thermal {

		polling-delay-passive = <1000>; /* milliseconds */

		polling-delay = <2500>; /* milliseconds */



				/* sensor       ID */

		thermal-sensors = <&adc-dummy     0>, /* pcb top edge */

				  <&adc-dummy     1>, /* lcd */

				  <&adc-dymmy     2>; /* back cover */

		thermal-sensors = <&adc_dummy     0>, /* pcb top edge */

				  <&adc_dummy     1>, /* lcd */

				  <&adc_dummy     2>; /* back cover */

		/*

		 * An array of coefficients describing the sensor

		 * linear relation. E.g.:
@@ -548,22 +548,22 @@ thermal-zones { 


		trips {

			/* Trips are based on resulting linear equation */

			cpu-trip: cpu-trip {

			cpu_trip: cpu-trip {

				temperature = <60000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "passive";

			};

			gpu-trip: gpu-trip {

			gpu_trip: gpu-trip {

				temperature = <55000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "passive";

			}

			lcd-trip: lcp-trip {

			lcd_trip: lcp-trip {

				temperature = <53000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "passive";

			};

			crit-trip: crit-trip {

			crit_trip: crit-trip {

				temperature = <68000>; /* millicelsius */

				hysteresis = <2000>; /* millicelsius */

				type = "critical";
@@ -572,17 +572,17 @@ thermal-zones { 


		cooling-maps {

			map0 {

				trip = <&cpu-trip>;

				trip = <&cpu_trip>;

				cooling-device = <&cpu0 0 2>;

				contribution = <55>;

			};

			map1 {

				trip = <&gpu-trip>;

				trip = <&gpu_trip>;

				cooling-device = <&gpu0 0 2>;

				contribution = <20>;

			};

			map2 {

				trip = <&lcd-trip>;

				trip = <&lcd_trip>;

				cooling-device = <&lcd0 5 10>;

				contribution = <15>;

			};

drivers/cpufreq/Kconfig.arm

+26 −18
Original line number Diff line number Diff line
@@ -26,13 +26,21 @@ config ARM_VEXPRESS_SPC_CPUFREQ 




config ARM_EXYNOS_CPUFREQ

	bool

	tristate "SAMSUNG EXYNOS CPUfreq Driver"

	depends on CPU_EXYNOS4210 || SOC_EXYNOS4212 || SOC_EXYNOS4412 || SOC_EXYNOS5250

	depends on THERMAL

	help

	  This adds the CPUFreq driver for Samsung EXYNOS platforms.

	  Supported SoC versions are:

	     Exynos4210, Exynos4212, Exynos4412, and Exynos5250.



	  If in doubt, say N.



config ARM_EXYNOS4210_CPUFREQ

	bool "SAMSUNG EXYNOS4210"

	depends on CPU_EXYNOS4210

	depends on ARM_EXYNOS_CPUFREQ

	default y

	select ARM_EXYNOS_CPUFREQ

	help

	  This adds the CPUFreq driver for Samsung EXYNOS4210

	  SoC (S5PV310 or S5PC210).
@@ -42,8 +50,8 @@ config ARM_EXYNOS4210_CPUFREQ 
config ARM_EXYNOS4X12_CPUFREQ

	bool "SAMSUNG EXYNOS4x12"

	depends on SOC_EXYNOS4212 || SOC_EXYNOS4412

	depends on ARM_EXYNOS_CPUFREQ

	default y

	select ARM_EXYNOS_CPUFREQ

	help

	  This adds the CPUFreq driver for Samsung EXYNOS4X12

	  SoC (EXYNOS4212 or EXYNOS4412).
@@ -53,28 +61,14 @@ config ARM_EXYNOS4X12_CPUFREQ 
config ARM_EXYNOS5250_CPUFREQ

	bool "SAMSUNG EXYNOS5250"

	depends on SOC_EXYNOS5250

	depends on ARM_EXYNOS_CPUFREQ

	default y

	select ARM_EXYNOS_CPUFREQ

	help

	  This adds the CPUFreq driver for Samsung EXYNOS5250

	  SoC.



	  If in doubt, say N.



config ARM_EXYNOS5440_CPUFREQ

	bool "SAMSUNG EXYNOS5440"

	depends on SOC_EXYNOS5440

	depends on HAVE_CLK && OF

	select PM_OPP

	default y

	help

	  This adds the CPUFreq driver for Samsung EXYNOS5440

	  SoC. The nature of exynos5440 clock controller is

	  different than previous exynos controllers so not using

	  the common exynos framework.



	  If in doubt, say N.



config ARM_EXYNOS_CPU_FREQ_BOOST_SW

	bool "EXYNOS Frequency Overclocking - Software"

	depends on ARM_EXYNOS_CPUFREQ && THERMAL
@@ -90,6 +84,20 @@ config ARM_EXYNOS_CPU_FREQ_BOOST_SW 


	  If in doubt, say N.



config ARM_EXYNOS5440_CPUFREQ

	tristate "SAMSUNG EXYNOS5440"

	depends on SOC_EXYNOS5440

	depends on HAVE_CLK && OF

	select PM_OPP

	default y

	help

	  This adds the CPUFreq driver for Samsung EXYNOS5440

	  SoC. The nature of exynos5440 clock controller is

	  different than previous exynos controllers so not using

	  the common exynos framework.



	  If in doubt, say N.



config ARM_HIGHBANK_CPUFREQ

	tristate "Calxeda Highbank-based"

	depends on ARCH_HIGHBANK && CPUFREQ_DT && REGULATOR

drivers/cpufreq/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -52,10 +52,11 @@ obj-$(CONFIG_ARM_DT_BL_CPUFREQ) += arm_big_little_dt.o 


obj-$(CONFIG_ARCH_DAVINCI)		+= davinci-cpufreq.o

obj-$(CONFIG_UX500_SOC_DB8500)		+= dbx500-cpufreq.o

obj-$(CONFIG_ARM_EXYNOS_CPUFREQ)	+= exynos-cpufreq.o

obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ)	+= exynos4210-cpufreq.o

obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ)	+= exynos4x12-cpufreq.o

obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ)	+= exynos5250-cpufreq.o

obj-$(CONFIG_ARM_EXYNOS_CPUFREQ)	+= arm-exynos-cpufreq.o

arm-exynos-cpufreq-y					:= exynos-cpufreq.o

arm-exynos-cpufreq-$(CONFIG_ARM_EXYNOS4210_CPUFREQ)	+= exynos4210-cpufreq.o

arm-exynos-cpufreq-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ)	+= exynos4x12-cpufreq.o

arm-exynos-cpufreq-$(CONFIG_ARM_EXYNOS5250_CPUFREQ)	+= exynos5250-cpufreq.o

obj-$(CONFIG_ARM_EXYNOS5440_CPUFREQ)	+= exynos5440-cpufreq.o

obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ)	+= highbank-cpufreq.o

obj-$(CONFIG_ARM_IMX6Q_CPUFREQ)		+= imx6q-cpufreq.o

drivers/cpufreq/exynos-cpufreq.c

+32 −1
Original line number Diff line number Diff line
@@ -18,10 +18,13 @@ 
#include <linux/cpufreq.h>

#include <linux/platform_device.h>

#include <linux/of.h>

#include <linux/cpu_cooling.h>

#include <linux/cpu.h>



#include "exynos-cpufreq.h"



static struct exynos_dvfs_info *exynos_info;

static struct thermal_cooling_device *cdev;

static struct regulator *arm_regulator;

static unsigned int locking_frequency;
@@ -156,6 +159,7 @@ static struct cpufreq_driver exynos_driver = { 


static int exynos_cpufreq_probe(struct platform_device *pdev)

{

	struct device_node *cpus, *np;

	int ret = -EINVAL;



	exynos_info = kzalloc(sizeof(*exynos_info), GFP_KERNEL);
@@ -198,9 +202,36 @@ static int exynos_cpufreq_probe(struct platform_device *pdev) 
	/* Done here as we want to capture boot frequency */

	locking_frequency = clk_get_rate(exynos_info->cpu_clk) / 1000;



	if (!cpufreq_register_driver(&exynos_driver))

	ret = cpufreq_register_driver(&exynos_driver);

	if (ret)

		goto err_cpufreq_reg;



	cpus = of_find_node_by_path("/cpus");

	if (!cpus) {

		pr_err("failed to find cpus node\n");

		return 0;

	}



	np = of_get_next_child(cpus, NULL);

	if (!np) {

		pr_err("failed to find cpus child node\n");

		of_node_put(cpus);

		return 0;

	}



	if (of_find_property(np, "#cooling-cells", NULL)) {

		cdev = of_cpufreq_cooling_register(np,

						   cpu_present_mask);

		if (IS_ERR(cdev))

			pr_err("running cpufreq without cooling device: %ld\n",

			       PTR_ERR(cdev));

	}

	of_node_put(np);

	of_node_put(cpus);



	return 0;



err_cpufreq_reg:

	dev_err(&pdev->dev, "failed to register cpufreq driver\n");

	regulator_put(arm_regulator);

err_vdd_arm:

CRA Git | Maintained and supported by SUSTech CRA and CCSE