Commit 8cbd0eef authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

Pull thermal management updates from Zhang Rui:
 "There are not too many changes this time, except two new platform
  thermal drivers, ti-soc-thermal driver and x86_pkg_temp_thermal
  driver, and a couple of small fixes.

  Highlights:

   - move the ti-soc-thermal driver out of the staging tree to the
     thermal tree.

   - introduce the x86_pkg_temp_thermal driver.  This driver registers
     CPU digital temperature package level sensor as a thermal zone.

   - small fixes/cleanups including removing redundant use of
     platform_set_drvdata() and of_match_ptr for all platform thermal
     drivers"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (34 commits)
  thermal: cpu_cooling: fix stub function
  thermal: ti-soc-thermal: use standard GPIO DT bindings
  thermal: MAINTAINERS: Add git tree path for SoC specific updates
  thermal: fix x86_pkg_temp_thermal.c build and Kconfig
  Thermal: Documentation for x86 package temperature thermal driver
  Thermal: CPU Package temperature thermal
  thermal: consider emul_temperature while computing trend
  thermal: ti-soc-thermal: add DT example for DRA752 chip
  thermal: ti-soc-thermal: add dra752 chip to device table
  thermal: ti-soc-thermal: add thermal data for DRA752 chips
  thermal: ti-soc-thermal: remove usage of IS_ERR_OR_NULL
  thermal: ti-soc-thermal: freeze FSM while computing trend
  thermal: ti-soc-thermal: remove external heat while extrapolating hotspot
  thermal: ti-soc-thermal: update DT reference for OMAP5430
  x86, mcheck, therm_throt: Process package thresholds
  thermal: cpu_cooling: fix 'descend' check in get_property()
  Thermal: spear: Remove redundant use of of_match_ptr
  Thermal: kirkwood: Remove redundant use of of_match_ptr
  Thermal: dove: Remove redundant use of of_match_ptr
  Thermal: armada: Remove redundant use of of_match_ptr
  ...
