From e4d66cd66d8fa4c266f4d1c55fff551462b62395 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 2 Dec 2015 21:52:41 +0000 Subject: kernel: update 4.1 to 4.1.13 - two upstreamed patches removed - compile tested all targets using 4.1 - run tested ar71xx Signed-off-by: Roman Yeryomin Signed-off-by: Hauke Mehrtens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47694 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...ermal-thermal-Add-support-for-hardware-tracked-tri.patch | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'target/linux/mediatek/patches/0020-thermal-thermal-Add-support-for-hardware-tracked-tri.patch') diff --git a/target/linux/mediatek/patches/0020-thermal-thermal-Add-support-for-hardware-tracked-tri.patch b/target/linux/mediatek/patches/0020-thermal-thermal-Add-support-for-hardware-tracked-tri.patch index 6a48350039..d492a0683f 100644 --- a/target/linux/mediatek/patches/0020-thermal-thermal-Add-support-for-hardware-tracked-tri.patch +++ b/target/linux/mediatek/patches/0020-thermal-thermal-Add-support-for-hardware-tracked-tri.patch @@ -30,11 +30,9 @@ Signed-off-by: Sascha Hauer include/linux/thermal.h | 3 +++ 2 files changed, 46 insertions(+) -diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c -index 6bbf61f..3ae1795 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c -@@ -453,6 +453,45 @@ int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp) +@@ -453,6 +453,45 @@ int thermal_zone_get_temp(struct thermal } EXPORT_SYMBOL_GPL(thermal_zone_get_temp); @@ -80,7 +78,7 @@ index 6bbf61f..3ae1795 100644 void thermal_zone_device_update(struct thermal_zone_device *tz) { int temp, ret, count; -@@ -479,6 +518,8 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) +@@ -479,6 +518,8 @@ void thermal_zone_device_update(struct t dev_dbg(&tz->device, "last_temperature=%d, current_temperature=%d\n", tz->last_temperature, tz->temperature); @@ -89,7 +87,7 @@ index 6bbf61f..3ae1795 100644 for (count = 0; count < tz->trips; count++) handle_thermal_trip(tz, count); } -@@ -1494,6 +1535,8 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, +@@ -1494,6 +1535,8 @@ struct thermal_zone_device *thermal_zone tz->trips = trips; tz->passive_delay = passive_delay; tz->polling_delay = polling_delay; @@ -98,8 +96,6 @@ index 6bbf61f..3ae1795 100644 dev_set_name(&tz->device, "thermal_zone%d", tz->id); result = device_register(&tz->device); -diff --git a/include/linux/thermal.h b/include/linux/thermal.h -index 07bd5e8..aef6e13 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -87,6 +87,7 @@ struct thermal_zone_device_ops { @@ -119,6 +115,3 @@ index 07bd5e8..aef6e13 100644 unsigned int forced_passive; const struct thermal_zone_device_ops *ops; const struct thermal_zone_params *tzp; --- -1.7.10.4 - -- cgit v1.2.3