diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2016-01-12 20:52:19 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2016-01-12 20:52:19 +0000 |
| commit | 50ff51e118b8c1dc098fd2d26d2235bd1add458c (patch) | |
| tree | 9c12efd0736e8aa581bc815fa08d4e87867d3428 /target/linux/imx6/patches-4.3/045-imx-thermal-use-cpu-temperature-grade-info-for-thresholds | |
| parent | 418c28764024a6ecf6bbd66315de6df006ac037a (diff) | |
| download | master-187ad058-50ff51e118b8c1dc098fd2d26d2235bd1add458c.tar.gz master-187ad058-50ff51e118b8c1dc098fd2d26d2235bd1add458c.tar.bz2 master-187ad058-50ff51e118b8c1dc098fd2d26d2235bd1add458c.zip | |
kernel/4.3: update to version 4.3.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48224 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/imx6/patches-4.3/045-imx-thermal-use-cpu-temperature-grade-info-for-thresholds')
| -rw-r--r-- | target/linux/imx6/patches-4.3/045-imx-thermal-use-cpu-temperature-grade-info-for-thresholds | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/target/linux/imx6/patches-4.3/045-imx-thermal-use-cpu-temperature-grade-info-for-thresholds b/target/linux/imx6/patches-4.3/045-imx-thermal-use-cpu-temperature-grade-info-for-thresholds index 95524776c9..6baf7dd801 100644 --- a/target/linux/imx6/patches-4.3/045-imx-thermal-use-cpu-temperature-grade-info-for-thresholds +++ b/target/linux/imx6/patches-4.3/045-imx-thermal-use-cpu-temperature-grade-info-for-thresholds @@ -1,7 +1,5 @@ -Index: linux-4.3/drivers/thermal/imx_thermal.c -=================================================================== ---- linux-4.3.orig/drivers/thermal/imx_thermal.c 2015-11-01 16:05:25.000000000 -0800 -+++ linux-4.3/drivers/thermal/imx_thermal.c 2015-12-18 10:39:44.915158318 -0800 +--- a/drivers/thermal/imx_thermal.c ++++ b/drivers/thermal/imx_thermal.c @@ -55,6 +55,7 @@ #define TEMPSENSE2_PANIC_VALUE_SHIFT 16 #define TEMPSENSE2_PANIC_VALUE_MASK 0xfff0000 @@ -10,7 +8,7 @@ Index: linux-4.3/drivers/thermal/imx_thermal.c #define OCOTP_ANA1 0x04e0 /* The driver supports 1 passive trip point and 1 critical trip point */ -@@ -64,12 +65,6 @@ +@@ -64,12 +65,6 @@ enum imx_thermal_trip { IMX_TRIP_NUM, }; @@ -23,7 +21,7 @@ Index: linux-4.3/drivers/thermal/imx_thermal.c #define IMX_POLLING_DELAY 2000 /* millisecond */ #define IMX_PASSIVE_DELAY 1000 -@@ -100,12 +95,14 @@ +@@ -100,12 +95,14 @@ struct imx_thermal_data { u32 c1, c2; /* See formula in imx_get_sensor_data() */ int temp_passive; int temp_critical; @@ -38,7 +36,7 @@ Index: linux-4.3/drivers/thermal/imx_thermal.c }; static void imx_set_panic_temp(struct imx_thermal_data *data, -@@ -285,10 +282,12 @@ +@@ -285,10 +282,12 @@ static int imx_set_trip_temp(struct ther { struct imx_thermal_data *data = tz->devdata; @@ -52,7 +50,7 @@ Index: linux-4.3/drivers/thermal/imx_thermal.c return -EINVAL; data->temp_passive = temp; -@@ -404,17 +403,39 @@ +@@ -404,17 +403,39 @@ static int imx_get_sensor_data(struct pl data->c1 = temp64; data->c2 = n1 * data->c1 + 1000 * t1; @@ -100,7 +98,7 @@ Index: linux-4.3/drivers/thermal/imx_thermal.c return 0; } -@@ -559,6 +580,11 @@ +@@ -559,6 +580,11 @@ static int imx_thermal_probe(struct plat return ret; } |