Skip to content

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

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
Hide whitespace changes
Inline Side-by-side
Showing with 596 additions and 1090 deletions
Documentation/devicetree/bindings/thermal/exynos-thermal.txt
View file @ 3d883483
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
"samsung,exynos5420-tmu-ext-triminfo" for TMU channels 2, 3 and 4 "samsung,exynos5420-tmu-ext-triminfo" for TMU channels 2, 3 and 4
Exynos5420 (Must pass triminfo base and triminfo clock) Exynos5420 (Must pass triminfo base and triminfo clock)
"samsung,exynos5440-tmu" "samsung,exynos5440-tmu"
"samsung,exynos7-tmu"
- interrupt-parent : The phandle for the interrupt controller - interrupt-parent : The phandle for the interrupt controller
- reg : Address range of the thermal registers. For soc's which has multiple - 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 instances of TMU and some registers are shared across all TMU's like
...@@ -32,13 +33,28 @@ ...@@ -32,13 +33,28 @@
- clocks : The main clocks for TMU device - clocks : The main clocks for TMU device
-- 1. operational clock for TMU channel -- 1. operational clock for TMU channel
-- 2. optional clock to access the shared registers of 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 - clock-names : Thermal system clock name
-- "tmu_apbif" operational clock for current TMU channel -- "tmu_apbif" operational clock for current TMU channel
-- "tmu_triminfo_apbif" clock to access the shared triminfo register -- "tmu_triminfo_apbif" clock to access the shared triminfo register
for current TMU channel 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 - vtmu-supply: This entry is optional and provides the regulator node supplying
voltage to TMU. If needed this entry can be placed inside voltage to TMU. If needed this entry can be placed inside
board/platform specific dts file. 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): Example 1):
...@@ -51,6 +67,7 @@ Example 1): ...@@ -51,6 +67,7 @@ Example 1):
clock-names = "tmu_apbif"; clock-names = "tmu_apbif";
status = "disabled"; status = "disabled";
vtmu-supply = <&tmu_regulator_node>; vtmu-supply = <&tmu_regulator_node>;
#include "exynos4412-tmu-sensor-conf.dtsi"
}; };
Example 2): Example 2):
...@@ -61,6 +78,7 @@ Example 2): ...@@ -61,6 +78,7 @@ Example 2):
interrupts = <0 58 0>; interrupts = <0 58 0>;
clocks = <&clock 21>; clocks = <&clock 21>;
clock-names = "tmu_apbif"; clock-names = "tmu_apbif";
#include "exynos5440-tmu-sensor-conf.dtsi"
}; };
Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
...@@ -70,6 +88,7 @@ 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>; interrupts = <0 184 0>;
clocks = <&clock 318>, <&clock 318>; clocks = <&clock 318>, <&clock 318>;
clock-names = "tmu_apbif", "tmu_triminfo_apbif"; clock-names = "tmu_apbif", "tmu_triminfo_apbif";
#include "exynos4412-tmu-sensor-conf.dtsi"
}; };
tmu_cpu3: tmu@1006c000 { tmu_cpu3: tmu@1006c000 {
...@@ -78,6 +97,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") ...@@ -78,6 +97,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
interrupts = <0 185 0>; interrupts = <0 185 0>;
clocks = <&clock 318>, <&clock 319>; clocks = <&clock 318>, <&clock 319>;
clock-names = "tmu_apbif", "tmu_triminfo_apbif"; clock-names = "tmu_apbif", "tmu_triminfo_apbif";
#include "exynos4412-tmu-sensor-conf.dtsi"
}; };
tmu_gpu: tmu@100a0000 { tmu_gpu: tmu@100a0000 {
...@@ -86,6 +106,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register") ...@@ -86,6 +106,7 @@ Example 3): (In case of Exynos5420 "with misplaced TRIMINFO register")
interrupts = <0 215 0>; interrupts = <0 215 0>;
clocks = <&clock 319>, <&clock 318>; clocks = <&clock 319>, <&clock 318>;
clock-names = "tmu_apbif", "tmu_triminfo_apbif"; 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 Note: For multi-instance tmu each instance should have an alias correctly
......
Documentation/devicetree/bindings/thermal/thermal.txt
View file @ 3d883483
...@@ -251,24 +251,24 @@ ocp { ...@@ -251,24 +251,24 @@ ocp {
}; };
thermal-zones { thermal-zones {
cpu-thermal: cpu-thermal { cpu_thermal: cpu-thermal {
polling-delay-passive = <250>; /* milliseconds */ polling-delay-passive = <250>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */ polling-delay = <1000>; /* milliseconds */
thermal-sensors = <&bandgap0>; thermal-sensors = <&bandgap0>;
trips { trips {
cpu-alert0: cpu-alert { cpu_alert0: cpu-alert0 {
temperature = <90000>; /* millicelsius */ temperature = <90000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "active"; type = "active";
}; };
cpu-alert1: cpu-alert { cpu_alert1: cpu-alert1 {
temperature = <100000>; /* millicelsius */ temperature = <100000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "passive"; type = "passive";
}; };
cpu-crit: cpu-crit { cpu_crit: cpu-crit {
temperature = <125000>; /* millicelsius */ temperature = <125000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "critical"; type = "critical";
...@@ -277,17 +277,17 @@ thermal-zones { ...@@ -277,17 +277,17 @@ thermal-zones {
cooling-maps { cooling-maps {
map0 { map0 {
trip = <&cpu-alert0>; trip = <&cpu_alert0>;
cooling-device = <&fan0 THERMAL_NO_LIMITS 4>; cooling-device = <&fan0 THERMAL_NO_LIMIT 4>;
}; };
map1 { map1 {
trip = <&cpu-alert1>; trip = <&cpu_alert1>;
cooling-device = <&fan0 5 THERMAL_NO_LIMITS>; cooling-device = <&fan0 5 THERMAL_NO_LIMIT>;
}; };
map2 { map2 {
trip = <&cpu-alert1>; trip = <&cpu_alert1>;
cooling-device = 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 ...@@ -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 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 different cooling states 0-9. It is used to remove the heat out of
the thermal zone 'cpu-thermal' using its cooling states 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 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, 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 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. is not reliable anymore.
(b) - IC with several internal sensors (b) - IC with several internal sensors
...@@ -329,7 +329,7 @@ ocp { ...@@ -329,7 +329,7 @@ ocp {
}; };
thermal-zones { thermal-zones {
cpu-thermal: cpu-thermal { cpu_thermal: cpu-thermal {
polling-delay-passive = <250>; /* milliseconds */ polling-delay-passive = <250>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */ polling-delay = <1000>; /* milliseconds */
...@@ -338,12 +338,12 @@ thermal-zones { ...@@ -338,12 +338,12 @@ thermal-zones {
trips { trips {
/* each zone within the SoC may have its own trips */ /* each zone within the SoC may have its own trips */
cpu-alert: cpu-alert { cpu_alert: cpu-alert {
temperature = <100000>; /* millicelsius */ temperature = <100000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "passive"; type = "passive";
}; };
cpu-crit: cpu-crit { cpu_crit: cpu-crit {
temperature = <125000>; /* millicelsius */ temperature = <125000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "critical"; type = "critical";
...@@ -356,7 +356,7 @@ thermal-zones { ...@@ -356,7 +356,7 @@ thermal-zones {
}; };
}; };
gpu-thermal: gpu-thermal { gpu_thermal: gpu-thermal {
polling-delay-passive = <120>; /* milliseconds */ polling-delay-passive = <120>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */ polling-delay = <1000>; /* milliseconds */
...@@ -365,12 +365,12 @@ thermal-zones { ...@@ -365,12 +365,12 @@ thermal-zones {
trips { trips {
/* each zone within the SoC may have its own trips */ /* each zone within the SoC may have its own trips */
gpu-alert: gpu-alert { gpu_alert: gpu-alert {
temperature = <90000>; /* millicelsius */ temperature = <90000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "passive"; type = "passive";
}; };
gpu-crit: gpu-crit { gpu_crit: gpu-crit {
temperature = <105000>; /* millicelsius */ temperature = <105000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "critical"; type = "critical";
...@@ -383,7 +383,7 @@ thermal-zones { ...@@ -383,7 +383,7 @@ thermal-zones {
}; };
}; };
dsp-thermal: dsp-thermal { dsp_thermal: dsp-thermal {
polling-delay-passive = <50>; /* milliseconds */ polling-delay-passive = <50>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */ polling-delay = <1000>; /* milliseconds */
...@@ -392,12 +392,12 @@ thermal-zones { ...@@ -392,12 +392,12 @@ thermal-zones {
trips { trips {
/* each zone within the SoC may have its own trips */ /* each zone within the SoC may have its own trips */
dsp-alert: gpu-alert { dsp_alert: dsp-alert {
temperature = <90000>; /* millicelsius */ temperature = <90000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "passive"; type = "passive";
}; };
dsp-crit: gpu-crit { dsp_crit: gpu-crit {
temperature = <135000>; /* millicelsius */ temperature = <135000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "critical"; type = "critical";
...@@ -457,7 +457,7 @@ ocp { ...@@ -457,7 +457,7 @@ ocp {
}; };
thermal-zones { thermal-zones {
cpu-thermal: cpu-thermal { cpu_thermal: cpu-thermal {
polling-delay-passive = <250>; /* milliseconds */ polling-delay-passive = <250>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */ polling-delay = <1000>; /* milliseconds */
...@@ -508,7 +508,7 @@ with many sensors and many cooling devices. ...@@ -508,7 +508,7 @@ with many sensors and many cooling devices.
/* /*
* An IC with several temperature sensor. * An IC with several temperature sensor.
*/ */
adc-dummy: sensor@0x50 { adc_dummy: sensor@0x50 {
... ...
#thermal-sensor-cells = <1>; /* sensor internal ID */ #thermal-sensor-cells = <1>; /* sensor internal ID */
}; };
...@@ -520,7 +520,7 @@ thermal-zones { ...@@ -520,7 +520,7 @@ thermal-zones {
polling-delay = <2500>; /* milliseconds */ polling-delay = <2500>; /* milliseconds */
/* sensor ID */ /* sensor ID */
thermal-sensors = <&adc-dummy 4>; thermal-sensors = <&adc_dummy 4>;
trips { trips {
... ...
...@@ -531,14 +531,14 @@ thermal-zones { ...@@ -531,14 +531,14 @@ thermal-zones {
}; };
}; };
board-thermal: board-thermal { board_thermal: board-thermal {
polling-delay-passive = <1000>; /* milliseconds */ polling-delay-passive = <1000>; /* milliseconds */
polling-delay = <2500>; /* milliseconds */ polling-delay = <2500>; /* milliseconds */
/* sensor ID */ /* sensor ID */
thermal-sensors = <&adc-dummy 0>, /* pcb top edge */ thermal-sensors = <&adc_dummy 0>, /* pcb top edge */
<&adc-dummy 1>, /* lcd */ <&adc_dummy 1>, /* lcd */
<&adc-dymmy 2>; /* back cover */ <&adc_dummy 2>; /* back cover */
/* /*
* An array of coefficients describing the sensor * An array of coefficients describing the sensor
* linear relation. E.g.: * linear relation. E.g.:
...@@ -548,22 +548,22 @@ thermal-zones { ...@@ -548,22 +548,22 @@ thermal-zones {
trips { trips {
/* Trips are based on resulting linear equation */ /* Trips are based on resulting linear equation */
cpu-trip: cpu-trip { cpu_trip: cpu-trip {
temperature = <60000>; /* millicelsius */ temperature = <60000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "passive"; type = "passive";
}; };
gpu-trip: gpu-trip { gpu_trip: gpu-trip {
temperature = <55000>; /* millicelsius */ temperature = <55000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "passive"; type = "passive";
} }
lcd-trip: lcp-trip { lcd_trip: lcp-trip {
temperature = <53000>; /* millicelsius */ temperature = <53000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "passive"; type = "passive";
}; };
crit-trip: crit-trip { crit_trip: crit-trip {
temperature = <68000>; /* millicelsius */ temperature = <68000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */ hysteresis = <2000>; /* millicelsius */
type = "critical"; type = "critical";
...@@ -572,17 +572,17 @@ thermal-zones { ...@@ -572,17 +572,17 @@ thermal-zones {
cooling-maps { cooling-maps {
map0 { map0 {
trip = <&cpu-trip>; trip = <&cpu_trip>;
cooling-device = <&cpu0 0 2>; cooling-device = <&cpu0 0 2>;
contribution = <55>; contribution = <55>;
}; };
map1 { map1 {
trip = <&gpu-trip>; trip = <&gpu_trip>;
cooling-device = <&gpu0 0 2>; cooling-device = <&gpu0 0 2>;
contribution = <20>; contribution = <20>;
}; };
map2 { map2 {
trip = <&lcd-trip>; trip = <&lcd_trip>;
cooling-device = <&lcd0 5 10>; cooling-device = <&lcd0 5 10>;
contribution = <15>; contribution = <15>;
}; };
......
drivers/cpufreq/Kconfig.arm
View file @ 3d883483
...@@ -26,13 +26,21 @@ config ARM_VEXPRESS_SPC_CPUFREQ ...@@ -26,13 +26,21 @@ config ARM_VEXPRESS_SPC_CPUFREQ
config ARM_EXYNOS_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 config ARM_EXYNOS4210_CPUFREQ
bool "SAMSUNG EXYNOS4210" bool "SAMSUNG EXYNOS4210"
depends on CPU_EXYNOS4210 depends on CPU_EXYNOS4210
depends on ARM_EXYNOS_CPUFREQ
default y default y
select ARM_EXYNOS_CPUFREQ
help help
This adds the CPUFreq driver for Samsung EXYNOS4210 This adds the CPUFreq driver for Samsung EXYNOS4210
SoC (S5PV310 or S5PC210). SoC (S5PV310 or S5PC210).
...@@ -42,8 +50,8 @@ config ARM_EXYNOS4210_CPUFREQ ...@@ -42,8 +50,8 @@ config ARM_EXYNOS4210_CPUFREQ
config ARM_EXYNOS4X12_CPUFREQ config ARM_EXYNOS4X12_CPUFREQ
bool "SAMSUNG EXYNOS4x12" bool "SAMSUNG EXYNOS4x12"
depends on SOC_EXYNOS4212 || SOC_EXYNOS4412 depends on SOC_EXYNOS4212 || SOC_EXYNOS4412
depends on ARM_EXYNOS_CPUFREQ
default y default y
select ARM_EXYNOS_CPUFREQ
help help
This adds the CPUFreq driver for Samsung EXYNOS4X12 This adds the CPUFreq driver for Samsung EXYNOS4X12
SoC (EXYNOS4212 or EXYNOS4412). SoC (EXYNOS4212 or EXYNOS4412).
...@@ -53,28 +61,14 @@ config ARM_EXYNOS4X12_CPUFREQ ...@@ -53,28 +61,14 @@ config ARM_EXYNOS4X12_CPUFREQ
config ARM_EXYNOS5250_CPUFREQ config ARM_EXYNOS5250_CPUFREQ
bool "SAMSUNG EXYNOS5250" bool "SAMSUNG EXYNOS5250"
depends on SOC_EXYNOS5250 depends on SOC_EXYNOS5250
depends on ARM_EXYNOS_CPUFREQ
default y default y
select ARM_EXYNOS_CPUFREQ
help help
This adds the CPUFreq driver for Samsung EXYNOS5250 This adds the CPUFreq driver for Samsung EXYNOS5250
SoC. SoC.
If in doubt, say N. 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 config ARM_EXYNOS_CPU_FREQ_BOOST_SW
bool "EXYNOS Frequency Overclocking - Software" bool "EXYNOS Frequency Overclocking - Software"
depends on ARM_EXYNOS_CPUFREQ && THERMAL depends on ARM_EXYNOS_CPUFREQ && THERMAL
...@@ -90,6 +84,20 @@ config ARM_EXYNOS_CPU_FREQ_BOOST_SW ...@@ -90,6 +84,20 @@ config ARM_EXYNOS_CPU_FREQ_BOOST_SW
If in doubt, say N. 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 config ARM_HIGHBANK_CPUFREQ
tristate "Calxeda Highbank-based" tristate "Calxeda Highbank-based"
depends on ARCH_HIGHBANK && CPUFREQ_DT && REGULATOR depends on ARCH_HIGHBANK && CPUFREQ_DT && REGULATOR
......
drivers/cpufreq/Makefile
View file @ 3d883483
...@@ -52,10 +52,11 @@ obj-$(CONFIG_ARM_DT_BL_CPUFREQ) += arm_big_little_dt.o ...@@ -52,10 +52,11 @@ obj-$(CONFIG_ARM_DT_BL_CPUFREQ) += arm_big_little_dt.o
obj-$(CONFIG_ARCH_DAVINCI) += davinci-cpufreq.o obj-$(CONFIG_ARCH_DAVINCI) += davinci-cpufreq.o
obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o obj-$(CONFIG_UX500_SOC_DB8500) += dbx500-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += exynos-cpufreq.o obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += arm-exynos-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o arm-exynos-cpufreq-y := exynos-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o arm-exynos-cpufreq-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-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_EXYNOS5440_CPUFREQ) += exynos5440-cpufreq.o
obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o
obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o
......
drivers/cpufreq/exynos-cpufreq.c
View file @ 3d883483
...@@ -18,10 +18,13 @@ ...@@ -18,10 +18,13 @@
#include <linux/cpufreq.h> #include <linux/cpufreq.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/cpu_cooling.h>
#include <linux/cpu.h>
#include "exynos-cpufreq.h" #include "exynos-cpufreq.h"
static struct exynos_dvfs_info *exynos_info; static struct exynos_dvfs_info *exynos_info;
static struct thermal_cooling_device *cdev;
static struct regulator *arm_regulator; static struct regulator *arm_regulator;
static unsigned int locking_frequency; static unsigned int locking_frequency;
...@@ -156,6 +159,7 @@ static struct cpufreq_driver exynos_driver = { ...@@ -156,6 +159,7 @@ static struct cpufreq_driver exynos_driver = {
static int exynos_cpufreq_probe(struct platform_device *pdev) static int exynos_cpufreq_probe(struct platform_device *pdev)
{ {
struct device_node *cpus, *np;
int ret = -EINVAL; int ret = -EINVAL;
exynos_info = kzalloc(sizeof(*exynos_info), GFP_KERNEL); exynos_info = kzalloc(sizeof(*exynos_info), GFP_KERNEL);
...@@ -198,9 +202,36 @@ static int exynos_cpufreq_probe(struct platform_device *pdev) ...@@ -198,9 +202,36 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
/* Done here as we want to capture boot frequency */ /* Done here as we want to capture boot frequency */
locking_frequency = clk_get_rate(exynos_info->cpu_clk) / 1000; 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; 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"); dev_err(&pdev->dev, "failed to register cpufreq driver\n");
regulator_put(arm_regulator); regulator_put(arm_regulator);
err_vdd_arm: err_vdd_arm:
......
drivers/thermal/of-thermal.c
View file @ 3d883483
...@@ -497,6 +497,9 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data, ...@@ -497,6 +497,9 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, void *data,
if (sensor_specs.np == sensor_np && id == sensor_id) { if (sensor_specs.np == sensor_np && id == sensor_id) {
tzd = thermal_zone_of_add_sensor(child, sensor_np, tzd = thermal_zone_of_add_sensor(child, sensor_np,
data, ops); data, ops);
if (!IS_ERR(tzd))
tzd->ops->set_mode(tzd, THERMAL_DEVICE_ENABLED);
of_node_put(sensor_specs.np); of_node_put(sensor_specs.np);
of_node_put(child); of_node_put(child);
goto exit; goto exit;
......
drivers/thermal/rockchip_thermal.c
View file @ 3d883483
...@@ -193,19 +193,20 @@ static u32 rk_tsadcv2_temp_to_code(long temp) ...@@ -193,19 +193,20 @@ static u32 rk_tsadcv2_temp_to_code(long temp)
static long rk_tsadcv2_code_to_temp(u32 code) static long rk_tsadcv2_code_to_temp(u32 code)
{ {
int high, low, mid; unsigned int low = 0;
unsigned int high = ARRAY_SIZE(v2_code_table) - 1;
low = 0; unsigned int mid = (low + high) / 2;
high = ARRAY_SIZE(v2_code_table) - 1; unsigned int num;
mid = (high + low) / 2; unsigned long denom;
if (code > v2_code_table[low].code || code < v2_code_table[high].code) /* Invalid code, return -EAGAIN */
return 125000; /* No code available, return max temperature */ if (code > TSADCV2_DATA_MASK)
return -EAGAIN;
while (low <= high) { while (low <= high && mid) {
if (code >= v2_code_table[mid].code && code < if (code >= v2_code_table[mid].code &&
v2_code_table[mid - 1].code) code < v2_code_table[mid - 1].code)
return v2_code_table[mid].temp; break;
else if (code < v2_code_table[mid].code) else if (code < v2_code_table[mid].code)
low = mid + 1; low = mid + 1;
else else
...@@ -213,7 +214,16 @@ static long rk_tsadcv2_code_to_temp(u32 code) ...@@ -213,7 +214,16 @@ static long rk_tsadcv2_code_to_temp(u32 code)
mid = (low + high) / 2; mid = (low + high) / 2;
} }
return 125000; /*
* The 5C granularity provided by the table is too much. Let's
* assume that the relationship between sensor readings and
* temperature between 2 table entries is linear and interpolate
* to produce less granular result.
*/
num = v2_code_table[mid].temp - v2_code_table[mid - 1].temp;
num *= v2_code_table[mid - 1].code - code;
denom = v2_code_table[mid - 1].code - v2_code_table[mid].code;
return v2_code_table[mid - 1].temp + (num / denom);
} }
/** /**
......
drivers/thermal/samsung/Kconfig
View file @ 3d883483
...@@ -7,12 +7,3 @@ config EXYNOS_THERMAL ...@@ -7,12 +7,3 @@ config EXYNOS_THERMAL
the TMU, reports temperature and handles cooling action if defined. the TMU, reports temperature and handles cooling action if defined.
This driver uses the Exynos core thermal APIs and TMU configuration This driver uses the Exynos core thermal APIs and TMU configuration
data from the supported SoCs. data from the supported SoCs.
config EXYNOS_THERMAL_CORE
bool "Core thermal framework support for EXYNOS SOCs"
depends on EXYNOS_THERMAL
help
If you say yes here you get support for EXYNOS TMU
(Thermal Management Unit) common registration/unregistration
functions to the core thermal layer and also to use the generic
CPU cooling APIs.
drivers/thermal/samsung/Makefile
View file @ 3d883483
...@@ -3,5 +3,3 @@ ...@@ -3,5 +3,3 @@
# #
obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o obj-$(CONFIG_EXYNOS_THERMAL) += exynos_thermal.o
exynos_thermal-y := exynos_tmu.o exynos_thermal-y := exynos_tmu.o
exynos_thermal-y += exynos_tmu_data.o
exynos_thermal-$(CONFIG_EXYNOS_THERMAL_CORE) += exynos_thermal_common.o
drivers/thermal/samsung/exynos_thermal_common.c deleted 100644 → 0
View file @ e3a1f6ca
/*
* exynos_thermal_common.c - Samsung EXYNOS common thermal file
*
* Copyright (C) 2013 Samsung Electronics
* Amit Daniel Kachhap <amit.daniel@samsung.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* 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.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#include <linux/cpu_cooling.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/thermal.h>
#include "exynos_thermal_common.h"
struct exynos_thermal_zone {
enum thermal_device_mode mode;
struct thermal_zone_device *therm_dev;
struct thermal_cooling_device *cool_dev[MAX_COOLING_DEVICE];
unsigned int cool_dev_size;
struct platform_device *exynos4_dev;
struct thermal_sensor_conf *sensor_conf;
bool bind;
};
/* Get mode callback functions for thermal zone */
static int exynos_get_mode(struct thermal_zone_device *thermal,
enum thermal_device_mode *mode)
{
struct exynos_thermal_zone *th_zone = thermal->devdata;
if (th_zone)
*mode = th_zone->mode;
return 0;
}
/* Set mode callback functions for thermal zone */
static int exynos_set_mode(struct thermal_zone_device *thermal,
enum thermal_device_mode mode)
{
struct exynos_thermal_zone *th_zone = thermal->devdata;
if (!th_zone) {
dev_err(&thermal->device,
"thermal zone not registered\n");
return 0;
}
mutex_lock(&thermal->lock);
if (mode == THERMAL_DEVICE_ENABLED &&
!th_zone->sensor_conf->trip_data.trigger_falling)
thermal->polling_delay = IDLE_INTERVAL;
else
thermal->polling_delay = 0;
mutex_unlock(&thermal->lock);
th_zone->mode = mode;
thermal_zone_device_update(thermal);
dev_dbg(th_zone->sensor_conf->dev,
"thermal polling set for duration=%d msec\n",
thermal->polling_delay);
return 0;
}
/* Get trip type callback functions for thermal zone */
static int exynos_get_trip_type(struct thermal_zone_device *thermal, int trip,
enum thermal_trip_type *type)
{
struct exynos_thermal_zone *th_zone = thermal->devdata;
int max_trip = th_zone->sensor_conf->trip_data.trip_count;
int trip_type;
if (trip < 0 || trip >= max_trip)
return -EINVAL;
trip_type = th_zone->sensor_conf->trip_data.trip_type[trip];
if (trip_type == SW_TRIP)
*type = THERMAL_TRIP_CRITICAL;
else if (trip_type == THROTTLE_ACTIVE)
*type = THERMAL_TRIP_ACTIVE;
else if (trip_type == THROTTLE_PASSIVE)
*type = THERMAL_TRIP_PASSIVE;
else
return -EINVAL;
return 0;
}
/* Get trip temperature callback functions for thermal zone */
static int exynos_get_trip_temp(struct thermal_zone_device *thermal, int trip,
unsigned long *temp)
{
struct exynos_thermal_zone *th_zone = thermal->devdata;
int max_trip = th_zone->sensor_conf->trip_data.trip_count;
if (trip < 0 || trip >= max_trip)
return -EINVAL;
*temp = th_zone->sensor_conf->trip_data.trip_val[trip];
/* convert the temperature into millicelsius */
*temp = *temp * MCELSIUS;
return 0;
}
/* Get critical temperature callback functions for thermal zone */
static int exynos_get_crit_temp(struct thermal_zone_device *thermal,
unsigned long *temp)
{
struct exynos_thermal_zone *th_zone = thermal->devdata;
int max_trip = th_zone->sensor_conf->trip_data.trip_count;
/* Get the temp of highest trip*/
return exynos_get_trip_temp(thermal, max_trip - 1, temp);
}
/* Bind callback functions for thermal zone */
static int exynos_bind(struct thermal_zone_device *thermal,
struct thermal_cooling_device *cdev)
{
int ret = 0, i, tab_size, level;
struct freq_clip_table *tab_ptr, *clip_data;
struct exynos_thermal_zone *th_zone = thermal->devdata;
struct thermal_sensor_conf *data = th_zone->sensor_conf;
tab_ptr = (struct freq_clip_table *)data->cooling_data.freq_data;
tab_size = data->cooling_data.freq_clip_count;
if (tab_ptr == NULL || tab_size == 0)
return 0;
/* find the cooling device registered*/
for (i = 0; i < th_zone->cool_dev_size; i++)
if (cdev == th_zone->cool_dev[i])
break;
/* No matching cooling device */
if (i == th_zone->cool_dev_size)
return 0;
/* Bind the thermal zone to the cpufreq cooling device */
for (i = 0; i < tab_size; i++) {
clip_data = (struct freq_clip_table *)&(tab_ptr[i]);
level = cpufreq_cooling_get_level(0, clip_data->freq_clip_max);
if (level == THERMAL_CSTATE_INVALID)
return 0;
switch (GET_ZONE(i)) {
case MONITOR_ZONE:
case WARN_ZONE:
if (thermal_zone_bind_cooling_device(thermal, i, cdev,
level, 0)) {
dev_err(data->dev,
"error unbinding cdev inst=%d\n", i);
ret = -EINVAL;
}
th_zone->bind = true;
break;
default:
ret = -EINVAL;
}
}
return ret;
}
/* Unbind callback functions for thermal zone */
static int exynos_unbind(struct thermal_zone_device *thermal,
struct thermal_cooling_device *cdev)
{
int ret = 0, i, tab_size;
struct exynos_thermal_zone *th_zone = thermal->devdata;
struct thermal_sensor_conf *data = th_zone->sensor_conf;
if (th_zone->bind == false)
return 0;
tab_size = data->cooling_data.freq_clip_count;
if (tab_size == 0)
return 0;
/* find the cooling device registered*/
for (i = 0; i < th_zone->cool_dev_size; i++)
if (cdev == th_zone->cool_dev[i])
break;
/* No matching cooling device */
if (i == th_zone->cool_dev_size)
return 0;
/* Bind the thermal zone to the cpufreq cooling device */
for (i = 0; i < tab_size; i++) {
switch (GET_ZONE(i)) {
case MONITOR_ZONE:
case WARN_ZONE:
if (thermal_zone_unbind_cooling_device(thermal, i,
cdev)) {
dev_err(data->dev,
"error unbinding cdev inst=%d\n", i);
ret = -EINVAL;
}
th_zone->bind = false;
break;
default:
ret = -EINVAL;
}
}
return ret;
}
/* Get temperature callback functions for thermal zone */
static int exynos_get_temp(struct thermal_zone_device *thermal,
unsigned long *temp)
{
struct exynos_thermal_zone *th_zone = thermal->devdata;
void *data;
if (!th_zone->sensor_conf) {
dev_err(&thermal->device,
"Temperature sensor not initialised\n");
return -EINVAL;
}
data = th_zone->sensor_conf->driver_data;
*temp = th_zone->sensor_conf->read_temperature(data);
/* convert the temperature into millicelsius */
*temp = *temp * MCELSIUS;
return 0;
}
/* Get temperature callback functions for thermal zone */
static int exynos_set_emul_temp(struct thermal_zone_device *thermal,
unsigned long temp)
{
void *data;
int ret = -EINVAL;
struct exynos_thermal_zone *th_zone = thermal->devdata;
if (!th_zone->sensor_conf) {
dev_err(&thermal->device,
"Temperature sensor not initialised\n");
return -EINVAL;
}
data = th_zone->sensor_conf->driver_data;
if (th_zone->sensor_conf->write_emul_temp)
ret = th_zone->sensor_conf->write_emul_temp(data, temp);
return ret;
}
/* Get the temperature trend */
static int exynos_get_trend(struct thermal_zone_device *thermal,
int trip, enum thermal_trend *trend)
{
int ret;
unsigned long trip_temp;
ret = exynos_get_trip_temp(thermal, trip, &trip_temp);
if (ret < 0)
return ret;
if (thermal->temperature >= trip_temp)
*trend = THERMAL_TREND_RAISE_FULL;
else
*trend = THERMAL_TREND_DROP_FULL;
return 0;
}
/* Operation callback functions for thermal zone */
static struct thermal_zone_device_ops exynos_dev_ops = {
.bind = exynos_bind,
.unbind = exynos_unbind,
.get_temp = exynos_get_temp,
.set_emul_temp = exynos_set_emul_temp,
.get_trend = exynos_get_trend,
.get_mode = exynos_get_mode,
.set_mode = exynos_set_mode,
.get_trip_type = exynos_get_trip_type,
.get_trip_temp = exynos_get_trip_temp,
.get_crit_temp = exynos_get_crit_temp,
};
/*
* This function may be called from interrupt based temperature sensor
* when threshold is changed.
*/
void exynos_report_trigger(struct thermal_sensor_conf *conf)
{
unsigned int i;
char data[10];
char *envp[] = { data, NULL };
struct exynos_thermal_zone *th_zone;
if (!conf || !conf->pzone_data) {
pr_err("Invalid temperature sensor configuration data\n");
return;
}
th_zone = conf->pzone_data;
if (th_zone->bind == false) {
for (i = 0; i < th_zone->cool_dev_size; i++) {
if (!th_zone->cool_dev[i])
continue;
exynos_bind(th_zone->therm_dev,
th_zone->cool_dev[i]);
}
}
thermal_zone_device_update(th_zone->therm_dev);
mutex_lock(&th_zone->therm_dev->lock);
/* Find the level for which trip happened */
for (i = 0; i < th_zone->sensor_conf->trip_data.trip_count; i++) {
if (th_zone->therm_dev->last_temperature <
th_zone->sensor_conf->trip_data.trip_val[i] * MCELSIUS)
break;
}
if (th_zone->mode == THERMAL_DEVICE_ENABLED &&
!th_zone->sensor_conf->trip_data.trigger_falling) {
if (i > 0)
th_zone->therm_dev->polling_delay = ACTIVE_INTERVAL;
else
th_zone->therm_dev->polling_delay = IDLE_INTERVAL;
}
snprintf(data, sizeof(data), "%u", i);
kobject_uevent_env(&th_zone->therm_dev->device.kobj, KOBJ_CHANGE, envp);
mutex_unlock(&th_zone->therm_dev->lock);
}
/* Register with the in-kernel thermal management */
int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf)
{
int ret;
struct exynos_thermal_zone *th_zone;
if (!sensor_conf || !sensor_conf->read_temperature) {
pr_err("Temperature sensor not initialised\n");
return -EINVAL;
}
th_zone = devm_kzalloc(sensor_conf->dev,
sizeof(struct exynos_thermal_zone), GFP_KERNEL);
if (!th_zone)
return -ENOMEM;
th_zone->sensor_conf = sensor_conf;
/*
* TODO: 1) Handle multiple cooling devices in a thermal zone
* 2) Add a flag/name in cooling info to map to specific
* sensor
*/
if (sensor_conf->cooling_data.freq_clip_count > 0) {
th_zone->cool_dev[th_zone->cool_dev_size] =
cpufreq_cooling_register(cpu_present_mask);
if (IS_ERR(th_zone->cool_dev[th_zone->cool_dev_size])) {
ret = PTR_ERR(th_zone->cool_dev[th_zone->cool_dev_size]);
if (ret != -EPROBE_DEFER)
dev_err(sensor_conf->dev,
"Failed to register cpufreq cooling device: %d\n",
ret);
goto err_unregister;
}
th_zone->cool_dev_size++;
}
th_zone->therm_dev = thermal_zone_device_register(
sensor_conf->name, sensor_conf->trip_data.trip_count,
0, th_zone, &exynos_dev_ops, NULL, 0,
sensor_conf->trip_data.trigger_falling ? 0 :
IDLE_INTERVAL);
if (IS_ERR(th_zone->therm_dev)) {
dev_err(sensor_conf->dev,
"Failed to register thermal zone device\n");
ret = PTR_ERR(th_zone->therm_dev);
goto err_unregister;
}
th_zone->mode = THERMAL_DEVICE_ENABLED;
sensor_conf->pzone_data = th_zone;
dev_info(sensor_conf->dev,
"Exynos: Thermal zone(%s) registered\n", sensor_conf->name);
return 0;
err_unregister:
exynos_unregister_thermal(sensor_conf);
return ret;
}
/* Un-Register with the in-kernel thermal management */
void exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf)
{
int i;
struct exynos_thermal_zone *th_zone;
if (!sensor_conf || !sensor_conf->pzone_data) {
pr_err("Invalid temperature sensor configuration data\n");
return;
}
th_zone = sensor_conf->pzone_data;
thermal_zone_device_unregister(th_zone->therm_dev);
for (i = 0; i < th_zone->cool_dev_size; ++i)
cpufreq_cooling_unregister(th_zone->cool_dev[i]);
dev_info(sensor_conf->dev,
"Exynos: Kernel Thermal management unregistered\n");
}
drivers/thermal/samsung/exynos_thermal_common.h deleted 100644 → 0
View file @ e3a1f6ca
/*
* exynos_thermal_common.h - Samsung EXYNOS common header file
*
* Copyright (C) 2013 Samsung Electronics
* Amit Daniel Kachhap <amit.daniel@samsung.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* 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.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#ifndef _EXYNOS_THERMAL_COMMON_H
#define _EXYNOS_THERMAL_COMMON_H
/* In-kernel thermal framework related macros & definations */
#define SENSOR_NAME_LEN 16
#define MAX_TRIP_COUNT 8
#define MAX_COOLING_DEVICE 4
#define ACTIVE_INTERVAL 500
#define IDLE_INTERVAL 10000
#define MCELSIUS 1000
/* CPU Zone information */
#define PANIC_ZONE 4
#define WARN_ZONE 3
#define MONITOR_ZONE 2
#define SAFE_ZONE 1
#define GET_ZONE(trip) (trip + 2)
#define GET_TRIP(zone) (zone - 2)
enum trigger_type {
THROTTLE_ACTIVE = 1,
THROTTLE_PASSIVE,
SW_TRIP,
HW_TRIP,
};
/**
* struct freq_clip_table
* @freq_clip_max: maximum frequency allowed for this cooling state.
* @temp_level: Temperature level at which the temperature clipping will
* happen.
* @mask_val: cpumask of the allowed cpu's where the clipping will take place.
*
* This structure is required to be filled and passed to the
* cpufreq_cooling_unregister function.
*/
struct freq_clip_table {
unsigned int freq_clip_max;
unsigned int temp_level;
const struct cpumask *mask_val;
};
struct thermal_trip_point_conf {
int trip_val[MAX_TRIP_COUNT];
int trip_type[MAX_TRIP_COUNT];
int trip_count;
unsigned char trigger_falling;
};
struct thermal_cooling_conf {
struct freq_clip_table freq_data[MAX_TRIP_COUNT];
int freq_clip_count;
};
struct thermal_sensor_conf {
char name[SENSOR_NAME_LEN];
int (*read_temperature)(void *data);
int (*write_emul_temp)(void *drv_data, unsigned long temp);
struct thermal_trip_point_conf trip_data;
struct thermal_cooling_conf cooling_data;
void *driver_data;
void *pzone_data;
struct device *dev;
};
/*Functions used exynos based thermal sensor driver*/
#ifdef CONFIG_EXYNOS_THERMAL_CORE
void exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf);
int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf);
void exynos_report_trigger(struct thermal_sensor_conf *sensor_conf);
#else
static inline void
exynos_unregister_thermal(struct thermal_sensor_conf *sensor_conf) { return; }
static inline int
exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) { return 0; }
static inline void
exynos_report_trigger(struct thermal_sensor_conf *sensor_conf) { return; }
#endif /* CONFIG_EXYNOS_THERMAL_CORE */
#endif /* _EXYNOS_THERMAL_COMMON_H */
drivers/thermal/samsung/exynos_tmu.c
View file @ 3d883483
/* /*
* exynos_tmu.c - Samsung EXYNOS TMU (Thermal Management Unit) * exynos_tmu.c - Samsung EXYNOS TMU (Thermal Management Unit)
* *
* Copyright (C) 2014 Samsung Electronics
* Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
* Lukasz Majewski <l.majewski@samsung.com>
*
* Copyright (C) 2011 Samsung Electronics * Copyright (C) 2011 Samsung Electronics
* Donggeun Kim <dg77.kim@samsung.com> * Donggeun Kim <dg77.kim@samsung.com>
* Amit Daniel Kachhap <amit.kachhap@linaro.org> * Amit Daniel Kachhap <amit.kachhap@linaro.org>
...@@ -31,8 +35,8 @@ ...@@ -31,8 +35,8 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include "exynos_thermal_common.h"
#include "exynos_tmu.h" #include "exynos_tmu.h"
#include "../thermal_core.h"
/* Exynos generic registers */ /* Exynos generic registers */
#define EXYNOS_TMU_REG_TRIMINFO 0x0 #define EXYNOS_TMU_REG_TRIMINFO 0x0
...@@ -115,6 +119,27 @@ ...@@ -115,6 +119,27 @@
#define EXYNOS5440_TMU_TH_RISE4_SHIFT 24 #define EXYNOS5440_TMU_TH_RISE4_SHIFT 24
#define EXYNOS5440_EFUSE_SWAP_OFFSET 8 #define EXYNOS5440_EFUSE_SWAP_OFFSET 8
/* Exynos7 specific registers */
#define EXYNOS7_THD_TEMP_RISE7_6 0x50
#define EXYNOS7_THD_TEMP_FALL7_6 0x60
#define EXYNOS7_TMU_REG_INTEN 0x110
#define EXYNOS7_TMU_REG_INTPEND 0x118
#define EXYNOS7_TMU_REG_EMUL_CON 0x160
#define EXYNOS7_TMU_TEMP_MASK 0x1ff
#define EXYNOS7_PD_DET_EN_SHIFT 23
#define EXYNOS7_TMU_INTEN_RISE0_SHIFT 0
#define EXYNOS7_TMU_INTEN_RISE1_SHIFT 1
#define EXYNOS7_TMU_INTEN_RISE2_SHIFT 2
#define EXYNOS7_TMU_INTEN_RISE3_SHIFT 3
#define EXYNOS7_TMU_INTEN_RISE4_SHIFT 4
#define EXYNOS7_TMU_INTEN_RISE5_SHIFT 5
#define EXYNOS7_TMU_INTEN_RISE6_SHIFT 6
#define EXYNOS7_TMU_INTEN_RISE7_SHIFT 7
#define EXYNOS7_EMUL_DATA_SHIFT 7
#define EXYNOS7_EMUL_DATA_MASK 0x1ff
#define MCELSIUS 1000
/** /**
* struct exynos_tmu_data : A structure to hold the private data of the TMU * struct exynos_tmu_data : A structure to hold the private data of the TMU
driver driver
...@@ -128,6 +153,7 @@ ...@@ -128,6 +153,7 @@
* @lock: lock to implement synchronization. * @lock: lock to implement synchronization.
* @clk: pointer to the clock structure. * @clk: pointer to the clock structure.
* @clk_sec: pointer to the clock structure for accessing the base_second. * @clk_sec: pointer to the clock structure for accessing the base_second.
* @sclk: pointer to the clock structure for accessing the tmu special clk.
* @temp_error1: fused value of the first point trim. * @temp_error1: fused value of the first point trim.
* @temp_error2: fused value of the second point trim. * @temp_error2: fused value of the second point trim.
* @regulator: pointer to the TMU regulator structure. * @regulator: pointer to the TMU regulator structure.
...@@ -147,10 +173,11 @@ struct exynos_tmu_data { ...@@ -147,10 +173,11 @@ struct exynos_tmu_data {
enum soc_type soc; enum soc_type soc;
struct work_struct irq_work; struct work_struct irq_work;
struct mutex lock; struct mutex lock;
struct clk *clk, *clk_sec; struct clk *clk, *clk_sec, *sclk;
u8 temp_error1, temp_error2; u16 temp_error1, temp_error2;
struct regulator *regulator; struct regulator *regulator;
struct thermal_sensor_conf *reg_conf; struct thermal_zone_device *tzd;
int (*tmu_initialize)(struct platform_device *pdev); int (*tmu_initialize)(struct platform_device *pdev);
void (*tmu_control)(struct platform_device *pdev, bool on); void (*tmu_control)(struct platform_device *pdev, bool on);
int (*tmu_read)(struct exynos_tmu_data *data); int (*tmu_read)(struct exynos_tmu_data *data);
...@@ -159,6 +186,33 @@ struct exynos_tmu_data { ...@@ -159,6 +186,33 @@ struct exynos_tmu_data {
void (*tmu_clear_irqs)(struct exynos_tmu_data *data); void (*tmu_clear_irqs)(struct exynos_tmu_data *data);
}; };
static void exynos_report_trigger(struct exynos_tmu_data *p)
{
char data[10], *envp[] = { data, NULL };
struct thermal_zone_device *tz = p->tzd;
unsigned long temp;
unsigned int i;
if (!tz) {
pr_err("No thermal zone device defined\n");
return;
}
thermal_zone_device_update(tz);
mutex_lock(&tz->lock);
/* Find the level for which trip happened */
for (i = 0; i < of_thermal_get_ntrips(tz); i++) {
tz->ops->get_trip_temp(tz, i, &temp);
if (tz->last_temperature < temp)
break;
}
snprintf(data, sizeof(data), "%u", i);
kobject_uevent_env(&tz->device.kobj, KOBJ_CHANGE, envp);
mutex_unlock(&tz->lock);
}
/* /*
* TMU treats temperature as a mapped temperature code. * TMU treats temperature as a mapped temperature code.
* The temperature is converted differently depending on the calibration type. * The temperature is converted differently depending on the calibration type.
...@@ -190,7 +244,7 @@ static int temp_to_code(struct exynos_tmu_data *data, u8 temp) ...@@ -190,7 +244,7 @@ static int temp_to_code(struct exynos_tmu_data *data, u8 temp)
* Calculate a temperature value from a temperature code. * Calculate a temperature value from a temperature code.
* The unit of the temperature is degree Celsius. * The unit of the temperature is degree Celsius.
*/ */
static int code_to_temp(struct exynos_tmu_data *data, u8 temp_code) static int code_to_temp(struct exynos_tmu_data *data, u16 temp_code)
{ {
struct exynos_tmu_platform_data *pdata = data->pdata; struct exynos_tmu_platform_data *pdata = data->pdata;
int temp; int temp;
...@@ -234,14 +288,25 @@ static void sanitize_temp_error(struct exynos_tmu_data *data, u32 trim_info) ...@@ -234,14 +288,25 @@ static void sanitize_temp_error(struct exynos_tmu_data *data, u32 trim_info)
static u32 get_th_reg(struct exynos_tmu_data *data, u32 threshold, bool falling) static u32 get_th_reg(struct exynos_tmu_data *data, u32 threshold, bool falling)
{ {
struct exynos_tmu_platform_data *pdata = data->pdata; struct thermal_zone_device *tz = data->tzd;
const struct thermal_trip * const trips =
of_thermal_get_trip_points(tz);
unsigned long temp;
int i; int i;
for (i = 0; i < pdata->non_hw_trigger_levels; i++) { if (!trips) {
u8 temp = pdata->trigger_levels[i]; pr_err("%s: Cannot get trip points from of-thermal.c!\n",
__func__);
return 0;
}
for (i = 0; i < of_thermal_get_ntrips(tz); i++) {
if (trips[i].type == THERMAL_TRIP_CRITICAL)
continue;
temp = trips[i].temperature / MCELSIUS;
if (falling) if (falling)
temp -= pdata->threshold_falling; temp -= (trips[i].hysteresis / MCELSIUS);
else else
threshold &= ~(0xff << 8 * i); threshold &= ~(0xff << 8 * i);
...@@ -305,9 +370,19 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on) ...@@ -305,9 +370,19 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
static int exynos4210_tmu_initialize(struct platform_device *pdev) static int exynos4210_tmu_initialize(struct platform_device *pdev)
{ {
struct exynos_tmu_data *data = platform_get_drvdata(pdev); struct exynos_tmu_data *data = platform_get_drvdata(pdev);
struct exynos_tmu_platform_data *pdata = data->pdata; struct thermal_zone_device *tz = data->tzd;
unsigned int status; const struct thermal_trip * const trips =
of_thermal_get_trip_points(tz);
int ret = 0, threshold_code, i; int ret = 0, threshold_code, i;
unsigned long reference, temp;
unsigned int status;
if (!trips) {
pr_err("%s: Cannot get trip points from of-thermal.c!\n",
__func__);
ret = -ENODEV;
goto out;
}
status = readb(data->base + EXYNOS_TMU_REG_STATUS); status = readb(data->base + EXYNOS_TMU_REG_STATUS);
if (!status) { if (!status) {
...@@ -318,12 +393,19 @@ static int exynos4210_tmu_initialize(struct platform_device *pdev) ...@@ -318,12 +393,19 @@ static int exynos4210_tmu_initialize(struct platform_device *pdev)
sanitize_temp_error(data, readl(data->base + EXYNOS_TMU_REG_TRIMINFO)); sanitize_temp_error(data, readl(data->base + EXYNOS_TMU_REG_TRIMINFO));
/* Write temperature code for threshold */ /* Write temperature code for threshold */
threshold_code = temp_to_code(data, pdata->threshold); reference = trips[0].temperature / MCELSIUS;
threshold_code = temp_to_code(data, reference);
if (threshold_code < 0) {
ret = threshold_code;
goto out;
}
writeb(threshold_code, data->base + EXYNOS4210_TMU_REG_THRESHOLD_TEMP); writeb(threshold_code, data->base + EXYNOS4210_TMU_REG_THRESHOLD_TEMP);
for (i = 0; i < pdata->non_hw_trigger_levels; i++) for (i = 0; i < of_thermal_get_ntrips(tz); i++) {
writeb(pdata->trigger_levels[i], data->base + temp = trips[i].temperature / MCELSIUS;
writeb(temp - reference, data->base +
EXYNOS4210_TMU_REG_TRIG_LEVEL0 + i * 4); EXYNOS4210_TMU_REG_TRIG_LEVEL0 + i * 4);
}
data->tmu_clear_irqs(data); data->tmu_clear_irqs(data);
out: out:
...@@ -333,9 +415,11 @@ static int exynos4210_tmu_initialize(struct platform_device *pdev) ...@@ -333,9 +415,11 @@ static int exynos4210_tmu_initialize(struct platform_device *pdev)
static int exynos4412_tmu_initialize(struct platform_device *pdev) static int exynos4412_tmu_initialize(struct platform_device *pdev)
{ {
struct exynos_tmu_data *data = platform_get_drvdata(pdev); struct exynos_tmu_data *data = platform_get_drvdata(pdev);
struct exynos_tmu_platform_data *pdata = data->pdata; const struct thermal_trip * const trips =
of_thermal_get_trip_points(data->tzd);
unsigned int status, trim_info, con, ctrl, rising_threshold; unsigned int status, trim_info, con, ctrl, rising_threshold;
int ret = 0, threshold_code, i; int ret = 0, threshold_code, i;
unsigned long crit_temp = 0;
status = readb(data->base + EXYNOS_TMU_REG_STATUS); status = readb(data->base + EXYNOS_TMU_REG_STATUS);
if (!status) { if (!status) {
...@@ -373,17 +457,29 @@ static int exynos4412_tmu_initialize(struct platform_device *pdev) ...@@ -373,17 +457,29 @@ static int exynos4412_tmu_initialize(struct platform_device *pdev)
data->tmu_clear_irqs(data); data->tmu_clear_irqs(data);
/* if last threshold limit is also present */ /* if last threshold limit is also present */
i = pdata->max_trigger_level - 1; for (i = 0; i < of_thermal_get_ntrips(data->tzd); i++) {
if (pdata->trigger_levels[i] && pdata->trigger_type[i] == HW_TRIP) { if (trips[i].type == THERMAL_TRIP_CRITICAL) {
threshold_code = temp_to_code(data, pdata->trigger_levels[i]); crit_temp = trips[i].temperature;
/* 1-4 level to be assigned in th0 reg */ break;
rising_threshold &= ~(0xff << 8 * i); }
rising_threshold |= threshold_code << 8 * i;
writel(rising_threshold, data->base + EXYNOS_THD_TEMP_RISE);
con = readl(data->base + EXYNOS_TMU_REG_CONTROL);
con |= (1 << EXYNOS_TMU_THERM_TRIP_EN_SHIFT);
writel(con, data->base + EXYNOS_TMU_REG_CONTROL);
} }
if (i == of_thermal_get_ntrips(data->tzd)) {
pr_err("%s: No CRITICAL trip point defined at of-thermal.c!\n",
__func__);
ret = -EINVAL;
goto out;
}
threshold_code = temp_to_code(data, crit_temp / MCELSIUS);
/* 1-4 level to be assigned in th0 reg */
rising_threshold &= ~(0xff << 8 * i);
rising_threshold |= threshold_code << 8 * i;
writel(rising_threshold, data->base + EXYNOS_THD_TEMP_RISE);
con = readl(data->base + EXYNOS_TMU_REG_CONTROL);
con |= (1 << EXYNOS_TMU_THERM_TRIP_EN_SHIFT);
writel(con, data->base + EXYNOS_TMU_REG_CONTROL);
out: out:
return ret; return ret;
} }
...@@ -391,9 +487,9 @@ static int exynos4412_tmu_initialize(struct platform_device *pdev) ...@@ -391,9 +487,9 @@ static int exynos4412_tmu_initialize(struct platform_device *pdev)
static int exynos5440_tmu_initialize(struct platform_device *pdev) static int exynos5440_tmu_initialize(struct platform_device *pdev)
{ {
struct exynos_tmu_data *data = platform_get_drvdata(pdev); struct exynos_tmu_data *data = platform_get_drvdata(pdev);
struct exynos_tmu_platform_data *pdata = data->pdata;
unsigned int trim_info = 0, con, rising_threshold; unsigned int trim_info = 0, con, rising_threshold;
int ret = 0, threshold_code, i; int ret = 0, threshold_code;
unsigned long crit_temp = 0;
/* /*
* For exynos5440 soc triminfo value is swapped between TMU0 and * For exynos5440 soc triminfo value is swapped between TMU0 and
...@@ -422,9 +518,8 @@ static int exynos5440_tmu_initialize(struct platform_device *pdev) ...@@ -422,9 +518,8 @@ static int exynos5440_tmu_initialize(struct platform_device *pdev)
data->tmu_clear_irqs(data); data->tmu_clear_irqs(data);
/* if last threshold limit is also present */ /* if last threshold limit is also present */
i = pdata->max_trigger_level - 1; if (!data->tzd->ops->get_crit_temp(data->tzd, &crit_temp)) {
if (pdata->trigger_levels[i] && pdata->trigger_type[i] == HW_TRIP) { threshold_code = temp_to_code(data, crit_temp / MCELSIUS);
threshold_code = temp_to_code(data, pdata->trigger_levels[i]);
/* 5th level to be assigned in th2 reg */ /* 5th level to be assigned in th2 reg */
rising_threshold = rising_threshold =
threshold_code << EXYNOS5440_TMU_TH_RISE4_SHIFT; threshold_code << EXYNOS5440_TMU_TH_RISE4_SHIFT;
...@@ -439,10 +534,88 @@ static int exynos5440_tmu_initialize(struct platform_device *pdev) ...@@ -439,10 +534,88 @@ static int exynos5440_tmu_initialize(struct platform_device *pdev)
return ret; return ret;
} }
static void exynos4210_tmu_control(struct platform_device *pdev, bool on) static int exynos7_tmu_initialize(struct platform_device *pdev)
{ {
struct exynos_tmu_data *data = platform_get_drvdata(pdev); struct exynos_tmu_data *data = platform_get_drvdata(pdev);
struct thermal_zone_device *tz = data->tzd;
struct exynos_tmu_platform_data *pdata = data->pdata; struct exynos_tmu_platform_data *pdata = data->pdata;
unsigned int status, trim_info;
unsigned int rising_threshold = 0, falling_threshold = 0;
int ret = 0, threshold_code, i;
unsigned long temp, temp_hist;
unsigned int reg_off, bit_off;
status = readb(data->base + EXYNOS_TMU_REG_STATUS);
if (!status) {
ret = -EBUSY;
goto out;
}
trim_info = readl(data->base + EXYNOS_TMU_REG_TRIMINFO);
data->temp_error1 = trim_info & EXYNOS7_TMU_TEMP_MASK;
if (!data->temp_error1 ||
(pdata->min_efuse_value > data->temp_error1) ||
(data->temp_error1 > pdata->max_efuse_value))
data->temp_error1 = pdata->efuse_value & EXYNOS_TMU_TEMP_MASK;
/* Write temperature code for rising and falling threshold */
for (i = (of_thermal_get_ntrips(tz) - 1); i >= 0; i--) {
/*
* On exynos7 there are 4 rising and 4 falling threshold
* registers (0x50-0x5c and 0x60-0x6c respectively). Each
* register holds the value of two threshold levels (at bit
* offsets 0 and 16). Based on the fact that there are atmost
* eight possible trigger levels, calculate the register and
* bit offsets where the threshold levels are to be written.
*
* e.g. EXYNOS7_THD_TEMP_RISE7_6 (0x50)
* [24:16] - Threshold level 7
* [8:0] - Threshold level 6
* e.g. EXYNOS7_THD_TEMP_RISE5_4 (0x54)
* [24:16] - Threshold level 5
* [8:0] - Threshold level 4
*
* and similarly for falling thresholds.
*
* Based on the above, calculate the register and bit offsets
* for rising/falling threshold levels and populate them.
*/
reg_off = ((7 - i) / 2) * 4;
bit_off = ((8 - i) % 2);
tz->ops->get_trip_temp(tz, i, &temp);
temp /= MCELSIUS;
tz->ops->get_trip_hyst(tz, i, &temp_hist);
temp_hist = temp - (temp_hist / MCELSIUS);
/* Set 9-bit temperature code for rising threshold levels */
threshold_code = temp_to_code(data, temp);
rising_threshold = readl(data->base +
EXYNOS7_THD_TEMP_RISE7_6 + reg_off);
rising_threshold &= ~(EXYNOS7_TMU_TEMP_MASK << (16 * bit_off));
rising_threshold |= threshold_code << (16 * bit_off);
writel(rising_threshold,
data->base + EXYNOS7_THD_TEMP_RISE7_6 + reg_off);
/* Set 9-bit temperature code for falling threshold levels */
threshold_code = temp_to_code(data, temp_hist);
falling_threshold &= ~(EXYNOS7_TMU_TEMP_MASK << (16 * bit_off));
falling_threshold |= threshold_code << (16 * bit_off);
writel(falling_threshold,
data->base + EXYNOS7_THD_TEMP_FALL7_6 + reg_off);
}
data->tmu_clear_irqs(data);
out:
return ret;
}
static void exynos4210_tmu_control(struct platform_device *pdev, bool on)
{
struct exynos_tmu_data *data = platform_get_drvdata(pdev);
struct thermal_zone_device *tz = data->tzd;
unsigned int con, interrupt_en; unsigned int con, interrupt_en;
con = get_con_reg(data, readl(data->base + EXYNOS_TMU_REG_CONTROL)); con = get_con_reg(data, readl(data->base + EXYNOS_TMU_REG_CONTROL));
...@@ -450,10 +623,15 @@ static void exynos4210_tmu_control(struct platform_device *pdev, bool on) ...@@ -450,10 +623,15 @@ static void exynos4210_tmu_control(struct platform_device *pdev, bool on)
if (on) { if (on) {
con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT); con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT);
interrupt_en = interrupt_en =
pdata->trigger_enable[3] << EXYNOS_TMU_INTEN_RISE3_SHIFT | (of_thermal_is_trip_valid(tz, 3)
pdata->trigger_enable[2] << EXYNOS_TMU_INTEN_RISE2_SHIFT | << EXYNOS_TMU_INTEN_RISE3_SHIFT) |
pdata->trigger_enable[1] << EXYNOS_TMU_INTEN_RISE1_SHIFT | (of_thermal_is_trip_valid(tz, 2)
pdata->trigger_enable[0] << EXYNOS_TMU_INTEN_RISE0_SHIFT; << EXYNOS_TMU_INTEN_RISE2_SHIFT) |
(of_thermal_is_trip_valid(tz, 1)
<< EXYNOS_TMU_INTEN_RISE1_SHIFT) |
(of_thermal_is_trip_valid(tz, 0)
<< EXYNOS_TMU_INTEN_RISE0_SHIFT);
if (data->soc != SOC_ARCH_EXYNOS4210) if (data->soc != SOC_ARCH_EXYNOS4210)
interrupt_en |= interrupt_en |=
interrupt_en << EXYNOS_TMU_INTEN_FALL0_SHIFT; interrupt_en << EXYNOS_TMU_INTEN_FALL0_SHIFT;
...@@ -468,7 +646,7 @@ static void exynos4210_tmu_control(struct platform_device *pdev, bool on) ...@@ -468,7 +646,7 @@ static void exynos4210_tmu_control(struct platform_device *pdev, bool on)
static void exynos5440_tmu_control(struct platform_device *pdev, bool on) static void exynos5440_tmu_control(struct platform_device *pdev, bool on)
{ {
struct exynos_tmu_data *data = platform_get_drvdata(pdev); struct exynos_tmu_data *data = platform_get_drvdata(pdev);
struct exynos_tmu_platform_data *pdata = data->pdata; struct thermal_zone_device *tz = data->tzd;
unsigned int con, interrupt_en; unsigned int con, interrupt_en;
con = get_con_reg(data, readl(data->base + EXYNOS5440_TMU_S0_7_CTRL)); con = get_con_reg(data, readl(data->base + EXYNOS5440_TMU_S0_7_CTRL));
...@@ -476,11 +654,16 @@ static void exynos5440_tmu_control(struct platform_device *pdev, bool on) ...@@ -476,11 +654,16 @@ static void exynos5440_tmu_control(struct platform_device *pdev, bool on)
if (on) { if (on) {
con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT); con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT);
interrupt_en = interrupt_en =
pdata->trigger_enable[3] << EXYNOS5440_TMU_INTEN_RISE3_SHIFT | (of_thermal_is_trip_valid(tz, 3)
pdata->trigger_enable[2] << EXYNOS5440_TMU_INTEN_RISE2_SHIFT | << EXYNOS5440_TMU_INTEN_RISE3_SHIFT) |
pdata->trigger_enable[1] << EXYNOS5440_TMU_INTEN_RISE1_SHIFT | (of_thermal_is_trip_valid(tz, 2)
pdata->trigger_enable[0] << EXYNOS5440_TMU_INTEN_RISE0_SHIFT; << EXYNOS5440_TMU_INTEN_RISE2_SHIFT) |
interrupt_en |= interrupt_en << EXYNOS5440_TMU_INTEN_FALL0_SHIFT; (of_thermal_is_trip_valid(tz, 1)
<< EXYNOS5440_TMU_INTEN_RISE1_SHIFT) |
(of_thermal_is_trip_valid(tz, 0)
<< EXYNOS5440_TMU_INTEN_RISE0_SHIFT);
interrupt_en |=
interrupt_en << EXYNOS5440_TMU_INTEN_FALL0_SHIFT;
} else { } else {
con &= ~(1 << EXYNOS_TMU_CORE_EN_SHIFT); con &= ~(1 << EXYNOS_TMU_CORE_EN_SHIFT);
interrupt_en = 0; /* Disable all interrupts */ interrupt_en = 0; /* Disable all interrupts */
...@@ -489,19 +672,62 @@ static void exynos5440_tmu_control(struct platform_device *pdev, bool on) ...@@ -489,19 +672,62 @@ static void exynos5440_tmu_control(struct platform_device *pdev, bool on)
writel(con, data->base + EXYNOS5440_TMU_S0_7_CTRL); writel(con, data->base + EXYNOS5440_TMU_S0_7_CTRL);
} }
static int exynos_tmu_read(struct exynos_tmu_data *data) static void exynos7_tmu_control(struct platform_device *pdev, bool on)
{ {
int ret; struct exynos_tmu_data *data = platform_get_drvdata(pdev);
struct thermal_zone_device *tz = data->tzd;
unsigned int con, interrupt_en;
con = get_con_reg(data, readl(data->base + EXYNOS_TMU_REG_CONTROL));
if (on) {
con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT);
interrupt_en =
(of_thermal_is_trip_valid(tz, 7)
<< EXYNOS7_TMU_INTEN_RISE7_SHIFT) |
(of_thermal_is_trip_valid(tz, 6)
<< EXYNOS7_TMU_INTEN_RISE6_SHIFT) |
(of_thermal_is_trip_valid(tz, 5)
<< EXYNOS7_TMU_INTEN_RISE5_SHIFT) |
(of_thermal_is_trip_valid(tz, 4)
<< EXYNOS7_TMU_INTEN_RISE4_SHIFT) |
(of_thermal_is_trip_valid(tz, 3)
<< EXYNOS7_TMU_INTEN_RISE3_SHIFT) |
(of_thermal_is_trip_valid(tz, 2)
<< EXYNOS7_TMU_INTEN_RISE2_SHIFT) |
(of_thermal_is_trip_valid(tz, 1)
<< EXYNOS7_TMU_INTEN_RISE1_SHIFT) |
(of_thermal_is_trip_valid(tz, 0)
<< EXYNOS7_TMU_INTEN_RISE0_SHIFT);
interrupt_en |=
interrupt_en << EXYNOS_TMU_INTEN_FALL0_SHIFT;
} else {
con &= ~(1 << EXYNOS_TMU_CORE_EN_SHIFT);
interrupt_en = 0; /* Disable all interrupts */
}
con |= 1 << EXYNOS7_PD_DET_EN_SHIFT;
writel(interrupt_en, data->base + EXYNOS7_TMU_REG_INTEN);
writel(con, data->base + EXYNOS_TMU_REG_CONTROL);
}
static int exynos_get_temp(void *p, long *temp)
{
struct exynos_tmu_data *data = p;
if (!data)
return -EINVAL;
mutex_lock(&data->lock); mutex_lock(&data->lock);
clk_enable(data->clk); clk_enable(data->clk);
ret = data->tmu_read(data);
if (ret >= 0) *temp = code_to_temp(data, data->tmu_read(data)) * MCELSIUS;
ret = code_to_temp(data, ret);
clk_disable(data->clk); clk_disable(data->clk);
mutex_unlock(&data->lock); mutex_unlock(&data->lock);
return ret; return 0;
} }
#ifdef CONFIG_THERMAL_EMULATION #ifdef CONFIG_THERMAL_EMULATION
...@@ -515,9 +741,19 @@ static u32 get_emul_con_reg(struct exynos_tmu_data *data, unsigned int val, ...@@ -515,9 +741,19 @@ static u32 get_emul_con_reg(struct exynos_tmu_data *data, unsigned int val,
val &= ~(EXYNOS_EMUL_TIME_MASK << EXYNOS_EMUL_TIME_SHIFT); val &= ~(EXYNOS_EMUL_TIME_MASK << EXYNOS_EMUL_TIME_SHIFT);
val |= (EXYNOS_EMUL_TIME << EXYNOS_EMUL_TIME_SHIFT); val |= (EXYNOS_EMUL_TIME << EXYNOS_EMUL_TIME_SHIFT);
} }
val &= ~(EXYNOS_EMUL_DATA_MASK << EXYNOS_EMUL_DATA_SHIFT); if (data->soc == SOC_ARCH_EXYNOS7) {
val |= (temp_to_code(data, temp) << EXYNOS_EMUL_DATA_SHIFT) | val &= ~(EXYNOS7_EMUL_DATA_MASK <<
EXYNOS_EMUL_ENABLE; EXYNOS7_EMUL_DATA_SHIFT);
val |= (temp_to_code(data, temp) <<
EXYNOS7_EMUL_DATA_SHIFT) |
EXYNOS_EMUL_ENABLE;
} else {
val &= ~(EXYNOS_EMUL_DATA_MASK <<
EXYNOS_EMUL_DATA_SHIFT);
val |= (temp_to_code(data, temp) <<
EXYNOS_EMUL_DATA_SHIFT) |
EXYNOS_EMUL_ENABLE;
}
} else { } else {
val &= ~EXYNOS_EMUL_ENABLE; val &= ~EXYNOS_EMUL_ENABLE;
} }
...@@ -533,6 +769,8 @@ static void exynos4412_tmu_set_emulation(struct exynos_tmu_data *data, ...@@ -533,6 +769,8 @@ static void exynos4412_tmu_set_emulation(struct exynos_tmu_data *data,
if (data->soc == SOC_ARCH_EXYNOS5260) if (data->soc == SOC_ARCH_EXYNOS5260)
emul_con = EXYNOS5260_EMUL_CON; emul_con = EXYNOS5260_EMUL_CON;
else if (data->soc == SOC_ARCH_EXYNOS7)
emul_con = EXYNOS7_TMU_REG_EMUL_CON;
else else
emul_con = EXYNOS_EMUL_CON; emul_con = EXYNOS_EMUL_CON;
...@@ -576,7 +814,7 @@ static int exynos_tmu_set_emulation(void *drv_data, unsigned long temp) ...@@ -576,7 +814,7 @@ static int exynos_tmu_set_emulation(void *drv_data, unsigned long temp)
#define exynos5440_tmu_set_emulation NULL #define exynos5440_tmu_set_emulation NULL
static int exynos_tmu_set_emulation(void *drv_data, unsigned long temp) static int exynos_tmu_set_emulation(void *drv_data, unsigned long temp)
{ return -EINVAL; } { return -EINVAL; }
#endif/*CONFIG_THERMAL_EMULATION*/ #endif /* CONFIG_THERMAL_EMULATION */
static int exynos4210_tmu_read(struct exynos_tmu_data *data) static int exynos4210_tmu_read(struct exynos_tmu_data *data)
{ {
...@@ -596,6 +834,12 @@ static int exynos5440_tmu_read(struct exynos_tmu_data *data) ...@@ -596,6 +834,12 @@ static int exynos5440_tmu_read(struct exynos_tmu_data *data)
return readb(data->base + EXYNOS5440_TMU_S0_7_TEMP); return readb(data->base + EXYNOS5440_TMU_S0_7_TEMP);
} }
static int exynos7_tmu_read(struct exynos_tmu_data *data)
{
return readw(data->base + EXYNOS_TMU_REG_CURRENT_TEMP) &
EXYNOS7_TMU_TEMP_MASK;
}
static void exynos_tmu_work(struct work_struct *work) static void exynos_tmu_work(struct work_struct *work)
{ {
struct exynos_tmu_data *data = container_of(work, struct exynos_tmu_data *data = container_of(work,
...@@ -613,7 +857,7 @@ static void exynos_tmu_work(struct work_struct *work) ...@@ -613,7 +857,7 @@ static void exynos_tmu_work(struct work_struct *work)
if (!IS_ERR(data->clk_sec)) if (!IS_ERR(data->clk_sec))
clk_disable(data->clk_sec); clk_disable(data->clk_sec);
exynos_report_trigger(data->reg_conf); exynos_report_trigger(data);
mutex_lock(&data->lock); mutex_lock(&data->lock);
clk_enable(data->clk); clk_enable(data->clk);
...@@ -634,6 +878,9 @@ static void exynos4210_tmu_clear_irqs(struct exynos_tmu_data *data) ...@@ -634,6 +878,9 @@ static void exynos4210_tmu_clear_irqs(struct exynos_tmu_data *data)
if (data->soc == SOC_ARCH_EXYNOS5260) { if (data->soc == SOC_ARCH_EXYNOS5260) {
tmu_intstat = EXYNOS5260_TMU_REG_INTSTAT; tmu_intstat = EXYNOS5260_TMU_REG_INTSTAT;
tmu_intclear = EXYNOS5260_TMU_REG_INTCLEAR; tmu_intclear = EXYNOS5260_TMU_REG_INTCLEAR;
} else if (data->soc == SOC_ARCH_EXYNOS7) {
tmu_intstat = EXYNOS7_TMU_REG_INTPEND;
tmu_intclear = EXYNOS7_TMU_REG_INTPEND;
} else { } else {
tmu_intstat = EXYNOS_TMU_REG_INTSTAT; tmu_intstat = EXYNOS_TMU_REG_INTSTAT;
tmu_intclear = EXYNOS_TMU_REG_INTCLEAR; tmu_intclear = EXYNOS_TMU_REG_INTCLEAR;
...@@ -673,55 +920,94 @@ static irqreturn_t exynos_tmu_irq(int irq, void *id) ...@@ -673,55 +920,94 @@ static irqreturn_t exynos_tmu_irq(int irq, void *id)
static const struct of_device_id exynos_tmu_match[] = { static const struct of_device_id exynos_tmu_match[] = {
{ {
.compatible = "samsung,exynos3250-tmu", .compatible = "samsung,exynos3250-tmu",
.data = &exynos3250_default_tmu_data,
}, },
{ {
.compatible = "samsung,exynos4210-tmu", .compatible = "samsung,exynos4210-tmu",
.data = &exynos4210_default_tmu_data,
}, },
{ {
.compatible = "samsung,exynos4412-tmu", .compatible = "samsung,exynos4412-tmu",
.data = &exynos4412_default_tmu_data,
}, },
{ {
.compatible = "samsung,exynos5250-tmu", .compatible = "samsung,exynos5250-tmu",
.data = &exynos5250_default_tmu_data,
}, },
{ {
.compatible = "samsung,exynos5260-tmu", .compatible = "samsung,exynos5260-tmu",
.data = &exynos5260_default_tmu_data,
}, },
{ {
.compatible = "samsung,exynos5420-tmu", .compatible = "samsung,exynos5420-tmu",
.data = &exynos5420_default_tmu_data,
}, },
{ {
.compatible = "samsung,exynos5420-tmu-ext-triminfo", .compatible = "samsung,exynos5420-tmu-ext-triminfo",
.data = &exynos5420_default_tmu_data,
}, },
{ {
.compatible = "samsung,exynos5440-tmu", .compatible = "samsung,exynos5440-tmu",
.data = &exynos5440_default_tmu_data, },
{
.compatible = "samsung,exynos7-tmu",
}, },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, exynos_tmu_match); MODULE_DEVICE_TABLE(of, exynos_tmu_match);
static inline struct exynos_tmu_platform_data *exynos_get_driver_data( static int exynos_of_get_soc_type(struct device_node *np)
struct platform_device *pdev, int id) {
if (of_device_is_compatible(np, "samsung,exynos3250-tmu"))
return SOC_ARCH_EXYNOS3250;
else if (of_device_is_compatible(np, "samsung,exynos4210-tmu"))
return SOC_ARCH_EXYNOS4210;
else if (of_device_is_compatible(np, "samsung,exynos4412-tmu"))
return SOC_ARCH_EXYNOS4412;
else if (of_device_is_compatible(np, "samsung,exynos5250-tmu"))
return SOC_ARCH_EXYNOS5250;
else if (of_device_is_compatible(np, "samsung,exynos5260-tmu"))
return SOC_ARCH_EXYNOS5260;
else if (of_device_is_compatible(np, "samsung,exynos5420-tmu"))
return SOC_ARCH_EXYNOS5420;
else if (of_device_is_compatible(np,
"samsung,exynos5420-tmu-ext-triminfo"))
return SOC_ARCH_EXYNOS5420_TRIMINFO;
else if (of_device_is_compatible(np, "samsung,exynos5440-tmu"))
return SOC_ARCH_EXYNOS5440;
else if (of_device_is_compatible(np, "samsung,exynos7-tmu"))
return SOC_ARCH_EXYNOS7;
return -EINVAL;
}
static int exynos_of_sensor_conf(struct device_node *np,
struct exynos_tmu_platform_data *pdata)
{ {
struct exynos_tmu_init_data *data_table; u32 value;
struct exynos_tmu_platform_data *tmu_data; int ret;
const struct of_device_id *match;
match = of_match_node(exynos_tmu_match, pdev->dev.of_node); of_node_get(np);
if (!match)
return NULL; ret = of_property_read_u32(np, "samsung,tmu_gain", &value);
data_table = (struct exynos_tmu_init_data *) match->data; pdata->gain = (u8)value;
if (!data_table || id >= data_table->tmu_count) of_property_read_u32(np, "samsung,tmu_reference_voltage", &value);
return NULL; pdata->reference_voltage = (u8)value;
tmu_data = data_table->tmu_data; of_property_read_u32(np, "samsung,tmu_noise_cancel_mode", &value);
return (struct exynos_tmu_platform_data *) (tmu_data + id); pdata->noise_cancel_mode = (u8)value;
of_property_read_u32(np, "samsung,tmu_efuse_value",
&pdata->efuse_value);
of_property_read_u32(np, "samsung,tmu_min_efuse_value",
&pdata->min_efuse_value);
of_property_read_u32(np, "samsung,tmu_max_efuse_value",
&pdata->max_efuse_value);
of_property_read_u32(np, "samsung,tmu_first_point_trim", &value);
pdata->first_point_trim = (u8)value;
of_property_read_u32(np, "samsung,tmu_second_point_trim", &value);
pdata->second_point_trim = (u8)value;
of_property_read_u32(np, "samsung,tmu_default_temp_offset", &value);
pdata->default_temp_offset = (u8)value;
of_property_read_u32(np, "samsung,tmu_cal_type", &pdata->cal_type);
of_property_read_u32(np, "samsung,tmu_cal_mode", &pdata->cal_mode);
of_node_put(np);
return 0;
} }
static int exynos_map_dt_data(struct platform_device *pdev) static int exynos_map_dt_data(struct platform_device *pdev)
...@@ -771,14 +1057,15 @@ static int exynos_map_dt_data(struct platform_device *pdev) ...@@ -771,14 +1057,15 @@ static int exynos_map_dt_data(struct platform_device *pdev)
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
} }
pdata = exynos_get_driver_data(pdev, data->id); pdata = devm_kzalloc(&pdev->dev,
if (!pdata) { sizeof(struct exynos_tmu_platform_data),
dev_err(&pdev->dev, "No platform init data supplied.\n"); GFP_KERNEL);
return -ENODEV; if (!pdata)
} return -ENOMEM;
exynos_of_sensor_conf(pdev->dev.of_node, pdata);
data->pdata = pdata; data->pdata = pdata;
data->soc = pdata->type; data->soc = exynos_of_get_soc_type(pdev->dev.of_node);
switch (data->soc) { switch (data->soc) {
case SOC_ARCH_EXYNOS4210: case SOC_ARCH_EXYNOS4210:
...@@ -806,6 +1093,13 @@ static int exynos_map_dt_data(struct platform_device *pdev) ...@@ -806,6 +1093,13 @@ static int exynos_map_dt_data(struct platform_device *pdev)
data->tmu_set_emulation = exynos5440_tmu_set_emulation; data->tmu_set_emulation = exynos5440_tmu_set_emulation;
data->tmu_clear_irqs = exynos5440_tmu_clear_irqs; data->tmu_clear_irqs = exynos5440_tmu_clear_irqs;
break; break;
case SOC_ARCH_EXYNOS7:
data->tmu_initialize = exynos7_tmu_initialize;
data->tmu_control = exynos7_tmu_control;
data->tmu_read = exynos7_tmu_read;
data->tmu_set_emulation = exynos4412_tmu_set_emulation;
data->tmu_clear_irqs = exynos4210_tmu_clear_irqs;
break;
default: default:
dev_err(&pdev->dev, "Platform not supported\n"); dev_err(&pdev->dev, "Platform not supported\n");
return -EINVAL; return -EINVAL;
...@@ -834,12 +1128,16 @@ static int exynos_map_dt_data(struct platform_device *pdev) ...@@ -834,12 +1128,16 @@ static int exynos_map_dt_data(struct platform_device *pdev)
return 0; return 0;
} }
static struct thermal_zone_of_device_ops exynos_sensor_ops = {
.get_temp = exynos_get_temp,
.set_emul_temp = exynos_tmu_set_emulation,
};
static int exynos_tmu_probe(struct platform_device *pdev) static int exynos_tmu_probe(struct platform_device *pdev)
{ {
struct exynos_tmu_data *data;
struct exynos_tmu_platform_data *pdata; struct exynos_tmu_platform_data *pdata;
struct thermal_sensor_conf *sensor_conf; struct exynos_tmu_data *data;
int ret, i; int ret;
data = devm_kzalloc(&pdev->dev, sizeof(struct exynos_tmu_data), data = devm_kzalloc(&pdev->dev, sizeof(struct exynos_tmu_data),
GFP_KERNEL); GFP_KERNEL);
...@@ -849,9 +1147,15 @@ static int exynos_tmu_probe(struct platform_device *pdev) ...@@ -849,9 +1147,15 @@ static int exynos_tmu_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, data); platform_set_drvdata(pdev, data);
mutex_init(&data->lock); mutex_init(&data->lock);
data->tzd = thermal_zone_of_sensor_register(&pdev->dev, 0, data,
&exynos_sensor_ops);
if (IS_ERR(data->tzd)) {
pr_err("thermal: tz: %p ERROR\n", data->tzd);
return PTR_ERR(data->tzd);
}
ret = exynos_map_dt_data(pdev); ret = exynos_map_dt_data(pdev);
if (ret) if (ret)
return ret; goto err_sensor;
pdata = data->pdata; pdata = data->pdata;
...@@ -860,20 +1164,22 @@ static int exynos_tmu_probe(struct platform_device *pdev) ...@@ -860,20 +1164,22 @@ static int exynos_tmu_probe(struct platform_device *pdev)
data->clk = devm_clk_get(&pdev->dev, "tmu_apbif"); data->clk = devm_clk_get(&pdev->dev, "tmu_apbif");
if (IS_ERR(data->clk)) { if (IS_ERR(data->clk)) {
dev_err(&pdev->dev, "Failed to get clock\n"); dev_err(&pdev->dev, "Failed to get clock\n");
return PTR_ERR(data->clk); ret = PTR_ERR(data->clk);
goto err_sensor;
} }
data->clk_sec = devm_clk_get(&pdev->dev, "tmu_triminfo_apbif"); data->clk_sec = devm_clk_get(&pdev->dev, "tmu_triminfo_apbif");
if (IS_ERR(data->clk_sec)) { if (IS_ERR(data->clk_sec)) {
if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO) { if (data->soc == SOC_ARCH_EXYNOS5420_TRIMINFO) {
dev_err(&pdev->dev, "Failed to get triminfo clock\n"); dev_err(&pdev->dev, "Failed to get triminfo clock\n");
return PTR_ERR(data->clk_sec); ret = PTR_ERR(data->clk_sec);
goto err_sensor;
} }
} else { } else {
ret = clk_prepare(data->clk_sec); ret = clk_prepare(data->clk_sec);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to get clock\n"); dev_err(&pdev->dev, "Failed to get clock\n");
return ret; goto err_sensor;
} }
} }
...@@ -883,82 +1189,57 @@ static int exynos_tmu_probe(struct platform_device *pdev) ...@@ -883,82 +1189,57 @@ static int exynos_tmu_probe(struct platform_device *pdev)
goto err_clk_sec; goto err_clk_sec;
} }
ret = exynos_tmu_initialize(pdev); if (data->soc == SOC_ARCH_EXYNOS7) {
if (ret) { data->sclk = devm_clk_get(&pdev->dev, "tmu_sclk");
dev_err(&pdev->dev, "Failed to initialize TMU\n"); if (IS_ERR(data->sclk)) {
goto err_clk; dev_err(&pdev->dev, "Failed to get sclk\n");
goto err_clk;
} else {
ret = clk_prepare_enable(data->sclk);
if (ret) {
dev_err(&pdev->dev, "Failed to enable sclk\n");
goto err_clk;
}
}
} }
exynos_tmu_control(pdev, true); ret = exynos_tmu_initialize(pdev);
/* Allocate a structure to register with the exynos core thermal */
sensor_conf = devm_kzalloc(&pdev->dev,
sizeof(struct thermal_sensor_conf), GFP_KERNEL);
if (!sensor_conf) {
ret = -ENOMEM;
goto err_clk;
}
sprintf(sensor_conf->name, "therm_zone%d", data->id);
sensor_conf->read_temperature = (int (*)(void *))exynos_tmu_read;
sensor_conf->write_emul_temp =
(int (*)(void *, unsigned long))exynos_tmu_set_emulation;
sensor_conf->driver_data = data;
sensor_conf->trip_data.trip_count = pdata->trigger_enable[0] +
pdata->trigger_enable[1] + pdata->trigger_enable[2]+
pdata->trigger_enable[3];
for (i = 0; i < sensor_conf->trip_data.trip_count; i++) {
sensor_conf->trip_data.trip_val[i] =
pdata->threshold + pdata->trigger_levels[i];
sensor_conf->trip_data.trip_type[i] =
pdata->trigger_type[i];
}
sensor_conf->trip_data.trigger_falling = pdata->threshold_falling;
sensor_conf->cooling_data.freq_clip_count = pdata->freq_tab_count;
for (i = 0; i < pdata->freq_tab_count; i++) {
sensor_conf->cooling_data.freq_data[i].freq_clip_max =
pdata->freq_tab[i].freq_clip_max;
sensor_conf->cooling_data.freq_data[i].temp_level =
pdata->freq_tab[i].temp_level;
}
sensor_conf->dev = &pdev->dev;
/* Register the sensor with thermal management interface */
ret = exynos_register_thermal(sensor_conf);
if (ret) { if (ret) {
if (ret != -EPROBE_DEFER) dev_err(&pdev->dev, "Failed to initialize TMU\n");
dev_err(&pdev->dev, goto err_sclk;
"Failed to register thermal interface: %d\n",
ret);
goto err_clk;
} }
data->reg_conf = sensor_conf;
ret = devm_request_irq(&pdev->dev, data->irq, exynos_tmu_irq, ret = devm_request_irq(&pdev->dev, data->irq, exynos_tmu_irq,
IRQF_TRIGGER_RISING | IRQF_SHARED, dev_name(&pdev->dev), data); IRQF_TRIGGER_RISING | IRQF_SHARED, dev_name(&pdev->dev), data);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to request irq: %d\n", data->irq); dev_err(&pdev->dev, "Failed to request irq: %d\n", data->irq);
goto err_clk; goto err_sclk;
} }
exynos_tmu_control(pdev, true);
return 0; return 0;
err_sclk:
clk_disable_unprepare(data->sclk);
err_clk: err_clk:
clk_unprepare(data->clk); clk_unprepare(data->clk);
err_clk_sec: err_clk_sec:
if (!IS_ERR(data->clk_sec)) if (!IS_ERR(data->clk_sec))
clk_unprepare(data->clk_sec); clk_unprepare(data->clk_sec);
err_sensor:
thermal_zone_of_sensor_unregister(&pdev->dev, data->tzd);
return ret; return ret;
} }
static int exynos_tmu_remove(struct platform_device *pdev) static int exynos_tmu_remove(struct platform_device *pdev)
{ {
struct exynos_tmu_data *data = platform_get_drvdata(pdev); struct exynos_tmu_data *data = platform_get_drvdata(pdev);
struct thermal_zone_device *tzd = data->tzd;
exynos_unregister_thermal(data->reg_conf); thermal_zone_of_sensor_unregister(&pdev->dev, tzd);
exynos_tmu_control(pdev, false); exynos_tmu_control(pdev, false);
clk_disable_unprepare(data->sclk);
clk_unprepare(data->clk); clk_unprepare(data->clk);
if (!IS_ERR(data->clk_sec)) if (!IS_ERR(data->clk_sec))
clk_unprepare(data->clk_sec); clk_unprepare(data->clk_sec);
......
drivers/thermal/samsung/exynos_tmu.h
View file @ 3d883483
...@@ -23,16 +23,7 @@ ...@@ -23,16 +23,7 @@
#ifndef _EXYNOS_TMU_H #ifndef _EXYNOS_TMU_H
#define _EXYNOS_TMU_H #define _EXYNOS_TMU_H
#include <linux/cpu_cooling.h> #include <linux/cpu_cooling.h>
#include <dt-bindings/thermal/thermal_exynos.h>
#include "exynos_thermal_common.h"
enum calibration_type {
TYPE_ONE_POINT_TRIMMING,
TYPE_ONE_POINT_TRIMMING_25,
TYPE_ONE_POINT_TRIMMING_85,
TYPE_TWO_POINT_TRIMMING,
TYPE_NONE,
};
enum soc_type { enum soc_type {
SOC_ARCH_EXYNOS3250 = 1, SOC_ARCH_EXYNOS3250 = 1,
...@@ -43,38 +34,11 @@ enum soc_type { ...@@ -43,38 +34,11 @@ enum soc_type {
SOC_ARCH_EXYNOS5420, SOC_ARCH_EXYNOS5420,
SOC_ARCH_EXYNOS5420_TRIMINFO, SOC_ARCH_EXYNOS5420_TRIMINFO,
SOC_ARCH_EXYNOS5440, SOC_ARCH_EXYNOS5440,
SOC_ARCH_EXYNOS7,
}; };
/** /**
* struct exynos_tmu_platform_data * struct exynos_tmu_platform_data
* @threshold: basic temperature for generating interrupt
* 25 <= threshold <= 125 [unit: degree Celsius]
* @threshold_falling: differntial value for setting threshold
* of temperature falling interrupt.
* @trigger_levels: array for each interrupt levels
* [unit: degree Celsius]
* 0: temperature for trigger_level0 interrupt
* condition for trigger_level0 interrupt:
* current temperature > threshold + trigger_levels[0]
* 1: temperature for trigger_level1 interrupt
* condition for trigger_level1 interrupt:
* current temperature > threshold + trigger_levels[1]
* 2: temperature for trigger_level2 interrupt
* condition for trigger_level2 interrupt:
* current temperature > threshold + trigger_levels[2]
* 3: temperature for trigger_level3 interrupt
* condition for trigger_level3 interrupt:
* current temperature > threshold + trigger_levels[3]
* @trigger_type: defines the type of trigger. Possible values are,
* THROTTLE_ACTIVE trigger type
* THROTTLE_PASSIVE trigger type
* SW_TRIP trigger type
* HW_TRIP
* @trigger_enable[]: array to denote which trigger levels are enabled.
* 1 = enable trigger_level[] interrupt,
* 0 = disable trigger_level[] interrupt
* @max_trigger_level: max trigger level supported by the TMU
* @non_hw_trigger_levels: number of defined non-hardware trigger levels
* @gain: gain of amplifier in the positive-TC generator block * @gain: gain of amplifier in the positive-TC generator block
* 0 < gain <= 15 * 0 < gain <= 15
* @reference_voltage: reference voltage of amplifier * @reference_voltage: reference voltage of amplifier
...@@ -86,24 +50,12 @@ enum soc_type { ...@@ -86,24 +50,12 @@ enum soc_type {
* @efuse_value: platform defined fuse value * @efuse_value: platform defined fuse value
* @min_efuse_value: minimum valid trimming data * @min_efuse_value: minimum valid trimming data
* @max_efuse_value: maximum valid trimming data * @max_efuse_value: maximum valid trimming data
* @first_point_trim: temp value of the first point trimming
* @second_point_trim: temp value of the second point trimming
* @default_temp_offset: default temperature offset in case of no trimming * @default_temp_offset: default temperature offset in case of no trimming
* @cal_type: calibration type for temperature * @cal_type: calibration type for temperature
* @freq_clip_table: Table representing frequency reduction percentage.
* @freq_tab_count: Count of the above table as frequency reduction may
* applicable to only some of the trigger levels.
* *
* This structure is required for configuration of exynos_tmu driver. * This structure is required for configuration of exynos_tmu driver.
*/ */
struct exynos_tmu_platform_data { struct exynos_tmu_platform_data {
u8 threshold;
u8 threshold_falling;
u8 trigger_levels[MAX_TRIP_COUNT];
enum trigger_type trigger_type[MAX_TRIP_COUNT];
bool trigger_enable[MAX_TRIP_COUNT];
u8 max_trigger_level;
u8 non_hw_trigger_levels;
u8 gain; u8 gain;
u8 reference_voltage; u8 reference_voltage;
u8 noise_cancel_mode; u8 noise_cancel_mode;
...@@ -115,30 +67,9 @@ struct exynos_tmu_platform_data { ...@@ -115,30 +67,9 @@ struct exynos_tmu_platform_data {
u8 second_point_trim; u8 second_point_trim;
u8 default_temp_offset; u8 default_temp_offset;
enum calibration_type cal_type;
enum soc_type type; enum soc_type type;
struct freq_clip_table freq_tab[4]; u32 cal_type;
unsigned int freq_tab_count; u32 cal_mode;
};
/**
* struct exynos_tmu_init_data
* @tmu_count: number of TMU instances.
* @tmu_data: platform data of all TMU instances.
* This structure is required to store data for multi-instance exynos tmu
* driver.
*/
struct exynos_tmu_init_data {
int tmu_count;
struct exynos_tmu_platform_data tmu_data[];
}; };
extern struct exynos_tmu_init_data const exynos3250_default_tmu_data;
extern struct exynos_tmu_init_data const exynos4210_default_tmu_data;
extern struct exynos_tmu_init_data const exynos4412_default_tmu_data;
extern struct exynos_tmu_init_data const exynos5250_default_tmu_data;
extern struct exynos_tmu_init_data const exynos5260_default_tmu_data;
extern struct exynos_tmu_init_data const exynos5420_default_tmu_data;
extern struct exynos_tmu_init_data const exynos5440_default_tmu_data;
#endif /* _EXYNOS_TMU_H */ #endif /* _EXYNOS_TMU_H */
drivers/thermal/samsung/exynos_tmu_data.c deleted 100644 → 0
View file @ e3a1f6ca
/*
* exynos_tmu_data.c - Samsung EXYNOS tmu data file
*
* Copyright (C) 2013 Samsung Electronics
* Amit Daniel Kachhap <amit.daniel@samsung.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* 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.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
#include "exynos_thermal_common.h"
#include "exynos_tmu.h"
struct exynos_tmu_init_data const exynos4210_default_tmu_data = {
.tmu_data = {
{
.threshold = 80,
.trigger_levels[0] = 5,
.trigger_levels[1] = 20,
.trigger_levels[2] = 30,
.trigger_enable[0] = true,
.trigger_enable[1] = true,
.trigger_enable[2] = true,
.trigger_enable[3] = false,
.trigger_type[0] = THROTTLE_ACTIVE,
.trigger_type[1] = THROTTLE_ACTIVE,
.trigger_type[2] = SW_TRIP,
.max_trigger_level = 4,
.non_hw_trigger_levels = 3,
.gain = 15,
.reference_voltage = 7,
.cal_type = TYPE_ONE_POINT_TRIMMING,
.min_efuse_value = 40,
.max_efuse_value = 100,
.first_point_trim = 25,
.second_point_trim = 85,
.default_temp_offset = 50,
.freq_tab[0] = {
.freq_clip_max = 800 * 1000,
.temp_level = 85,
},
.freq_tab[1] = {
.freq_clip_max = 200 * 1000,
.temp_level = 100,
},
.freq_tab_count = 2,
.type = SOC_ARCH_EXYNOS4210,
},
},
.tmu_count = 1,
};
#define EXYNOS3250_TMU_DATA \
.threshold_falling = 10, \
.trigger_levels[0] = 70, \
.trigger_levels[1] = 95, \
.trigger_levels[2] = 110, \
.trigger_levels[3] = 120, \
.trigger_enable[0] = true, \
.trigger_enable[1] = true, \
.trigger_enable[2] = true, \
.trigger_enable[3] = false, \
.trigger_type[0] = THROTTLE_ACTIVE, \
.trigger_type[1] = THROTTLE_ACTIVE, \
.trigger_type[2] = SW_TRIP, \
.trigger_type[3] = HW_TRIP, \
.max_trigger_level = 4, \
.non_hw_trigger_levels = 3, \
.gain = 8, \
.reference_voltage = 16, \
.noise_cancel_mode = 4, \
.cal_type = TYPE_TWO_POINT_TRIMMING, \
.efuse_value = 55, \
.min_efuse_value = 40, \
.max_efuse_value = 100, \
.first_point_trim = 25, \
.second_point_trim = 85, \
.default_temp_offset = 50, \
.freq_tab[0] = { \
.freq_clip_max = 800 * 1000, \
.temp_level = 70, \
}, \
.freq_tab[1] = { \
.freq_clip_max = 400 * 1000, \
.temp_level = 95, \
}, \
.freq_tab_count = 2
struct exynos_tmu_init_data const exynos3250_default_tmu_data = {
.tmu_data = {
{
EXYNOS3250_TMU_DATA,
.type = SOC_ARCH_EXYNOS3250,
},
},
.tmu_count = 1,
};
#define EXYNOS4412_TMU_DATA \
.threshold_falling = 10, \
.trigger_levels[0] = 70, \
.trigger_levels[1] = 95, \
.trigger_levels[2] = 110, \
.trigger_levels[3] = 120, \
.trigger_enable[0] = true, \
.trigger_enable[1] = true, \
.trigger_enable[2] = true, \
.trigger_enable[3] = false, \
.trigger_type[0] = THROTTLE_ACTIVE, \
.trigger_type[1] = THROTTLE_ACTIVE, \
.trigger_type[2] = SW_TRIP, \
.trigger_type[3] = HW_TRIP, \
.max_trigger_level = 4, \
.non_hw_trigger_levels = 3, \
.gain = 8, \
.reference_voltage = 16, \
.noise_cancel_mode = 4, \
.cal_type = TYPE_ONE_POINT_TRIMMING, \
.efuse_value = 55, \
.min_efuse_value = 40, \
.max_efuse_value = 100, \
.first_point_trim = 25, \
.second_point_trim = 85, \
.default_temp_offset = 50, \
.freq_tab[0] = { \
.freq_clip_max = 1400 * 1000, \
.temp_level = 70, \
}, \
.freq_tab[1] = { \
.freq_clip_max = 400 * 1000, \
.temp_level = 95, \
}, \
.freq_tab_count = 2
struct exynos_tmu_init_data const exynos4412_default_tmu_data = {
.tmu_data = {
{
EXYNOS4412_TMU_DATA,
.type = SOC_ARCH_EXYNOS4412,
},
},
.tmu_count = 1,
};
struct exynos_tmu_init_data const exynos5250_default_tmu_data = {
.tmu_data = {
{
EXYNOS4412_TMU_DATA,
.type = SOC_ARCH_EXYNOS5250,
},
},
.tmu_count = 1,
};
#define __EXYNOS5260_TMU_DATA \
.threshold_falling = 10, \
.trigger_levels[0] = 85, \
.trigger_levels[1] = 103, \
.trigger_levels[2] = 110, \
.trigger_levels[3] = 120, \
.trigger_enable[0] = true, \
.trigger_enable[1] = true, \
.trigger_enable[2] = true, \
.trigger_enable[3] = false, \
.trigger_type[0] = THROTTLE_ACTIVE, \
.trigger_type[1] = THROTTLE_ACTIVE, \
.trigger_type[2] = SW_TRIP, \
.trigger_type[3] = HW_TRIP, \
.max_trigger_level = 4, \
.non_hw_trigger_levels = 3, \
.gain = 8, \
.reference_voltage = 16, \
.noise_cancel_mode = 4, \
.cal_type = TYPE_ONE_POINT_TRIMMING, \
.efuse_value = 55, \
.min_efuse_value = 40, \
.max_efuse_value = 100, \
.first_point_trim = 25, \
.second_point_trim = 85, \
.default_temp_offset = 50, \
.freq_tab[0] = { \
.freq_clip_max = 800 * 1000, \
.temp_level = 85, \
}, \
.freq_tab[1] = { \
.freq_clip_max = 200 * 1000, \
.temp_level = 103, \
}, \
.freq_tab_count = 2, \
#define EXYNOS5260_TMU_DATA \
__EXYNOS5260_TMU_DATA \
.type = SOC_ARCH_EXYNOS5260
struct exynos_tmu_init_data const exynos5260_default_tmu_data = {
.tmu_data = {
{ EXYNOS5260_TMU_DATA },
{ EXYNOS5260_TMU_DATA },
{ EXYNOS5260_TMU_DATA },
{ EXYNOS5260_TMU_DATA },
{ EXYNOS5260_TMU_DATA },
},
.tmu_count = 5,
};
#define EXYNOS5420_TMU_DATA \
__EXYNOS5260_TMU_DATA \
.type = SOC_ARCH_EXYNOS5420
#define EXYNOS5420_TMU_DATA_SHARED \
__EXYNOS5260_TMU_DATA \
.type = SOC_ARCH_EXYNOS5420_TRIMINFO
struct exynos_tmu_init_data const exynos5420_default_tmu_data = {
.tmu_data = {
{ EXYNOS5420_TMU_DATA },
{ EXYNOS5420_TMU_DATA },
{ EXYNOS5420_TMU_DATA_SHARED },
{ EXYNOS5420_TMU_DATA_SHARED },
{ EXYNOS5420_TMU_DATA_SHARED },
},
.tmu_count = 5,
};
#define EXYNOS5440_TMU_DATA \
.trigger_levels[0] = 100, \
.trigger_levels[4] = 105, \
.trigger_enable[0] = 1, \
.trigger_type[0] = SW_TRIP, \
.trigger_type[4] = HW_TRIP, \
.max_trigger_level = 5, \
.non_hw_trigger_levels = 1, \
.gain = 5, \
.reference_voltage = 16, \
.noise_cancel_mode = 4, \
.cal_type = TYPE_ONE_POINT_TRIMMING, \
.efuse_value = 0x5b2d, \
.min_efuse_value = 16, \
.max_efuse_value = 76, \
.first_point_trim = 25, \
.second_point_trim = 70, \
.default_temp_offset = 25, \
.type = SOC_ARCH_EXYNOS5440
struct exynos_tmu_init_data const exynos5440_default_tmu_data = {
.tmu_data = {
{ EXYNOS5440_TMU_DATA } ,
{ EXYNOS5440_TMU_DATA } ,
{ EXYNOS5440_TMU_DATA } ,
},
.tmu_count = 3,
};
include/dt-bindings/thermal/thermal_exynos.h 0 → 100644
View file @ 3d883483
/*
* thermal_exynos.h - Samsung EXYNOS TMU device tree definitions
*
* Copyright (C) 2014 Samsung Electronics
* Lukasz Majewski <l.majewski@samsung.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* 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.
*
*/
#ifndef _EXYNOS_THERMAL_TMU_DT_H
#define _EXYNOS_THERMAL_TMU_DT_H
#define TYPE_ONE_POINT_TRIMMING 0
#define TYPE_ONE_POINT_TRIMMING_25 1
#define TYPE_ONE_POINT_TRIMMING_85 2
#define TYPE_TWO_POINT_TRIMMING 3
#define TYPE_NONE 4
#endif /* _EXYNOS_THERMAL_TMU_DT_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7