From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
To: Eduardo Valentin <edubezval@gmail.com>, Keerthy <j-keerthy@ti.com>
Cc: Zhang Rui <rui.zhang@intel.com>,
linux-pm@vger.kernel.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com
Subject: [PATCH 08/14] thermal: ti-soc-thermal: use common struct temp_sensor_data for OMAP5
Date: Mon, 14 May 2018 13:42:15 +0200 [thread overview]
Message-ID: <1526298141-14045-9-git-send-email-b.zolnierkie@samsung.com> (raw)
In-Reply-To: <1526298141-14045-1-git-send-email-b.zolnierkie@samsung.com>
Currently all struct temp_sensor_data instances for OMAP5 are
identical so just use one common structure to avoid duplication.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---
.../thermal/ti-soc-thermal/omap5-thermal-data.c | 42 ++++++----------------
drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h | 34 ++++--------------
2 files changed, 18 insertions(+), 58 deletions(-)
diff --git a/drivers/thermal/ti-soc-thermal/omap5-thermal-data.c b/drivers/thermal/ti-soc-thermal/omap5-thermal-data.c
index a7ca3b6..defa714 100644
--- a/drivers/thermal/ti-soc-thermal/omap5-thermal-data.c
+++ b/drivers/thermal/ti-soc-thermal/omap5-thermal-data.c
@@ -114,34 +114,14 @@
.bgap_efuse = OMAP5430_FUSE_OPP_BGAP_CORE,
};
-/* Thresholds and limits for OMAP5430 MPU temperature sensor */
-static struct temp_sensor_data omap5430_mpu_temp_sensor_data = {
- .tshut_hot = OMAP5430_MPU_TSHUT_HOT,
- .tshut_cold = OMAP5430_MPU_TSHUT_COLD,
- .t_hot = OMAP5430_MPU_T_HOT,
- .t_cold = OMAP5430_MPU_T_COLD,
- .min_freq = OMAP5430_MPU_MIN_FREQ,
- .max_freq = OMAP5430_MPU_MAX_FREQ,
-};
-
-/* Thresholds and limits for OMAP5430 GPU temperature sensor */
-static struct temp_sensor_data omap5430_gpu_temp_sensor_data = {
- .tshut_hot = OMAP5430_GPU_TSHUT_HOT,
- .tshut_cold = OMAP5430_GPU_TSHUT_COLD,
- .t_hot = OMAP5430_GPU_T_HOT,
- .t_cold = OMAP5430_GPU_T_COLD,
- .min_freq = OMAP5430_GPU_MIN_FREQ,
- .max_freq = OMAP5430_GPU_MAX_FREQ,
-};
-
-/* Thresholds and limits for OMAP5430 CORE temperature sensor */
-static struct temp_sensor_data omap5430_core_temp_sensor_data = {
- .tshut_hot = OMAP5430_CORE_TSHUT_HOT,
- .tshut_cold = OMAP5430_CORE_TSHUT_COLD,
- .t_hot = OMAP5430_CORE_T_HOT,
- .t_cold = OMAP5430_CORE_T_COLD,
- .min_freq = OMAP5430_CORE_MIN_FREQ,
- .max_freq = OMAP5430_CORE_MAX_FREQ,
+/* Thresholds and limits for OMAP5430 MPU/GPU/CORE temperature sensor */
+static struct temp_sensor_data omap5430_temp_sensor_data = {
+ .tshut_hot = OMAP5430_TSHUT_HOT,
+ .tshut_cold = OMAP5430_TSHUT_COLD,
+ .t_hot = OMAP5430_T_HOT,
+ .t_cold = OMAP5430_T_COLD,
+ .min_freq = OMAP5430_MIN_FREQ,
+ .max_freq = OMAP5430_MAX_FREQ,
};
/*
@@ -264,7 +244,7 @@
.sensors = {
{
.registers = &omap5430_mpu_temp_sensor_registers,
- .ts_data = &omap5430_mpu_temp_sensor_data,
+ .ts_data = &omap5430_temp_sensor_data,
.domain = "cpu",
.register_cooling = ti_thermal_register_cpu_cooling,
.unregister_cooling = ti_thermal_unregister_cpu_cooling,
@@ -273,14 +253,14 @@
},
{
.registers = &omap5430_gpu_temp_sensor_registers,
- .ts_data = &omap5430_gpu_temp_sensor_data,
+ .ts_data = &omap5430_temp_sensor_data,
.domain = "gpu",
.slope_pcb = OMAP_GRADIENT_SLOPE_W_PCB_5430_GPU,
.constant_pcb = OMAP_GRADIENT_CONST_W_PCB_5430_GPU,
},
{
.registers = &omap5430_core_temp_sensor_registers,
- .ts_data = &omap5430_core_temp_sensor_data,
+ .ts_data = &omap5430_temp_sensor_data,
.domain = "core",
},
},
diff --git a/drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h b/drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h
index e931ae0..98438cf 100644
--- a/drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h
+++ b/drivers/thermal/ti-soc-thermal/omap5xxx-bandgap.h
@@ -115,34 +115,14 @@
#define OMAP5430_ADC_START_VALUE 540
#define OMAP5430_ADC_END_VALUE 945
-/* OMAP5430.GPU temperature definitions */
+/* OMAP5430 sensor temperature definitions */
/* bandgap clock limits */
-#define OMAP5430_GPU_MAX_FREQ 1500000
-#define OMAP5430_GPU_MIN_FREQ 1000000
+#define OMAP5430_MAX_FREQ 1500000
+#define OMAP5430_MIN_FREQ 1000000
/* interrupts thresholds */
-#define OMAP5430_GPU_TSHUT_HOT 915
-#define OMAP5430_GPU_TSHUT_COLD 900
-#define OMAP5430_GPU_T_HOT 800
-#define OMAP5430_GPU_T_COLD 795
-
-/* OMAP5430.MPU temperature definitions */
-/* bandgap clock limits */
-#define OMAP5430_MPU_MAX_FREQ 1500000
-#define OMAP5430_MPU_MIN_FREQ 1000000
-/* interrupts thresholds */
-#define OMAP5430_MPU_TSHUT_HOT 915
-#define OMAP5430_MPU_TSHUT_COLD 900
-#define OMAP5430_MPU_T_HOT 800
-#define OMAP5430_MPU_T_COLD 795
-
-/* OMAP5430.CORE temperature definitions */
-/* bandgap clock limits */
-#define OMAP5430_CORE_MAX_FREQ 1500000
-#define OMAP5430_CORE_MIN_FREQ 1000000
-/* interrupts thresholds */
-#define OMAP5430_CORE_TSHUT_HOT 915
-#define OMAP5430_CORE_TSHUT_COLD 900
-#define OMAP5430_CORE_T_HOT 800
-#define OMAP5430_CORE_T_COLD 795
+#define OMAP5430_TSHUT_HOT 915
+#define OMAP5430_TSHUT_COLD 900
+#define OMAP5430_T_HOT 800
+#define OMAP5430_T_COLD 795
#endif /* __OMAP5XXX_BANDGAP_H */
--
1.9.1
next prev parent reply other threads:[~2018-05-14 11:45 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20180514114255epcas1p438ea8d32c2b7fd40b86afb25c9c8f2cf@epcas1p4.samsung.com>
2018-05-14 11:42 ` [PATCH 00/14] thermal: ti-soc-thermal: simplify the driver a bit Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180514114302epcas1p1890ad3296302900a736262b5d67aa10e@epcas1p1.samsung.com>
2018-05-14 11:42 ` [PATCH 01/14] thermal: ti-soc-thermal: fix TALERT IRQ handling for DRA752 Bartlomiej Zolnierkiewicz
2018-07-11 2:19 ` J, KEERTHY
2018-07-11 2:19 ` J, KEERTHY
[not found] ` <CGME20180725142707eucas1p25bf4bc7b63babc0732db13ae9a79d983@eucas1p2.samsung.com>
2018-07-25 14:27 ` Bartlomiej Zolnierkiewicz
2018-07-27 4:43 ` Keerthy
2018-07-27 4:43 ` Keerthy
[not found] ` <CGME20180727143023eucas1p1adfe1860327829e7cf39bcdd3290d11c@eucas1p1.samsung.com>
2018-07-27 14:30 ` Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180514114308epcas2p3bba580c5500889f22d50549994b227db@epcas2p3.samsung.com>
2018-05-14 11:42 ` [PATCH 02/14] thermal: ti-soc-thermal: fix comment in omap5xxx-bandgap.h Bartlomiej Zolnierkiewicz
2018-07-11 2:21 ` J, KEERTHY
2018-07-11 2:21 ` J, KEERTHY
[not found] ` <CGME20180514114312epcas1p19fffd35baae3018f47df0fe31ca1b1b0@epcas1p1.samsung.com>
2018-05-14 11:42 ` [PATCH 03/14] thermal: ti-soc-thermal: fix comments in omap4-thermal-data.c Bartlomiej Zolnierkiewicz
2018-07-11 2:27 ` J, KEERTHY
2018-07-11 2:27 ` J, KEERTHY
[not found] ` <CGME20180514114319epcas1p1921a83c1baaaf1e6f94283f462022dc5@epcas1p1.samsung.com>
2018-05-14 11:42 ` [PATCH 04/14] thermal: ti-soc-thermal: cleanup COUNTER feature handling for OMAP5 Bartlomiej Zolnierkiewicz
2018-07-11 3:38 ` J, KEERTHY
2018-07-11 3:38 ` J, KEERTHY
[not found] ` <CGME20180725142832eucas1p26a8b5a1226b1043d57332b70ba5caaa0@eucas1p2.samsung.com>
2018-07-25 14:28 ` Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180514114326epcas2p2e27987b5be7a1fe614114466c6cf30f8@epcas2p2.samsung.com>
2018-05-14 11:42 ` [PATCH 05/14] thermal: ti-soc-thermal: remove redundant methods from struct ti_bandgap_data Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180514114331epcas2p3d52dea1f2feda21ff2cce1548f3f5bd4@epcas2p3.samsung.com>
2018-05-14 11:42 ` [PATCH 06/14] thermal: ti-soc-thermal: remove ->threshold_[thot,tcold]_mask fields Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180514114334epcas1p4c1b268d8253cda369826e67b06b4c28b@epcas1p4.samsung.com>
2018-05-14 11:42 ` [PATCH 07/14] thermal: ti-soc-thermal: remove ->tshut_[hot,cold]_mask fields Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180514114337epcas1p1ba67790ed771ab09c0be25712c8b385f@epcas1p1.samsung.com>
2018-05-14 11:42 ` Bartlomiej Zolnierkiewicz [this message]
[not found] ` <CGME20180514114340epcas2p10a9a4aad3064ad752cd2bea456581a98@epcas2p1.samsung.com>
2018-05-14 11:42 ` [PATCH 09/14] thermal: ti-soc-thermal: use common struct temp_sensor_data for DRA752 Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180514114343epcas2p4280b4ff50611a223a1b3ae37dbe743ee@epcas2p4.samsung.com>
2018-05-14 11:42 ` [PATCH 10/14] thermal: ti-soc-thermal: use OMAP5 defines " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180514114346epcas1p4a59f6760861791ae53eac48975c9172a@epcas1p4.samsung.com>
2018-05-14 11:42 ` [PATCH 11/14] thermal: ti-soc-thermal: use OMAP5 register tables " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180514114350epcas1p2d29cfa8de6b19096d91362c91feb2dc5@epcas1p2.samsung.com>
2018-05-14 11:42 ` [PATCH 12/14] thermal: ti-soc-thermal: add ->adc_to_mcelsius method Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180514114355epcas2p4c24f87c5a76ff3d3e9ed319ddc2e78ad@epcas2p4.samsung.com>
2018-05-14 11:42 ` [PATCH 13/14] thermal: ti-soc-thermal: use short int for *_adc_to_temp[] conversion tables Bartlomiej Zolnierkiewicz
[not found] ` <CGME20180514114400epcas2p193e6f6643171575aab079329bed79c2c@epcas2p1.samsung.com>
2018-05-14 11:42 ` [PATCH 14/14] thermal: ti-soc-thermal: remove SoC family config options Bartlomiej Zolnierkiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1526298141-14045-9-git-send-email-b.zolnierkie@samsung.com \
--to=b.zolnierkie@samsung.com \
--cc=edubezval@gmail.com \
--cc=j-keerthy@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.