parents 1466b77a e8d39240
...@@ -17,8 +17,9 @@ Required properties: ...@@ -17,8 +17,9 @@ Required properties:
- interrupts : this entry should indicate which interrupt line - interrupts : this entry should indicate which interrupt line
the talert signal is routed to; the talert signal is routed to;
Specific: Specific:
- ti,tshut-gpio : this entry should be used to inform which GPIO - gpios : this entry should be used to inform which GPIO
line the tshut signal is routed to; line the tshut signal is routed to. The informed GPIO will
be treated as an IRQ;
- regs : this entry must also be specified and it is specific - regs : this entry must also be specified and it is specific
to each bandgap version, because the mapping may change from to each bandgap version, because the mapping may change from
soc to soc, apart of depending on available features. soc to soc, apart of depending on available features.
...@@ -37,7 +38,7 @@ bandgap { ...@@ -37,7 +38,7 @@ bandgap {
0x4a002378 0x18>; 0x4a002378 0x18>;
compatible = "ti,omap4460-bandgap"; compatible = "ti,omap4460-bandgap";
interrupts = <0 126 4>; /* talert */ interrupts = <0 126 4>; /* talert */
ti,tshut-gpio = <86>; gpios = <&gpio3 22 0>; /* tshut */
}; };
OMAP4470: OMAP4470:
...@@ -47,7 +48,7 @@ bandgap { ...@@ -47,7 +48,7 @@ bandgap {
0x4a002378 0x18>; 0x4a002378 0x18>;
compatible = "ti,omap4470-bandgap"; compatible = "ti,omap4470-bandgap";
interrupts = <0 126 4>; /* talert */ interrupts = <0 126 4>; /* talert */
ti,tshut-gpio = <86>; gpios = <&gpio3 22 0>; /* tshut */
}; };
OMAP5430: OMAP5430:
...@@ -59,3 +60,15 @@ bandgap { ...@@ -59,3 +60,15 @@ bandgap {
compatible = "ti,omap5430-bandgap"; compatible = "ti,omap5430-bandgap";
interrupts = <0 126 4>; /* talert */ interrupts = <0 126 4>; /* talert */
}; };
DRA752:
bandgap {
reg = <0x4a0021e0 0xc
0x4a00232c 0xc
0x4a002380 0x2c
0x4a0023C0 0x3c
0x4a002564 0x8
0x4a002574 0x50>;
compatible = "ti,dra752-bandgap";
interrupts = <0 126 4>; /* talert */
};
Kernel driver: x86_pkg_temp_thermal
===================
Supported chips:
* x86: with package level thermal management
(Verify using: CPUID.06H:EAX[bit 6] =1)
Authors: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reference
---
Intel® 64 and IA-32 Architectures Software Developer’s Manual (Jan, 2013):
Chapter 14.6: PACKAGE LEVEL THERMAL MANAGEMENT
Description
---------
This driver register CPU digital temperature package level sensor as a thermal
zone with maximum two user mode configurable trip points. Number of trip points
depends on the capability of the package. Once the trip point is violated,
user mode can receive notification via thermal notification mechanism and can
take any action to control temperature.
Threshold management
--------------------
Each package will register as a thermal zone under /sys/class/thermal.
Example:
/sys/class/thermal/thermal_zone1
This contains two trip points:
- trip_point_0_temp
- trip_point_1_temp
User can set any temperature between 0 to TJ-Max temperature. Temperature units
are in milli-degree Celsius. Refer to "Documentation/thermal/sysfs-api.txt" for
thermal sys-fs details.
Any value other than 0 in these trip points, can trigger thermal notifications.
Setting 0, stops sending thermal notifications.
Thermal notifications: To get kobject-uevent notifications, set the thermal zone
policy to "user_space". For example: echo -n "user_space" > policy
...@@ -8159,6 +8159,7 @@ M: Zhang Rui <rui.zhang@intel.com> ...@@ -8159,6 +8159,7 @@ M: Zhang Rui <rui.zhang@intel.com>
M: Eduardo Valentin <eduardo.valentin@ti.com> M: Eduardo Valentin <eduardo.valentin@ti.com>
L: linux-pm@vger.kernel.org L: linux-pm@vger.kernel.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
Q: https://patchwork.kernel.org/project/linux-pm/list/ Q: https://patchwork.kernel.org/project/linux-pm/list/
S: Supported S: Supported
F: drivers/thermal/ F: drivers/thermal/
...@@ -8183,8 +8184,8 @@ F: drivers/platform/x86/thinkpad_acpi.c ...@@ -8183,8 +8184,8 @@ F: drivers/platform/x86/thinkpad_acpi.c
TI BANDGAP AND THERMAL DRIVER TI BANDGAP AND THERMAL DRIVER
M: Eduardo Valentin <eduardo.valentin@ti.com> M: Eduardo Valentin <eduardo.valentin@ti.com>
L: linux-pm@vger.kernel.org L: linux-pm@vger.kernel.org
S: Maintained S: Supported
F: drivers/staging/omap-thermal/ F: drivers/thermal/ti-soc-thermal/
TI FLASH MEDIA INTERFACE DRIVER TI FLASH MEDIA INTERFACE DRIVER
M: Alex Dubov <oakad@yahoo.com> M: Alex Dubov <oakad@yahoo.com>
......
...@@ -214,6 +214,13 @@ void mce_log_therm_throt_event(__u64 status); ...@@ -214,6 +214,13 @@ void mce_log_therm_throt_event(__u64 status);
/* Interrupt Handler for core thermal thresholds */ /* Interrupt Handler for core thermal thresholds */
extern int (*platform_thermal_notify)(__u64 msr_val); extern int (*platform_thermal_notify)(__u64 msr_val);
/* Interrupt Handler for package thermal thresholds */
extern int (*platform_thermal_package_notify)(__u64 msr_val);
/* Callback support of rate control, return true, if
* callback has rate control */
extern bool (*platform_thermal_package_rate_control)(void);
#ifdef CONFIG_X86_THERMAL_VECTOR #ifdef CONFIG_X86_THERMAL_VECTOR
extern void mcheck_intel_therm_init(void); extern void mcheck_intel_therm_init(void);
#else #else
......
...@@ -55,12 +55,24 @@ struct thermal_state { ...@@ -55,12 +55,24 @@ struct thermal_state {
struct _thermal_state package_power_limit; struct _thermal_state package_power_limit;
struct _thermal_state core_thresh0; struct _thermal_state core_thresh0;
struct _thermal_state core_thresh1; struct _thermal_state core_thresh1;
struct _thermal_state pkg_thresh0;
struct _thermal_state pkg_thresh1;
}; };
/* Callback to handle core threshold interrupts */ /* Callback to handle core threshold interrupts */
int (*platform_thermal_notify)(__u64 msr_val); int (*platform_thermal_notify)(__u64 msr_val);
EXPORT_SYMBOL(platform_thermal_notify); EXPORT_SYMBOL(platform_thermal_notify);
/* Callback to handle core package threshold_interrupts */
int (*platform_thermal_package_notify)(__u64 msr_val);
EXPORT_SYMBOL_GPL(platform_thermal_package_notify);
/* Callback support of rate control, return true, if
* callback has rate control */
bool (*platform_thermal_package_rate_control)(void);
EXPORT_SYMBOL_GPL(platform_thermal_package_rate_control);
static DEFINE_PER_CPU(struct thermal_state, thermal_state); static DEFINE_PER_CPU(struct thermal_state, thermal_state);
static atomic_t therm_throt_en = ATOMIC_INIT(0); static atomic_t therm_throt_en = ATOMIC_INIT(0);
...@@ -195,19 +207,25 @@ static int therm_throt_process(bool new_event, int event, int level) ...@@ -195,19 +207,25 @@ static int therm_throt_process(bool new_event, int event, int level)
return 0; return 0;
} }
static int thresh_event_valid(int event) static int thresh_event_valid(int level, int event)
{ {
struct _thermal_state *state; struct _thermal_state *state;
unsigned int this_cpu = smp_processor_id(); unsigned int this_cpu = smp_processor_id();
struct thermal_state *pstate = &per_cpu(thermal_state, this_cpu); struct thermal_state *pstate = &per_cpu(thermal_state, this_cpu);
u64 now = get_jiffies_64(); u64 now = get_jiffies_64();
state = (event == 0) ? &pstate->core_thresh0 : &pstate->core_thresh1; if (level == PACKAGE_LEVEL)
state = (event == 0) ? &pstate->pkg_thresh0 :
&pstate->pkg_thresh1;
else
state = (event == 0) ? &pstate->core_thresh0 :
&pstate->core_thresh1;
if (time_before64(now, state->next_check)) if (time_before64(now, state->next_check))
return 0; return 0;
state->next_check = now + CHECK_INTERVAL; state->next_check = now + CHECK_INTERVAL;
return 1; return 1;
} }
...@@ -322,6 +340,39 @@ device_initcall(thermal_throttle_init_device); ...@@ -322,6 +340,39 @@ device_initcall(thermal_throttle_init_device);
#endif /* CONFIG_SYSFS */ #endif /* CONFIG_SYSFS */
static void notify_package_thresholds(__u64 msr_val)
{
bool notify_thres_0 = false;
bool notify_thres_1 = false;
if (!platform_thermal_package_notify)
return;
/* lower threshold check */
if (msr_val & THERM_LOG_THRESHOLD0)
notify_thres_0 = true;
/* higher threshold check */
if (msr_val & THERM_LOG_THRESHOLD1)
notify_thres_1 = true;
if (!notify_thres_0 && !notify_thres_1)
return;
if (platform_thermal_package_rate_control &&
platform_thermal_package_rate_control()) {
/* Rate control is implemented in callback */
platform_thermal_package_notify(msr_val);
return;
}
/* lower threshold reached */
if (notify_thres_0 && thresh_event_valid(PACKAGE_LEVEL, 0))
platform_thermal_package_notify(msr_val);
/* higher threshold reached */
if (notify_thres_1 && thresh_event_valid(PACKAGE_LEVEL, 1))
platform_thermal_package_notify(msr_val);
}
static void notify_thresholds(__u64 msr_val) static void notify_thresholds(__u64 msr_val)
{ {
/* check whether the interrupt handler is defined; /* check whether the interrupt handler is defined;
...@@ -331,10 +382,12 @@ static void notify_thresholds(__u64 msr_val) ...@@ -331,10 +382,12 @@ static void notify_thresholds(__u64 msr_val)
return; return;
/* lower threshold reached */ /* lower threshold reached */
if ((msr_val & THERM_LOG_THRESHOLD0) && thresh_event_valid(0)) if ((msr_val & THERM_LOG_THRESHOLD0) &&
thresh_event_valid(CORE_LEVEL, 0))
platform_thermal_notify(msr_val); platform_thermal_notify(msr_val);
/* higher threshold reached */ /* higher threshold reached */
if ((msr_val & THERM_LOG_THRESHOLD1) && thresh_event_valid(1)) if ((msr_val & THERM_LOG_THRESHOLD1) &&
thresh_event_valid(CORE_LEVEL, 1))
platform_thermal_notify(msr_val); platform_thermal_notify(msr_val);
} }
...@@ -360,6 +413,8 @@ static void intel_thermal_interrupt(void) ...@@ -360,6 +413,8 @@ static void intel_thermal_interrupt(void)
if (this_cpu_has(X86_FEATURE_PTS)) { if (this_cpu_has(X86_FEATURE_PTS)) {
rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val); rdmsrl(MSR_IA32_PACKAGE_THERM_STATUS, msr_val);
/* check violations of package thermal thresholds */
notify_package_thresholds(msr_val);
therm_throt_process(msr_val & PACKAGE_THERM_STATUS_PROCHOT, therm_throt_process(msr_val & PACKAGE_THERM_STATUS_PROCHOT,
THERMAL_THROTTLING_EVENT, THERMAL_THROTTLING_EVENT,
PACKAGE_LEVEL); PACKAGE_LEVEL);
......
...@@ -120,8 +120,6 @@ source "drivers/staging/gdm72xx/Kconfig" ...@@ -120,8 +120,6 @@ source "drivers/staging/gdm72xx/Kconfig"
source "drivers/staging/csr/Kconfig" source "drivers/staging/csr/Kconfig"
source "drivers/staging/ti-soc-thermal/Kconfig"
source "drivers/staging/silicom/Kconfig" source "drivers/staging/silicom/Kconfig"
source "drivers/staging/ced1401/Kconfig" source "drivers/staging/ced1401/Kconfig"
......
...@@ -53,7 +53,6 @@ obj-$(CONFIG_ANDROID) += android/ ...@@ -53,7 +53,6 @@ obj-$(CONFIG_ANDROID) += android/
obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/ obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/
obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/ obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/
obj-$(CONFIG_CSR_WIFI) += csr/ obj-$(CONFIG_CSR_WIFI) += csr/
obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/
obj-$(CONFIG_NET_VENDOR_SILICOM) += silicom/ obj-$(CONFIG_NET_VENDOR_SILICOM) += silicom/
obj-$(CONFIG_CED1401) += ced1401/ obj-$(CONFIG_CED1401) += ced1401/
obj-$(CONFIG_DRM_IMX) += imx-drm/ obj-$(CONFIG_DRM_IMX) += imx-drm/
......
...@@ -169,4 +169,19 @@ config INTEL_POWERCLAMP ...@@ -169,4 +169,19 @@ config INTEL_POWERCLAMP
enforce idle time which results in more package C-state residency. The enforce idle time which results in more package C-state residency. The
user interface is exposed via generic thermal framework. user interface is exposed via generic thermal framework.
config X86_PKG_TEMP_THERMAL
tristate "X86 package temperature thermal driver"
depends on X86_THERMAL_VECTOR
select THERMAL_GOV_USER_SPACE
default m
help
Enable this to register CPU digital sensor for package temperature as
thermal zone. Each package will have its own thermal zone. There are
two trip points which can be set by user to get notifications via thermal
notification methods.
menu "Texas Instruments thermal drivers"
source "drivers/thermal/ti-soc-thermal/Kconfig"
endmenu
endif endif
...@@ -23,4 +23,5 @@ obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o ...@@ -23,4 +23,5 @@ obj-$(CONFIG_DB8500_THERMAL) += db8500_thermal.o
obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o
obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o
obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o
obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o
obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/
...@@ -200,7 +200,6 @@ static int armada_thermal_exit(struct platform_device *pdev) ...@@ -200,7 +200,6 @@ static int armada_thermal_exit(struct platform_device *pdev)
platform_get_drvdata(pdev); platform_get_drvdata(pdev);
thermal_zone_device_unregister(armada_thermal); thermal_zone_device_unregister(armada_thermal);
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
...@@ -211,7 +210,7 @@ static struct platform_driver armada_thermal_driver = { ...@@ -211,7 +210,7 @@ static struct platform_driver armada_thermal_driver = {
.driver = { .driver = {
.name = "armada_thermal", .name = "armada_thermal",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = of_match_ptr(armada_thermal_id_table), .of_match_table = armada_thermal_id_table,
}, },
}; };
......
...@@ -167,7 +167,7 @@ static int get_property(unsigned int cpu, unsigned long input, ...@@ -167,7 +167,7 @@ static int get_property(unsigned int cpu, unsigned long input,
continue; continue;
/* get the frequency order */ /* get the frequency order */
if (freq != CPUFREQ_ENTRY_INVALID && descend != -1) if (freq != CPUFREQ_ENTRY_INVALID && descend == -1)
descend = !!(freq > table[i].frequency); descend = !!(freq > table[i].frequency);
freq = table[i].frequency; freq = table[i].frequency;
......
...@@ -134,16 +134,11 @@ static int dove_thermal_probe(struct platform_device *pdev) ...@@ -134,16 +134,11 @@ static int dove_thermal_probe(struct platform_device *pdev)
struct resource *res; struct resource *res;
int ret; int ret;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(&pdev->dev, "Failed to get platform resource\n");
return -ENODEV;
}
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
priv->sensor = devm_ioremap_resource(&pdev->dev, res); priv->sensor = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(priv->sensor)) if (IS_ERR(priv->sensor))
return PTR_ERR(priv->sensor); return PTR_ERR(priv->sensor);
...@@ -178,7 +173,6 @@ static int dove_thermal_exit(struct platform_device *pdev) ...@@ -178,7 +173,6 @@ static int dove_thermal_exit(struct platform_device *pdev)
platform_get_drvdata(pdev); platform_get_drvdata(pdev);
thermal_zone_device_unregister(dove_thermal); thermal_zone_device_unregister(dove_thermal);
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
...@@ -191,7 +185,7 @@ static struct platform_driver dove_thermal_driver = { ...@@ -191,7 +185,7 @@ static struct platform_driver dove_thermal_driver = {
.driver = { .driver = {
.name = "dove_thermal", .name = "dove_thermal",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = of_match_ptr(dove_thermal_id_table), .of_match_table = dove_thermal_id_table,
}, },
}; };
......
...@@ -997,7 +997,6 @@ static int exynos_tmu_probe(struct platform_device *pdev) ...@@ -997,7 +997,6 @@ static int exynos_tmu_probe(struct platform_device *pdev)
return 0; return 0;
err_clk: err_clk:
platform_set_drvdata(pdev, NULL);
clk_unprepare(data->clk); clk_unprepare(data->clk);
return ret; return ret;
} }
...@@ -1012,8 +1011,6 @@ static int exynos_tmu_remove(struct platform_device *pdev) ...@@ -1012,8 +1011,6 @@ static int exynos_tmu_remove(struct platform_device *pdev)
clk_unprepare(data->clk); clk_unprepare(data->clk);
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
......
...@@ -75,16 +75,11 @@ static int kirkwood_thermal_probe(struct platform_device *pdev) ...@@ -75,16 +75,11 @@ static int kirkwood_thermal_probe(struct platform_device *pdev)
struct kirkwood_thermal_priv *priv; struct kirkwood_thermal_priv *priv;
struct resource *res; struct resource *res;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(&pdev->dev, "Failed to get platform resource\n");
return -ENODEV;
}
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
priv->sensor = devm_ioremap_resource(&pdev->dev, res); priv->sensor = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(priv->sensor)) if (IS_ERR(priv->sensor))
return PTR_ERR(priv->sensor); return PTR_ERR(priv->sensor);
...@@ -108,7 +103,6 @@ static int kirkwood_thermal_exit(struct platform_device *pdev) ...@@ -108,7 +103,6 @@ static int kirkwood_thermal_exit(struct platform_device *pdev)
platform_get_drvdata(pdev); platform_get_drvdata(pdev);
thermal_zone_device_unregister(kirkwood_thermal); thermal_zone_device_unregister(kirkwood_thermal);
platform_set_drvdata(pdev, NULL);
return 0; return 0;
} }
...@@ -121,7 +115,7 @@ static struct platform_driver kirkwood_thermal_driver = { ...@@ -121,7 +115,7 @@ static struct platform_driver kirkwood_thermal_driver = {
.driver = { .driver = {
.name = "kirkwood_thermal", .name = "kirkwood_thermal",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.of_match_table = of_match_ptr(kirkwood_thermal_id_table), .of_match_table = kirkwood_thermal_id_table,
}, },
}; };
......
...@@ -389,11 +389,6 @@ static int rcar_thermal_probe(struct platform_device *pdev) ...@@ -389,11 +389,6 @@ static int rcar_thermal_probe(struct platform_device *pdev)
* platform has IRQ support. * platform has IRQ support.
* Then, drier use common register * Then, drier use common register
*/ */
res = platform_get_resource(pdev, IORESOURCE_MEM, mres++);
if (!res) {
dev_err(dev, "Could not get platform resource\n");
return -ENODEV;
}
ret = devm_request_irq(dev, irq->start, rcar_thermal_irq, 0, ret = devm_request_irq(dev, irq->start, rcar_thermal_irq, 0,
dev_name(dev), common); dev_name(dev), common);
...@@ -405,6 +400,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) ...@@ -405,6 +400,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
/* /*
* rcar_has_irq_support() will be enabled * rcar_has_irq_support() will be enabled
*/ */
res = platform_get_resource(pdev, IORESOURCE_MEM, mres++);
common->base = devm_ioremap_resource(dev, res); common->base = devm_ioremap_resource(dev, res);
if (IS_ERR(common->base)) if (IS_ERR(common->base))
return PTR_ERR(common->base); return PTR_ERR(common->base);
...@@ -458,7 +454,7 @@ static int rcar_thermal_probe(struct platform_device *pdev) ...@@ -458,7 +454,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, common); platform_set_drvdata(pdev, common);
dev_info(dev, "%d sensor proved\n", i); dev_info(dev, "%d sensor probed\n", i);
return 0; return 0;
...@@ -487,8 +483,6 @@ static int rcar_thermal_remove(struct platform_device *pdev) ...@@ -487,8 +483,6 @@ static int rcar_thermal_remove(struct platform_device *pdev)
rcar_thermal_irq_disable(priv); rcar_thermal_irq_disable(priv);
} }
platform_set_drvdata(pdev, NULL);
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);
pm_runtime_disable(dev); pm_runtime_disable(dev);
......
...@@ -104,7 +104,7 @@ static int spear_thermal_probe(struct platform_device *pdev) ...@@ -104,7 +104,7 @@ static int spear_thermal_probe(struct platform_device *pdev)
struct thermal_zone_device *spear_thermal = NULL; struct thermal_zone_device *spear_thermal = NULL;
struct spear_thermal_dev *stdev; struct spear_thermal_dev *stdev;
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct resource *stres = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *res;
int ret = 0, val; int ret = 0, val;
if (!np || !of_property_read_u32(np, "st,thermal-flags", &val)) { if (!np || !of_property_read_u32(np, "st,thermal-flags", &val)) {
...@@ -112,11 +112,6 @@ static int spear_thermal_probe(struct platform_device *pdev) ...@@ -112,11 +112,6 @@ static int spear_thermal_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
if (!stres) {
dev_err(&pdev->dev, "memory resource missing\n");
return -ENODEV;
}
stdev = devm_kzalloc(&pdev->dev, sizeof(*stdev), GFP_KERNEL); stdev = devm_kzalloc(&pdev->dev, sizeof(*stdev), GFP_KERNEL);
if (!stdev) { if (!stdev) {
dev_err(&pdev->dev, "kzalloc fail\n"); dev_err(&pdev->dev, "kzalloc fail\n");
...@@ -124,12 +119,10 @@ static int spear_thermal_probe(struct platform_device *pdev) ...@@ -124,12 +119,10 @@ static int spear_thermal_probe(struct platform_device *pdev)
} }
/* Enable thermal sensor */ /* Enable thermal sensor */
stdev->thermal_base = devm_ioremap(&pdev->dev, stres->start, res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
resource_size(stres)); stdev->thermal_base = devm_ioremap_resource(&pdev->dev, res);
if (!stdev->thermal_base) { if (IS_ERR(stdev->thermal_base))
dev_err(&pdev->dev, "ioremap failed\n"); return PTR_ERR(stdev->thermal_base);
return -ENOMEM;
}
stdev->clk = devm_clk_get(&pdev->dev, NULL); stdev->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(stdev->clk)) { if (IS_ERR(stdev->clk)) {
...@@ -174,7 +167,6 @@ static int spear_thermal_exit(struct platform_device *pdev) ...@@ -174,7 +167,6 @@ static int spear_thermal_exit(struct platform_device *pdev)
struct spear_thermal_dev *stdev = spear_thermal->devdata; struct spear_thermal_dev *stdev = spear_thermal->devdata;
thermal_zone_device_unregister(spear_thermal); thermal_zone_device_unregister(spear_thermal);
platform_set_drvdata(pdev, NULL);
/* Disable SPEAr Thermal Sensor */ /* Disable SPEAr Thermal Sensor */
actual_mask = readl_relaxed(stdev->thermal_base); actual_mask = readl_relaxed(stdev->thermal_base);
...@@ -198,7 +190,7 @@ static struct platform_driver spear_thermal_driver = { ...@@ -198,7 +190,7 @@ static struct platform_driver spear_thermal_driver = {
.name = "spear_thermal", .name = "spear_thermal",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &spear_thermal_pm_ops, .pm = &spear_thermal_pm_ops,
.of_match_table = of_match_ptr(spear_thermal_id_table), .of_match_table = spear_thermal_id_table,
}, },
}; };
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <linux/idr.h> #include <linux/idr.h>
#include <linux/thermal.h> #include <linux/thermal.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/string.h>
#include <net/netlink.h> #include <net/netlink.h>
#include <net/genetlink.h> #include <net/genetlink.h>
...@@ -155,7 +156,8 @@ int get_tz_trend(struct thermal_zone_device *tz, int trip) ...@@ -155,7 +156,8 @@ int get_tz_trend(struct thermal_zone_device *tz, int trip)
{ {
enum thermal_trend trend; enum thermal_trend trend;
if (!tz->ops->get_trend || tz->ops->get_trend(tz, trip, &trend)) { if (tz->emul_temperature || !tz->ops->get_trend ||
tz->ops->get_trend(tz, trip, &trend)) {
if (tz->temperature > tz->last_temperature) if (tz->temperature > tz->last_temperature)
trend = THERMAL_TREND_RAISING; trend = THERMAL_TREND_RAISING;
else if (tz->temperature < tz->last_temperature) else if (tz->temperature < tz->last_temperature)
...@@ -713,10 +715,13 @@ policy_store(struct device *dev, struct device_attribute *attr, ...@@ -713,10 +715,13 @@ policy_store(struct device *dev, struct device_attribute *attr,
int ret = -EINVAL; int ret = -EINVAL;
struct thermal_zone_device *tz = to_thermal_zone(dev); struct thermal_zone_device *tz = to_thermal_zone(dev);
struct thermal_governor *gov; struct thermal_governor *gov;
char name[THERMAL_NAME_LENGTH];
snprintf(name, sizeof(name), "%s", buf);
mutex_lock(&thermal_governor_lock); mutex_lock(&thermal_governor_lock);
gov = __find_governor(buf); gov = __find_governor(strim(name));
if (!gov) if (!gov)
goto exit; goto exit;
...@@ -1624,7 +1629,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, ...@@ -1624,7 +1629,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type,
if (!ops || !ops->get_temp) if (!ops || !ops->get_temp)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
if (trips > 0 && !ops->get_trip_type) if (trips > 0 && (!ops->get_trip_type || !ops->get_trip_temp))
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
tz = kzalloc(sizeof(struct thermal_zone_device), GFP_KERNEL); tz = kzalloc(sizeof(struct thermal_zone_device), GFP_KERNEL);
......
...@@ -46,3 +46,15 @@ config OMAP5_THERMAL ...@@ -46,3 +46,15 @@ config OMAP5_THERMAL
This includes alert interrupts generation and also the TSHUT This includes alert interrupts generation and also the TSHUT
support. support.
config DRA752_THERMAL
bool "Texas Instruments DRA752 thermal support"
depends on TI_SOC_THERMAL
depends on SOC_DRA7XX
help
If you say yes here you get thermal support for the Texas Instruments
DRA752 SoC family. The current chip supported are:
- DRA752
This includes alert interrupts generation and also the TSHUT
support.
obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal.o obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal.o
ti-soc-thermal-y := ti-bandgap.o ti-soc-thermal-y := ti-bandgap.o
ti-soc-thermal-$(CONFIG_TI_THERMAL) += ti-thermal-common.o ti-soc-thermal-$(CONFIG_TI_THERMAL) += ti-thermal-common.o
ti-soc-thermal-$(CONFIG_DRA752_THERMAL) += dra752-thermal-data.o
ti-soc-thermal-$(CONFIG_OMAP4_THERMAL) += omap4-thermal-data.o ti-soc-thermal-$(CONFIG_OMAP4_THERMAL) += omap4-thermal-data.o
ti-soc-thermal-$(CONFIG_OMAP5_THERMAL) += omap5-thermal-data.o ti-soc-thermal-$(CONFIG_OMAP5_THERMAL) += omap5-thermal-data.o
This diff is collapsed.
This diff is collapsed.
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_irq.h> #include <linux/of_irq.h>
#include <linux/of_gpio.h>
#include <linux/io.h> #include <linux/io.h>
#include "ti-bandgap.h" #include "ti-bandgap.h"
...@@ -469,7 +470,7 @@ static inline int ti_bandgap_validate(struct ti_bandgap *bgp, int id) ...@@ -469,7 +470,7 @@ static inline int ti_bandgap_validate(struct ti_bandgap *bgp, int id)
{ {
int ret = 0; int ret = 0;
if (IS_ERR_OR_NULL(bgp)) { if (!bgp || IS_ERR(bgp)) {
pr_err("%s: invalid bandgap pointer\n", __func__); pr_err("%s: invalid bandgap pointer\n", __func__);
ret = -EINVAL; ret = -EINVAL;
goto exit; goto exit;
...@@ -992,9 +993,12 @@ int ti_bandgap_get_trend(struct ti_bandgap *bgp, int id, int *trend) ...@@ -992,9 +993,12 @@ int ti_bandgap_get_trend(struct ti_bandgap *bgp, int id, int *trend)
goto exit; goto exit;
} }
spin_lock(&bgp->lock);
tsr = bgp->conf->sensors[id].registers; tsr = bgp->conf->sensors[id].registers;
/* Freeze and read the last 2 valid readings */ /* Freeze and read the last 2 valid readings */
RMW_BITS(bgp, id, bgap_mask_ctrl, mask_freeze_mask, 1);
reg1 = tsr->ctrl_dtemp_1; reg1 = tsr->ctrl_dtemp_1;
reg2 = tsr->ctrl_dtemp_2; reg2 = tsr->ctrl_dtemp_2;
...@@ -1008,22 +1012,25 @@ int ti_bandgap_get_trend(struct ti_bandgap *bgp, int id, int *trend) ...@@ -1008,22 +1012,25 @@ int ti_bandgap_get_trend(struct ti_bandgap *bgp, int id, int *trend)
/* Convert from adc values to mCelsius temperature */ /* Convert from adc values to mCelsius temperature */
ret = ti_bandgap_adc_to_mcelsius(bgp, temp1, &t1); ret = ti_bandgap_adc_to_mcelsius(bgp, temp1, &t1);
if (ret) if (ret)
goto exit; goto unfreeze;
ret = ti_bandgap_adc_to_mcelsius(bgp, temp2, &t2); ret = ti_bandgap_adc_to_mcelsius(bgp, temp2, &t2);
if (ret) if (ret)
goto exit; goto unfreeze;
/* Fetch the update interval */ /* Fetch the update interval */
ret = ti_bandgap_read_update_interval(bgp, id, &interval); ret = ti_bandgap_read_update_interval(bgp, id, &interval);
if (ret || !interval) if (ret || !interval)
goto exit; goto unfreeze;
*trend = (t1 - t2) / interval; *trend = (t1 - t2) / interval;
dev_dbg(bgp->dev, "The temperatures are t1 = %d and t2 = %d and trend =%d\n", dev_dbg(bgp->dev, "The temperatures are t1 = %d and t2 = %d and trend =%d\n",
t1, t2, *trend); t1, t2, *trend);
unfreeze:
RMW_BITS(bgp, id, bgap_mask_ctrl, mask_freeze_mask, 0);
spin_unlock(&bgp->lock);
exit: exit:
return ret; return ret;
} }
...@@ -1123,7 +1130,6 @@ static struct ti_bandgap *ti_bandgap_build(struct platform_device *pdev) ...@@ -1123,7 +1130,6 @@ static struct ti_bandgap *ti_bandgap_build(struct platform_device *pdev)
const struct of_device_id *of_id; const struct of_device_id *of_id;
struct ti_bandgap *bgp; struct ti_bandgap *bgp;
struct resource *res; struct resource *res;
u32 prop;
int i; int i;
/* just for the sake */ /* just for the sake */
...@@ -1167,11 +1173,7 @@ static struct ti_bandgap *ti_bandgap_build(struct platform_device *pdev) ...@@ -1167,11 +1173,7 @@ static struct ti_bandgap *ti_bandgap_build(struct platform_device *pdev)
} while (res); } while (res);
if (TI_BANDGAP_HAS(bgp, TSHUT)) { if (TI_BANDGAP_HAS(bgp, TSHUT)) {
if (of_property_read_u32(node, "ti,tshut-gpio", &prop) < 0) { bgp->tshut_gpio = of_get_gpio(node, 0);
dev_err(&pdev->dev, "missing tshut gpio in device tree\n");
return ERR_PTR(-EINVAL);
}
bgp->tshut_gpio = prop;
if (!gpio_is_valid(bgp->tshut_gpio)) { if (!gpio_is_valid(bgp->tshut_gpio)) {
dev_err(&pdev->dev, "invalid gpio for tshut (%d)\n", dev_err(&pdev->dev, "invalid gpio for tshut (%d)\n",
bgp->tshut_gpio); bgp->tshut_gpio);
...@@ -1191,7 +1193,7 @@ int ti_bandgap_probe(struct platform_device *pdev) ...@@ -1191,7 +1193,7 @@ int ti_bandgap_probe(struct platform_device *pdev)
int clk_rate, ret = 0, i; int clk_rate, ret = 0, i;
bgp = ti_bandgap_build(pdev); bgp = ti_bandgap_build(pdev);
if (IS_ERR_OR_NULL(bgp)) { if (IS_ERR(bgp)) {
dev_err(&pdev->dev, "failed to fetch platform data\n"); dev_err(&pdev->dev, "failed to fetch platform data\n");
return PTR_ERR(bgp); return PTR_ERR(bgp);
} }
...@@ -1207,17 +1209,19 @@ int ti_bandgap_probe(struct platform_device *pdev) ...@@ -1207,17 +1209,19 @@ int ti_bandgap_probe(struct platform_device *pdev)
} }
bgp->fclock = clk_get(NULL, bgp->conf->fclock_name); bgp->fclock = clk_get(NULL, bgp->conf->fclock_name);
ret = IS_ERR_OR_NULL(bgp->fclock); ret = IS_ERR(bgp->fclock);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to request fclock reference\n"); dev_err(&pdev->dev, "failed to request fclock reference\n");
ret = PTR_ERR(bgp->fclock);
goto free_irqs; goto free_irqs;
} }
bgp->div_clk = clk_get(NULL, bgp->conf->div_ck_name); bgp->div_clk = clk_get(NULL, bgp->conf->div_ck_name);
ret = IS_ERR_OR_NULL(bgp->div_clk); ret = IS_ERR(bgp->div_clk);
if (ret) { if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed to request div_ts_ck clock ref\n"); "failed to request div_ts_ck clock ref\n");
ret = PTR_ERR(bgp->div_clk);
goto free_irqs; goto free_irqs;
} }
...@@ -1522,6 +1526,12 @@ static const struct of_device_id of_ti_bandgap_match[] = { ...@@ -1522,6 +1526,12 @@ static const struct of_device_id of_ti_bandgap_match[] = {
.compatible = "ti,omap5430-bandgap", .compatible = "ti,omap5430-bandgap",
.data = (void *)&omap5430_data, .data = (void *)&omap5430_data,
}, },
#endif
#ifdef CONFIG_DRA752_THERMAL
{
.compatible = "ti,dra752-bandgap",
.data = (void *)&dra752_data,
},
#endif #endif
/* Sentinel */ /* Sentinel */
{ }, { },
......
...@@ -400,4 +400,9 @@ extern const struct ti_bandgap_data omap5430_data; ...@@ -400,4 +400,9 @@ extern const struct ti_bandgap_data omap5430_data;
#define omap5430_data NULL #define omap5430_data NULL
#endif #endif
#ifdef CONFIG_DRA752_THERMAL
extern const struct ti_bandgap_data dra752_data;
#else
#define dra752_data NULL
#endif
#endif #endif
...@@ -101,7 +101,7 @@ static inline int ti_thermal_get_temp(struct thermal_zone_device *thermal, ...@@ -101,7 +101,7 @@ static inline int ti_thermal_get_temp(struct thermal_zone_device *thermal,
pcb_tz = data->pcb_tz; pcb_tz = data->pcb_tz;
/* In case pcb zone is available, use the extrapolation rule with it */ /* In case pcb zone is available, use the extrapolation rule with it */
if (!IS_ERR_OR_NULL(pcb_tz)) { if (!IS_ERR(pcb_tz)) {
ret = thermal_zone_get_temp(pcb_tz, &pcb_temp); ret = thermal_zone_get_temp(pcb_tz, &pcb_temp);
if (!ret) { if (!ret) {
tmp -= pcb_temp; /* got a valid PCB temp */ tmp -= pcb_temp; /* got a valid PCB temp */
...@@ -124,7 +124,7 @@ static int ti_thermal_bind(struct thermal_zone_device *thermal, ...@@ -124,7 +124,7 @@ static int ti_thermal_bind(struct thermal_zone_device *thermal,
struct ti_thermal_data *data = thermal->devdata; struct ti_thermal_data *data = thermal->devdata;
int id; int id;
if (IS_ERR_OR_NULL(data)) if (!data || IS_ERR(data))
return -ENODEV; return -ENODEV;
/* check if this is the cooling device we registered */ /* check if this is the cooling device we registered */
...@@ -146,7 +146,7 @@ static int ti_thermal_unbind(struct thermal_zone_device *thermal, ...@@ -146,7 +146,7 @@ static int ti_thermal_unbind(struct thermal_zone_device *thermal,
{ {
struct ti_thermal_data *data = thermal->devdata; struct ti_thermal_data *data = thermal->devdata;
if (IS_ERR_OR_NULL(data)) if (!data || IS_ERR(data))
return -ENODEV; return -ENODEV;
/* check if this is the cooling device we registered */ /* check if this is the cooling device we registered */
...@@ -282,6 +282,7 @@ static struct ti_thermal_data ...@@ -282,6 +282,7 @@ static struct ti_thermal_data
data->sensor_id = id; data->sensor_id = id;
data->bgp = bgp; data->bgp = bgp;
data->mode = THERMAL_DEVICE_ENABLED; data->mode = THERMAL_DEVICE_ENABLED;
/* pcb_tz will be either valid or PTR_ERR() */
data->pcb_tz = thermal_zone_get_zone_by_name("pcb"); data->pcb_tz = thermal_zone_get_zone_by_name("pcb");
INIT_WORK(&data->thermal_wq, ti_thermal_work); INIT_WORK(&data->thermal_wq, ti_thermal_work);
...@@ -295,7 +296,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, ...@@ -295,7 +296,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
data = ti_bandgap_get_sensor_data(bgp, id); data = ti_bandgap_get_sensor_data(bgp, id);
if (IS_ERR_OR_NULL(data)) if (!data || IS_ERR(data))
data = ti_thermal_build_data(bgp, id); data = ti_thermal_build_data(bgp, id);
if (!data) if (!data)
...@@ -306,7 +307,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id, ...@@ -306,7 +307,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,
OMAP_TRIP_NUMBER, 0, data, &ti_thermal_ops, OMAP_TRIP_NUMBER, 0, data, &ti_thermal_ops,
NULL, FAST_TEMP_MONITORING_RATE, NULL, FAST_TEMP_MONITORING_RATE,
FAST_TEMP_MONITORING_RATE); FAST_TEMP_MONITORING_RATE);
if (IS_ERR_OR_NULL(data->ti_thermal)) { if (IS_ERR(data->ti_thermal)) {
dev_err(bgp->dev, "thermal zone device is NULL\n"); dev_err(bgp->dev, "thermal zone device is NULL\n");
return PTR_ERR(data->ti_thermal); return PTR_ERR(data->ti_thermal);
} }
...@@ -343,7 +344,7 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id) ...@@ -343,7 +344,7 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id)
struct ti_thermal_data *data; struct ti_thermal_data *data;
data = ti_bandgap_get_sensor_data(bgp, id); data = ti_bandgap_get_sensor_data(bgp, id);
if (IS_ERR_OR_NULL(data)) if (!data || IS_ERR(data))
data = ti_thermal_build_data(bgp, id); data = ti_thermal_build_data(bgp, id);
if (!data) if (!data)
...@@ -356,7 +357,7 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id) ...@@ -356,7 +357,7 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id)
/* Register cooling device */ /* Register cooling device */
data->cool_dev = cpufreq_cooling_register(cpu_present_mask); data->cool_dev = cpufreq_cooling_register(cpu_present_mask);
if (IS_ERR_OR_NULL(data->cool_dev)) { if (IS_ERR(data->cool_dev)) {
dev_err(bgp->dev, dev_err(bgp->dev,
"Failed to register cpufreq cooling device\n"); "Failed to register cpufreq cooling device\n");
return PTR_ERR(data->cool_dev); return PTR_ERR(data->cool_dev);
......
...@@ -38,6 +38,9 @@ ...@@ -38,6 +38,9 @@
#define OMAP_GRADIENT_SLOPE_5430_GPU 117 #define OMAP_GRADIENT_SLOPE_5430_GPU 117
#define OMAP_GRADIENT_CONST_5430_GPU -2992 #define OMAP_GRADIENT_CONST_5430_GPU -2992
#define DRA752_GRADIENT_SLOPE 0
#define DRA752_GRADIENT_CONST 2000
/* PCB sensor calculation constants */ /* PCB sensor calculation constants */
#define OMAP_GRADIENT_SLOPE_W_PCB_4430 0 #define OMAP_GRADIENT_SLOPE_W_PCB_4430 0
#define OMAP_GRADIENT_CONST_W_PCB_4430 20000 #define OMAP_GRADIENT_CONST_W_PCB_4430 20000
...@@ -51,6 +54,9 @@ ...@@ -51,6 +54,9 @@
#define OMAP_GRADIENT_SLOPE_W_PCB_5430_GPU 464 #define OMAP_GRADIENT_SLOPE_W_PCB_5430_GPU 464
#define OMAP_GRADIENT_CONST_W_PCB_5430_GPU -5102 #define OMAP_GRADIENT_CONST_W_PCB_5430_GPU -5102
#define DRA752_GRADIENT_SLOPE_W_PCB 0
#define DRA752_GRADIENT_CONST_W_PCB 2000
/* trip points of interest in milicelsius (at hotspot level) */ /* trip points of interest in milicelsius (at hotspot level) */
#define OMAP_TRIP_COLD 100000 #define OMAP_TRIP_COLD 100000
#define OMAP_TRIP_HOT 110000 #define OMAP_TRIP_HOT 110000
......
This diff is collapsed.
...@@ -41,7 +41,7 @@ cpufreq_cooling_register(const struct cpumask *clip_cpus); ...@@ -41,7 +41,7 @@ cpufreq_cooling_register(const struct cpumask *clip_cpus);
*/ */
void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev); void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev);
unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int); unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq);
#else /* !CONFIG_CPU_THERMAL */ #else /* !CONFIG_CPU_THERMAL */
static inline struct thermal_cooling_device * static inline struct thermal_cooling_device *
cpufreq_cooling_register(const struct cpumask *clip_cpus) cpufreq_cooling_register(const struct cpumask *clip_cpus)
...@@ -54,7 +54,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) ...@@ -54,7 +54,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)
return; return;
} }
static inline static inline
unsigned long cpufreq_cooling_get_level(unsigned int, unsigned int) unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq)
{ {
return THERMAL_CSTATE_INVALID; return THERMAL_CSTATE_INVALID;
} }
......
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