diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-12-02 21:52:41 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-12-02 21:52:41 +0000 |
| commit | f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0 (patch) | |
| tree | f4e3850683bbb922227f58993e41a4784a670932 /target/linux/mediatek/patches/0021-thermal-of-implement-.set_trips-for-device-tree-ther.patch | |
| parent | 40a09b93d274737c704165f687149b4956fbd45c (diff) | |
| download | mtk-20170518-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.zip mtk-20170518-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.tar.gz mtk-20170518-f0a5f24217fbedd7ffba0a2a0bf37c1102e44ad0.tar.bz2 | |
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 <roman@advem.lv>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47694
Diffstat (limited to 'target/linux/mediatek/patches/0021-thermal-of-implement-.set_trips-for-device-tree-ther.patch')
| -rw-r--r-- | target/linux/mediatek/patches/0021-thermal-of-implement-.set_trips-for-device-tree-ther.patch | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/mediatek/patches/0021-thermal-of-implement-.set_trips-for-device-tree-ther.patch b/target/linux/mediatek/patches/0021-thermal-of-implement-.set_trips-for-device-tree-ther.patch index 81b5043..149ba00 100644 --- a/target/linux/mediatek/patches/0021-thermal-of-implement-.set_trips-for-device-tree-ther.patch +++ b/target/linux/mediatek/patches/0021-thermal-of-implement-.set_trips-for-device-tree-ther.patch @@ -10,11 +10,9 @@ Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> include/linux/thermal.h | 3 +++ 2 files changed, 15 insertions(+) -diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c -index bd3185e..f8dd847 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c -@@ -97,6 +97,17 @@ static int of_thermal_get_temp(struct thermal_zone_device *tz, +@@ -97,6 +97,17 @@ static int of_thermal_get_temp(struct th return data->ops->get_temp(data->sensor_data, temp); } @@ -32,7 +30,7 @@ index bd3185e..f8dd847 100644 /** * of_thermal_get_ntrips - function to export number of available trip * points. -@@ -367,6 +378,7 @@ static int of_thermal_get_crit_temp(struct thermal_zone_device *tz, +@@ -367,6 +378,7 @@ static int of_thermal_get_crit_temp(stru static const struct thermal_zone_device_ops of_thermal_ops = { .get_temp = of_thermal_get_temp, @@ -40,8 +38,6 @@ index bd3185e..f8dd847 100644 .get_trend = of_thermal_get_trend, .set_emul_temp = of_thermal_set_emul_temp, -diff --git a/include/linux/thermal.h b/include/linux/thermal.h -index aef6e13..b751f6b 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -267,12 +267,15 @@ struct thermal_genl_event { @@ -60,6 +56,3 @@ index aef6e13..b751f6b 100644 int (*set_emul_temp)(void *, int); }; --- -1.7.10.4 - |