From f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0 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 SVN-Revision: 47694 --- ...Make-struct-thermal_zone_device_ops-const.patch | 89 ++++++---------------- 1 file changed, 22 insertions(+), 67 deletions(-) (limited to 'target/linux/mediatek/patches/0019-thermal-Make-struct-thermal_zone_device_ops-const.patch') diff --git a/target/linux/mediatek/patches/0019-thermal-Make-struct-thermal_zone_device_ops-const.patch b/target/linux/mediatek/patches/0019-thermal-Make-struct-thermal_zone_device_ops-const.patch index 1ca9ab8..36f7ccf 100644 --- a/target/linux/mediatek/patches/0019-thermal-Make-struct-thermal_zone_device_ops-const.patch +++ b/target/linux/mediatek/patches/0019-thermal-Make-struct-thermal_zone_device_ops-const.patch @@ -31,11 +31,9 @@ Signed-off-by: Sascha Hauer include/linux/thermal.h | 6 +++--- 21 files changed, 23 insertions(+), 23 deletions(-) -diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt -index 87519cb..bb346a2 100644 --- a/Documentation/thermal/sysfs-api.txt +++ b/Documentation/thermal/sysfs-api.txt -@@ -33,7 +33,7 @@ temperature) and throttle appropriate devices. +@@ -33,7 +33,7 @@ temperature) and throttle appropriate de 1.1 thermal zone device interface 1.1.1 struct thermal_zone_device *thermal_zone_device_register(char *type, int trips, int mask, void *devdata, @@ -44,11 +42,9 @@ index 87519cb..bb346a2 100644 const struct thermal_zone_params *tzp, int passive_delay, int polling_delay)) -diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c -index 68bff60..6b11462 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c -@@ -869,7 +869,7 @@ acpi_thermal_unbind_cooling_device(struct thermal_zone_device *thermal, +@@ -869,7 +869,7 @@ acpi_thermal_unbind_cooling_device(struc return acpi_thermal_cooling_device_cb(thermal, cdev, false); } @@ -57,11 +53,9 @@ index 68bff60..6b11462 100644 .bind = acpi_thermal_bind_cooling_device, .unbind = acpi_thermal_unbind_cooling_device, .get_temp = thermal_get_temp, -diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c -index f2ce63c..bae9ca0 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c -@@ -482,7 +482,7 @@ static int acerhdf_get_crit_temp(struct thermal_zone_device *thermal, +@@ -482,7 +482,7 @@ static int acerhdf_get_crit_temp(struct } /* bind callback functions to thermalzone */ @@ -70,11 +64,9 @@ index f2ce63c..bae9ca0 100644 .bind = acerhdf_bind, .unbind = acerhdf_unbind, .get_temp = acerhdf_get_ec_temp, -diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c -index 0944e83..069d36b 100644 --- a/drivers/platform/x86/intel_mid_thermal.c +++ b/drivers/platform/x86/intel_mid_thermal.c -@@ -460,7 +460,7 @@ static int read_curr_temp(struct thermal_zone_device *tzd, unsigned long *temp) +@@ -460,7 +460,7 @@ static int read_curr_temp(struct thermal } /* Can't be const */ @@ -83,11 +75,9 @@ index 0944e83..069d36b 100644 .get_temp = read_curr_temp, }; -diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c -index 87e2fd1..878cb4e 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c -@@ -509,7 +509,7 @@ static int power_supply_read_temp(struct thermal_zone_device *tzd, +@@ -535,7 +535,7 @@ static int power_supply_read_temp(struct return ret; } @@ -96,11 +86,9 @@ index 87e2fd1..878cb4e 100644 .get_temp = power_supply_read_temp, }; -diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c -index 26b8d32..3f59c8b 100644 --- a/drivers/thermal/armada_thermal.c +++ b/drivers/thermal/armada_thermal.c -@@ -183,7 +183,7 @@ static int armada_get_temp(struct thermal_zone_device *thermal, +@@ -183,7 +183,7 @@ static int armada_get_temp(struct therma return 0; } @@ -109,11 +97,9 @@ index 26b8d32..3f59c8b 100644 .get_temp = armada_get_temp, }; -diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c -index b3eca71..38d6aab9 100644 --- a/drivers/thermal/db8500_thermal.c +++ b/drivers/thermal/db8500_thermal.c -@@ -210,7 +210,7 @@ static int db8500_sys_get_crit_temp(struct thermal_zone_device *thermal, +@@ -210,7 +210,7 @@ static int db8500_sys_get_crit_temp(stru return -EINVAL; } @@ -122,11 +108,9 @@ index b3eca71..38d6aab9 100644 .bind = db8500_cdev_bind, .unbind = db8500_cdev_unbind, .get_temp = db8500_sys_get_temp, -diff --git a/drivers/thermal/dove_thermal.c b/drivers/thermal/dove_thermal.c -index a0bc9de..e8fd627 100644 --- a/drivers/thermal/dove_thermal.c +++ b/drivers/thermal/dove_thermal.c -@@ -118,7 +118,7 @@ static int dove_get_temp(struct thermal_zone_device *thermal, +@@ -118,7 +118,7 @@ static int dove_get_temp(struct thermal_ return 0; } @@ -135,11 +119,9 @@ index a0bc9de..e8fd627 100644 .get_temp = dove_get_temp, }; -diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c -index f1424f0..8a3cfed 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c -@@ -332,7 +332,7 @@ static int imx_unbind(struct thermal_zone_device *tz, +@@ -332,7 +332,7 @@ static int imx_unbind(struct thermal_zon return 0; } @@ -148,11 +130,9 @@ index f1424f0..8a3cfed 100644 .bind = imx_bind, .unbind = imx_unbind, .get_temp = imx_get_temp, -diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c -index 031018e..96bdf8a 100644 --- a/drivers/thermal/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/int340x_thermal/int3400_thermal.c -@@ -231,7 +231,7 @@ static int int3400_thermal_set_mode(struct thermal_zone_device *thermal, +@@ -231,7 +231,7 @@ static int int3400_thermal_set_mode(stru return result; } @@ -161,11 +141,9 @@ index 031018e..96bdf8a 100644 .get_temp = int3400_thermal_get_temp, }; -diff --git a/drivers/thermal/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/int340x_thermal/int340x_thermal_zone.c -index b9b2666..bd9f9e8 100644 --- a/drivers/thermal/int340x_thermal/int340x_thermal_zone.c +++ b/drivers/thermal/int340x_thermal/int340x_thermal_zone.c -@@ -154,7 +154,7 @@ static int int340x_thermal_get_trip_hyst(struct thermal_zone_device *zone, +@@ -154,7 +154,7 @@ static int int340x_thermal_get_trip_hyst return 0; } @@ -174,11 +152,9 @@ index b9b2666..bd9f9e8 100644 .get_temp = int340x_thermal_get_zone_temp, .get_trip_temp = int340x_thermal_get_trip_temp, .get_trip_type = int340x_thermal_get_trip_type, -diff --git a/drivers/thermal/intel_soc_dts_thermal.c b/drivers/thermal/intel_soc_dts_thermal.c -index fd550b9..625ba6f 100644 --- a/drivers/thermal/intel_soc_dts_thermal.c +++ b/drivers/thermal/intel_soc_dts_thermal.c -@@ -270,7 +270,7 @@ static int sys_get_curr_temp(struct thermal_zone_device *tzd, int *temp) +@@ -270,7 +270,7 @@ static int sys_get_curr_temp(struct ther return 0; } @@ -187,11 +163,9 @@ index fd550b9..625ba6f 100644 .get_temp = sys_get_curr_temp, .get_trip_temp = sys_get_trip_temp, .get_trip_type = sys_get_trip_type, -diff --git a/drivers/thermal/kirkwood_thermal.c b/drivers/thermal/kirkwood_thermal.c -index 11041fe..abba3e2 100644 --- a/drivers/thermal/kirkwood_thermal.c +++ b/drivers/thermal/kirkwood_thermal.c -@@ -60,7 +60,7 @@ static int kirkwood_get_temp(struct thermal_zone_device *thermal, +@@ -60,7 +60,7 @@ static int kirkwood_get_temp(struct ther return 0; } @@ -200,11 +174,9 @@ index 11041fe..abba3e2 100644 .get_temp = kirkwood_get_temp, }; -diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c -index b9c35bd..bd3185e 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c -@@ -365,7 +365,7 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, +@@ -365,7 +365,7 @@ static int of_thermal_get_crit_temp(stru return -EINVAL; } @@ -213,11 +185,9 @@ index b9c35bd..bd3185e 100644 .get_temp = of_thermal_get_temp, .get_trend = of_thermal_get_trend, .set_emul_temp = of_thermal_set_emul_temp, -diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c -index 5d4ae7d..320ceac 100644 --- a/drivers/thermal/rcar_thermal.c +++ b/drivers/thermal/rcar_thermal.c -@@ -270,7 +270,7 @@ static int rcar_thermal_notify(struct thermal_zone_device *zone, +@@ -270,7 +270,7 @@ static int rcar_thermal_notify(struct th return 0; } @@ -226,11 +196,9 @@ index 5d4ae7d..320ceac 100644 .get_temp = rcar_thermal_get_temp, .get_trip_type = rcar_thermal_get_trip_type, .get_trip_temp = rcar_thermal_get_trip_temp, -diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c -index 534dd91..ec07743 100644 --- a/drivers/thermal/spear_thermal.c +++ b/drivers/thermal/spear_thermal.c -@@ -50,7 +50,7 @@ static inline int thermal_get_temp(struct thermal_zone_device *thermal, +@@ -50,7 +50,7 @@ static inline int thermal_get_temp(struc return 0; } @@ -239,11 +207,9 @@ index 534dd91..ec07743 100644 .get_temp = thermal_get_temp, }; -diff --git a/drivers/thermal/st/st_thermal.c b/drivers/thermal/st/st_thermal.c -index 44cbba9..0cb5c19 100644 --- a/drivers/thermal/st/st_thermal.c +++ b/drivers/thermal/st/st_thermal.c -@@ -175,7 +175,7 @@ static int st_thermal_get_trip_temp(struct thermal_zone_device *th, +@@ -175,7 +175,7 @@ static int st_thermal_get_trip_temp(stru return 0; } @@ -252,11 +218,9 @@ index 44cbba9..0cb5c19 100644 .get_temp = st_thermal_get_temp, .get_trip_type = st_thermal_get_trip_type, .get_trip_temp = st_thermal_get_trip_temp, -diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c -index 3d8f9f9..6bbf61f 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c -@@ -1451,7 +1451,7 @@ static void remove_trip_attrs(struct thermal_zone_device *tz) +@@ -1451,7 +1451,7 @@ static void remove_trip_attrs(struct the */ struct thermal_zone_device *thermal_zone_device_register(const char *type, int trips, int mask, void *devdata, @@ -265,11 +229,9 @@ index 3d8f9f9..6bbf61f 100644 const struct thermal_zone_params *tzp, int passive_delay, int polling_delay) { -diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c -index ade78eb..e9c82fc 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c -@@ -281,7 +281,7 @@ static const struct thermal_zone_of_device_ops ti_of_thermal_ops = { +@@ -281,7 +281,7 @@ static const struct thermal_zone_of_devi .get_trend = __ti_thermal_get_trend, }; @@ -278,11 +240,9 @@ index ade78eb..e9c82fc 100644 .get_temp = ti_thermal_get_temp, .get_trend = ti_thermal_get_trend, .bind = ti_thermal_bind, -diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c -index 054c6d45..bb2b975 100644 --- a/drivers/thermal/x86_pkg_temp_thermal.c +++ b/drivers/thermal/x86_pkg_temp_thermal.c -@@ -274,7 +274,7 @@ static int sys_get_trip_type(struct thermal_zone_device *thermal, +@@ -274,7 +274,7 @@ static int sys_get_trip_type(struct ther } /* Thermal zone callback registry */ @@ -291,8 +251,6 @@ index 054c6d45..bb2b975 100644 .get_temp = sys_get_curr_temp, .get_trip_temp = sys_get_trip_temp, .get_trip_type = sys_get_trip_type, -diff --git a/include/linux/thermal.h b/include/linux/thermal.h -index 5c6a589..07bd5e8 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -181,7 +181,7 @@ struct thermal_zone_device { @@ -304,7 +262,7 @@ index 5c6a589..07bd5e8 100644 const struct thermal_zone_params *tzp; struct thermal_governor *governor; struct list_head thermal_instances; -@@ -313,7 +313,7 @@ void thermal_zone_of_sensor_unregister(struct device *dev, +@@ -313,7 +313,7 @@ void thermal_zone_of_sensor_unregister(s #if IS_ENABLED(CONFIG_THERMAL) struct thermal_zone_device *thermal_zone_device_register(const char *, int, int, @@ -313,7 +271,7 @@ index 5c6a589..07bd5e8 100644 const struct thermal_zone_params *, int, int); void thermal_zone_device_unregister(struct thermal_zone_device *); -@@ -341,7 +341,7 @@ void thermal_notify_framework(struct thermal_zone_device *, int); +@@ -341,7 +341,7 @@ void thermal_notify_framework(struct the #else static inline struct thermal_zone_device *thermal_zone_device_register( const char *type, int trips, int mask, void *devdata, @@ -322,6 +280,3 @@ index 5c6a589..07bd5e8 100644 const struct thermal_zone_params *tzp, int passive_delay, int polling_delay) { return ERR_PTR(-ENODEV); } --- -1.7.10.4 - -- cgit v1.1