staging: omap-thermal fixes and ports
cover staging: omap-thermal fixes and ports
Hello Greg,
Several compilation fixes and a couple of debugging prints added. This time I am also preparing the driver to receive fixes and patches from omapzoom. So, this series starts to port patches from omapzoom to staging area. Most of this changes are related to OMAP5 support.
All these are based on linux-2.6/master.
Patches are also available here:
[email protected]:thermal-framework/thermal-framework.git thermal_work/omap/omap-thermal-fixes
https://git.gitorious.org/thermal-framework/thermal-framework.git thermal_work/omap/omap-thermal-fixes
Cheers,
Eduardo Valentin (12):
staging: omap-thermal: standardize register nomenclature to use 'GPU'
staging: omap-thermal: remove from register map soc and mode on OMAP5
staging: omap-thermal: introduce new features of OMAP54xx
staging: omap-thermal: update OMAP54xx clock sources
staging: omap-thermal: update feature bitfield for OMAP54xx
staging: omap-thermal: remove dedicated counter register for OMAP5
staging: omap-thermal: introduze FREEZE_BIT feature
staging: omap-thermal: update DT entry documentation
staging: omap-thermal: add DT example for OMAP54xx devices
staging: omap-thermal: Remove double conv_table reference
staging: omap-thermal: name data files accordingly
staging: omap-thermal: update clock prepare count
Radhesh Fadnis (2):
staging: omap-thermal: introduce clock feature flag
staging: omap-thermal: update OMAP54xx conv_table
Ruslan Ruslichenko (1):
staging: omap-thermal: Add print when TSHUT temperature reached
drivers/staging/omap-thermal/Makefile | 4 +- drivers/staging/omap-thermal/omap-bandgap.c | 89 ++++-- drivers/staging/omap-thermal/omap-bandgap.h | 94 +++++- drivers/staging/omap-thermal/omap4-thermal-data.c | 262 +++++++++++++++ drivers/staging/omap-thermal/omap4-thermal.c | 259 --------------- drivers/staging/omap-thermal/omap5-thermal-data.c | 357 +++++++++++++++++++++ drivers/staging/omap-thermal/omap5-thermal.c | 297 ----------------- drivers/staging/omap-thermal/omap_bandgap.txt | 36 ++- 8 files changed, 794 insertions(+), 604 deletions(-) create mode 100644 drivers/staging/omap-thermal/omap4-thermal-data.c delete mode 100644 drivers/staging/omap-thermal/omap4-thermal.c create mode 100644 drivers/staging/omap-thermal/omap5-thermal-data.c delete mode 100644 drivers/staging/omap-thermal/omap5-thermal.c
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 1/15 staging: omap-thermal: Add print when TSHUT temperature reached
From: Ruslan Ruslichenko <[email protected]>
To indicate that board was shut down due to TSHUT temperature reached it is good to print some information message before shutting down.
--- drivers/staging/omap-thermal/omap-bandgap.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/staging/omap-thermal/omap-bandgap.c +3 -0
@@ -133,6 +133,9 @@ static irqreturn_t talert_irq_handler(int irq, void *data)/* This is the Tshut handler. Call it only if HAS(TSHUT) is set */ static irqreturn_t omap_bandgap_tshut_irq_handler (int irq,void *data) { +pr_emerg ("%s: TSHUT temperature reached. Needs shut down...\n" , + __func__); +orderly_poweroff (true);return IRQ_HANDLED ;
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 2/15 staging: omap-thermal: introduce clock feature flag
In reply to Eduardo ValentinFrom: Radhesh Fadnis <[email protected]>
The clock to Bandgap module is SW controlled on some version of OMAP silicon (OMAP44xx). But on OMAP54xx ES2.0
onwards this is HW-Auto controlled. Hence introduce a feature flag to use/not-to-use SW enable/disable of BG clock.
--- drivers/staging/omap-thermal/omap-bandgap.c | 18 +++++++++++++----- drivers/staging/omap-thermal/omap-bandgap.h | 1 + drivers/staging/omap-thermal/omap4-thermal.c | 3 +++ drivers/staging/omap-thermal/omap5-thermal.c | 3 ++- 4 files changed, 19 insertions(+), 6 deletions(-)
drivers/staging/omap-thermal/omap-bandgap.c +13 -5
@@ -914,7 +914,9 @@ int omap_bandgap_probe(struct platform_device *pdev)dev_err (&pdev->dev,"Cannot re-set clock rate. Continuing\n" ); bg_ptr->clk_rate = clk_rate; -clk_enable (bg_ptr->fclock); +if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) +clk_enable (bg_ptr->fclock); +mutex_init (&bg_ptr->bg_mutex); bg_ptr->dev = &pdev->dev;
@@ -982,7 +984,8 @@ int omap_bandgap_probe(struct platform_device *pdev)return 0 ; disable_clk: -clk_disable (bg_ptr->fclock); +if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) +clk_disable (bg_ptr->fclock); put_clks:clk_put (bg_ptr->fclock);clk_put (bg_ptr->div_clk);
@@ -1012,7 +1015,8 @@ int omap_bandgap_remove(struct platform_device *pdev)omap_bandgap_power (bg_ptr, false); -clk_disable (bg_ptr->fclock); +if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) +clk_disable (bg_ptr->fclock);clk_put (bg_ptr->fclock);clk_put (bg_ptr->div_clk);
@@ -1109,7 +1113,9 @@ static int omap_bandgap_suspend(struct device *dev) err =omap_bandgap_save_ctxt (bg_ptr);omap_bandgap_power (bg_ptr, false); -clk_disable (bg_ptr->fclock); + +if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) +clk_disable (bg_ptr->fclock);return err; }
@@ -1118,7 +1124,9 @@ static int omap_bandgap_resume(struct device *dev) {struct omap_bandgap *bg_ptr =dev_get_drvdata (dev); -clk_enable (bg_ptr->fclock); +if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) +clk_enable (bg_ptr->fclock); +omap_bandgap_power (bg_ptr, true);return omap_bandgap_restore_ctxt (bg_ptr);
drivers/staging/omap-thermal/omap-bandgap.h +1 -0
@@ -384,6 +384,7 @@ struct omap_bandgap_data {#define OMAP_BANDGAP_FEATURE_MODE_CONFIG (1 << 3)#define OMAP_BANDGAP_FEATURE_COUNTER (1 << 4)#define OMAP_BANDGAP_FEATURE_POWER_SWITCH (1 << 5) +#define OMAP_BANDGAP_FEATURE_CLK_CTRL (1 << 6)#define OMAP_BANDGAP_HAS (b, f) \ ((b)->conf->features & OMAP_BANDGAP_FEATURE_ ## f)unsigned int features;
drivers/staging/omap-thermal/omap4-thermal.c +3 -0
@@ -69,6 +69,7 @@ omap4430_adc_to_temp[OMAP4430_ADC_END_VALUE - OMAP4430_ADC_START_VALUE + 1] = {/* OMAP4430 data */ const struct omap_bandgap_data omap4430_data = { .features =OMAP_BANDGAP_FEATURE_MODE_CONFIG | +OMAP_BANDGAP_FEATURE_CLK_CTRL |OMAP_BANDGAP_FEATURE_POWER_SWITCH , .fclock_name ="bandgap_fclk" , .div_ck_name ="bandgap_fclk" ,
@@ -207,6 +208,7 @@ const struct omap_bandgap_data omap4460_data = {OMAP_BANDGAP_FEATURE_TALERT |OMAP_BANDGAP_FEATURE_MODE_CONFIG |OMAP_BANDGAP_FEATURE_POWER_SWITCH | +OMAP_BANDGAP_FEATURE_CLK_CTRL | OMAP_BANDGAP_FEATURE_COUNTER, .fclock_name = "bandgap_ts_fclk", .div_ck_name = "div_ts_ck",
@@ -236,6 +238,7 @@ const struct omap_bandgap_data omap4470_data = {OMAP_BANDGAP_FEATURE_TALERT |OMAP_BANDGAP_FEATURE_MODE_CONFIG |OMAP_BANDGAP_FEATURE_POWER_SWITCH | +OMAP_BANDGAP_FEATURE_CLK_CTRL | OMAP_BANDGAP_FEATURE_COUNTER, .fclock_name = "bandgap_ts_fclk", .div_ck_name = "div_ts_ck",
drivers/staging/omap-thermal/omap5-thermal.c +2 -1
@@ -260,7 +260,8 @@ const struct omap_bandgap_data omap5430_data = { .features = OMAP_BANDGAP_FEATURE_TSHUT_CONFIG |OMAP_BANDGAP_FEATURE_TALERT |OMAP_BANDGAP_FEATURE_MODE_CONFIG | - OMAP_BANDGAP_FEATURE_COUNTER, +OMAP_BANDGAP_FEATURE_COUNTER | + OMAP_BANDGAP_FEATURE_CLK_CTRL, .fclock_name = "ts_clk_div_ck", .div_ck_name = "ts_clk_div_ck", .conv_table = omap5430_adc_to_temp,
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 3/15 staging: omap-thermal: update OMAP54xx conv_table
In reply to Eduardo ValentinFrom: Radhesh Fadnis <[email protected]>
This patch updates the ADC conversion table for OMAP5430 ES2.0 devices.
--- drivers/staging/omap-thermal/omap-bandgap.h | 5 +- drivers/staging/omap-thermal/omap5-thermal.c | 170 ++++++++++++++++---------- 2 files changed, 105 insertions(+), 70 deletions(-)
drivers/staging/omap-thermal/omap-bandgap.h +2 -3
@@ -210,9 +210,8 @@#define OMAP5430_MPU_MIN_TEMP -40000#define OMAP5430_MPU_MAX_TEMP 125000#define OMAP5430_MPU_HYST_VAL 5000 -#define OMAP5430_ADC_START_VALUE 532 -#define OMAP5430_ADC_END_VALUE 934 - +#define OMAP5430_ADC_START_VALUE 540 +#define OMAP5430_ADC_END_VALUE 945#define OMAP5430_GPU_TSHUT_HOT 915#define OMAP5430_GPU_TSHUT_COLD 900
drivers/staging/omap-thermal/omap5-thermal.c +103 -67
176 lines not on this page · raw message
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 4/15 staging: omap-thermal: standardize register nomenclature to use 'GPU'
In reply to Eduardo ValentinIn order to keep same nomenclature across the register definition, this change will make all 'MM' suffixes to be named 'GPU'.
--- drivers/staging/omap-thermal/omap-bandgap.h | 16 ++++++++-------- drivers/staging/omap-thermal/omap5-thermal.c | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/omap-thermal/omap-bandgap.h +8 -8
@@ -110,10 +110,10 @@#define OMAP5430_MASK_HOT_CORE_MASK (1 << 5)#define OMAP5430_MASK_COLD_CORE_SHIFT 4#define OMAP5430_MASK_COLD_CORE_MASK (1 << 4) -#define OMAP5430_MASK_HOT_MM_SHIFT 3 -#define OMAP5430_MASK_HOT_MM_MASK (1 << 3) -#define OMAP5430_MASK_COLD_MM_SHIFT 2 -#define OMAP5430_MASK_COLD_MM_MASK (1 << 2) +#define OMAP5430_MASK_HOT_GPU_SHIFT 3 +#define OMAP5430_MASK_HOT_GPU_MASK (1 << 3) +#define OMAP5430_MASK_COLD_GPU_SHIFT 2 +#define OMAP5430_MASK_COLD_GPU_MASK (1 << 2)#define OMAP5430_MASK_HOT_MPU_SHIFT 1#define OMAP5430_MASK_HOT_MPU_MASK (1 << 1)#define OMAP5430_MASK_COLD_MPU_SHIFT 0
@@ -144,10 +144,10 @@#define OMAP5430_HOT_CORE_FLAG_MASK (1 << 5)#define OMAP5430_COLD_CORE_FLAG_SHIFT 4#define OMAP5430_COLD_CORE_FLAG_MASK (1 << 4) -#define OMAP5430_HOT_MM_FLAG_SHIFT 3 -#define OMAP5430_HOT_MM_FLAG_MASK (1 << 3) -#define OMAP5430_COLD_MM_FLAG_SHIFT 2 -#define OMAP5430_COLD_MM_FLAG_MASK (1 << 2) +#define OMAP5430_HOT_GPU_FLAG_SHIFT 3 +#define OMAP5430_HOT_GPU_FLAG_MASK (1 << 3) +#define OMAP5430_COLD_GPU_FLAG_SHIFT 2 +#define OMAP5430_COLD_GPU_FLAG_MASK (1 << 2)#define OMAP5430_HOT_MPU_FLAG_SHIFT 1#define OMAP5430_HOT_MPU_FLAG_MASK (1 << 1)#define OMAP5430_COLD_MPU_FLAG_SHIFT 0
drivers/staging/omap-thermal/omap5-thermal.c +4 -4
@@ -71,8 +71,8 @@ omap5430_gpu_temp_sensor_registers = { .bgap_dtemp_mask = OMAP5430_BGAP_TEMP_SENSOR_DTEMP_MASK, .bgap_mask_ctrl = OMAP5430_BGAP_CTRL_OFFSET, - .mask_hot_mask = OMAP5430_MASK_HOT_MM_MASK, - .mask_cold_mask = OMAP5430_MASK_COLD_MM_MASK, + .mask_hot_mask = OMAP5430_MASK_HOT_GPU_MASK, + .mask_cold_mask = OMAP5430_MASK_COLD_GPU_MASK, .bgap_mode_ctrl = OMAP5430_BGAP_COUNTER_GPU_OFFSET, .mode_ctrl_mask = OMAP5430_REPEAT_MODE_MASK,
@@ -91,8 +91,8 @@ omap5430_gpu_temp_sensor_registers = { .bgap_status = OMAP5430_BGAP_STATUS_OFFSET, .status_clean_stop_mask = 0x0, .status_bgap_alert_mask = OMAP5430_BGAP_ALERT_MASK, - .status_hot_mask = OMAP5430_HOT_MM_FLAG_MASK, - .status_cold_mask = OMAP5430_COLD_MM_FLAG_MASK, + .status_hot_mask = OMAP5430_HOT_GPU_FLAG_MASK, + .status_cold_mask = OMAP5430_COLD_GPU_FLAG_MASK, .bgap_efuse = OMAP5430_FUSE_OPP_BGAP_GPU, };
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 5/15 staging: omap-thermal: remove from register map soc and mode on OMAP5
In reply to Eduardo ValentinOn OMAP54xx ES2.0 there is no single read and only one mode: continuous mode. For this reason, there is no point in defining register fields for these operations.
--- drivers/staging/omap-thermal/omap5-thermal.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-)
drivers/staging/omap-thermal/omap5-thermal.c +0 -11
@@ -27,7 +27,6 @@ static struct temp_sensor_registers omap5430_mpu_temp_sensor_registers = { .temp_sensor_ctrl = OMAP5430_TEMP_SENSOR_MPU_OFFSET, .bgap_tempsoff_mask = OMAP5430_BGAP_TEMPSOFF_MASK, - .bgap_soc_mask = OMAP5430_BGAP_TEMP_SENSOR_SOC_MASK, .bgap_eocz_mask = OMAP5430_BGAP_TEMP_SENSOR_EOCZ_MASK, .bgap_dtemp_mask = OMAP5430_BGAP_TEMP_SENSOR_DTEMP_MASK,
@@ -35,8 +34,6 @@ omap5430_mpu_temp_sensor_registers = { .mask_hot_mask = OMAP5430_MASK_HOT_MPU_MASK, .mask_cold_mask = OMAP5430_MASK_COLD_MPU_MASK, - .bgap_mode_ctrl = OMAP5430_BGAP_COUNTER_MPU_OFFSET, - .mode_ctrl_mask = OMAP5430_REPEAT_MODE_MASK, .bgap_counter = OMAP5430_BGAP_COUNTER_MPU_OFFSET, .counter_mask = OMAP5430_COUNTER_MASK,
@@ -66,7 +63,6 @@ static struct temp_sensor_registers omap5430_gpu_temp_sensor_registers = { .temp_sensor_ctrl = OMAP5430_TEMP_SENSOR_GPU_OFFSET, .bgap_tempsoff_mask = OMAP5430_BGAP_TEMPSOFF_MASK, - .bgap_soc_mask = OMAP5430_BGAP_TEMP_SENSOR_SOC_MASK, .bgap_eocz_mask = OMAP5430_BGAP_TEMP_SENSOR_EOCZ_MASK, .bgap_dtemp_mask = OMAP5430_BGAP_TEMP_SENSOR_DTEMP_MASK,
@@ -74,9 +70,6 @@ omap5430_gpu_temp_sensor_registers = { .mask_hot_mask = OMAP5430_MASK_HOT_GPU_MASK, .mask_cold_mask = OMAP5430_MASK_COLD_GPU_MASK, - .bgap_mode_ctrl = OMAP5430_BGAP_COUNTER_GPU_OFFSET, - .mode_ctrl_mask = OMAP5430_REPEAT_MODE_MASK, - .bgap_counter = OMAP5430_BGAP_COUNTER_GPU_OFFSET, .counter_mask = OMAP5430_COUNTER_MASK,
@@ -105,7 +98,6 @@ static struct temp_sensor_registers omap5430_core_temp_sensor_registers = { .temp_sensor_ctrl = OMAP5430_TEMP_SENSOR_CORE_OFFSET, .bgap_tempsoff_mask = OMAP5430_BGAP_TEMPSOFF_MASK, - .bgap_soc_mask = OMAP5430_BGAP_TEMP_SENSOR_SOC_MASK, .bgap_eocz_mask = OMAP5430_BGAP_TEMP_SENSOR_EOCZ_MASK, .bgap_dtemp_mask = OMAP5430_BGAP_TEMP_SENSOR_DTEMP_MASK,
@@ -113,9 +105,6 @@ omap5430_core_temp_sensor_registers = { .mask_hot_mask = OMAP5430_MASK_HOT_CORE_MASK, .mask_cold_mask = OMAP5430_MASK_COLD_CORE_MASK, - .bgap_mode_ctrl = OMAP5430_BGAP_COUNTER_CORE_OFFSET, - .mode_ctrl_mask = OMAP5430_REPEAT_MODE_MASK, - .bgap_counter = OMAP5430_BGAP_COUNTER_CORE_OFFSET, .counter_mask = OMAP5430_COUNTER_MASK,
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 6/15 staging: omap-thermal: introduce new features of OMAP54xx
In reply to Eduardo ValentinOn OMAP54xx ES2.0 there are new features inside the bandgap device. This patch introduces the registers definition to access these features and adapts the data structures to map these new registers. The new features are:
. SIDLE mode
. Cumulative register
. History buffer.
. Buffer freeze bit
. Buffer clear bit
--- drivers/staging/omap-thermal/omap-bandgap.h | 65 +++++++++++++++++++++++++- drivers/staging/omap-thermal/omap5-thermal.c | 48 +++++++++++++++++-- 2 files changed, 106 insertions(+), 7 deletions(-)
drivers/staging/omap-thermal/omap-bandgap.h +64 -1
@@ -118,6 +118,26 @@#define OMAP5430_MASK_HOT_MPU_MASK (1 << 1)#define OMAP5430_MASK_COLD_MPU_SHIFT 0#define OMAP5430_MASK_COLD_MPU_MASK (1 << 0) +#define OMAP5430_MASK_SIDLEMODE_SHIFT 30 +#define OMAP5430_MASK_SIDLEMODE_MASK (0x3 << 30) +#define OMAP5430_MASK_FREEZE_CORE_SHIFT 23 +#define OMAP5430_MASK_FREEZE_CORE_MASK (1 << 23) +#define OMAP5430_MASK_FREEZE_GPU_SHIFT 22 +#define OMAP5430_MASK_FREEZE_GPU_MASK (1 << 22) +#define OMAP5430_MASK_FREEZE_MPU_SHIFT 21 +#define OMAP5430_MASK_FREEZE_MPU_MASK (1 << 21) +#define OMAP5430_MASK_CLEAR_CORE_SHIFT 20 +#define OMAP5430_MASK_CLEAR_CORE_MASK (1 << 20) +#define OMAP5430_MASK_CLEAR_GPU_SHIFT 19 +#define OMAP5430_MASK_CLEAR_GPU_MASK (1 << 19) +#define OMAP5430_MASK_CLEAR_MPU_SHIFT 18 +#define OMAP5430_MASK_CLEAR_MPU_MASK (1 << 18) +#define OMAP5430_MASK_CLEAR_ACCUM_CORE_SHIFT 17 +#define OMAP5430_MASK_CLEAR_ACCUM_CORE_MASK (1 << 17) +#define OMAP5430_MASK_CLEAR_ACCUM_GPU_SHIFT 16 +#define OMAP5430_MASK_CLEAR_ACCUM_GPU_MASK (1 << 16) +#define OMAP5430_MASK_CLEAR_ACCUM_MPU_SHIFT 15 +#define OMAP5430_MASK_CLEAR_ACCUM_MPU_MASK (1 << 15)/* BANDGAP_COUNTER */ #define OMAP5430_REPEAT_MODE_SHIFT 31
@@ -137,6 +157,18 @@#define OMAP5430_TSHUT_COLD_SHIFT 0#define OMAP5430_TSHUT_COLD_MASK (0x3ff << 0) +/* BANDGAP_CUMUL_DTEMP_MPU */ +#define OMAP5430_CUMUL_DTEMP_MPU_SHIFT 0 +#define OMAP5430_CUMUL_DTEMP_MPU_MASK (0xffffffff << 0) + +/* BANDGAP_CUMUL_DTEMP_GPU */ +#define OMAP5430_CUMUL_DTEMP_GPU_SHIFT 0 +#define OMAP5430_CUMUL_DTEMP_GPU_MASK (0xffffffff << 0) + +/* BANDGAP_CUMUL_DTEMP_CORE */ +#define OMAP5430_CUMUL_DTEMP_CORE_SHIFT 0 +#define OMAP5430_CUMUL_DTEMP_CORE_MASK (0xffffffff << 0) +/* BANDGAP_STATUS */ #define OMAP5430_BGAP_ALERT_SHIFT 31#define OMAP5430_BGAP_ALERT_MASK (1 << 31)
@@ -174,6 +206,12 @@#define OMAP5430_BGAP_COUNTER_GPU_OFFSET 0x1C0#define OMAP5430_BGAP_THRESHOLD_GPU_OFFSET 0x1A8#define OMAP5430_BGAP_TSHUT_GPU_OFFSET 0x1B4 +#define OMAP5430_BGAP_CUMUL_DTEMP_GPU_OFFSET 0x1C0 +#define OMAP5430_BGAP_DTEMP_GPU_0_OFFSET 0x1F4 +#define OMAP5430_BGAP_DTEMP_GPU_1_OFFSET 0x1F8 +#define OMAP5430_BGAP_DTEMP_GPU_2_OFFSET 0x1FC +#define OMAP5430_BGAP_DTEMP_GPU_3_OFFSET 0x200 +#define OMAP5430_BGAP_DTEMP_GPU_4_OFFSET 0x204#define OMAP5430_FUSE_OPP_BGAP_MPU 0x4#define OMAP5430_TEMP_SENSOR_MPU_OFFSET 0x14C
@@ -181,13 +219,26 @@#define OMAP5430_BGAP_COUNTER_MPU_OFFSET 0x1BC#define OMAP5430_BGAP_THRESHOLD_MPU_OFFSET 0x1A4#define OMAP5430_BGAP_TSHUT_MPU_OFFSET 0x1B0 -#define OMAP5430_BGAP_STATUS_OFFSET 0x1C8 +#define OMAP5430_BGAP_CUMUL_DTEMP_MPU_OFFSET 0x1BC +#define OMAP5430_BGAP_DTEMP_MPU_0_OFFSET 0x1E0 +#define OMAP5430_BGAP_DTEMP_MPU_1_OFFSET 0x1E4 +#define OMAP5430_BGAP_DTEMP_MPU_2_OFFSET 0x1E8 +#define OMAP5430_BGAP_DTEMP_MPU_3_OFFSET 0x1EC +#define OMAP5430_BGAP_DTEMP_MPU_4_OFFSET 0x1F0#define OMAP5430_FUSE_OPP_BGAP_CORE 0x8#define OMAP5430_TEMP_SENSOR_CORE_OFFSET 0x154#define OMAP5430_BGAP_COUNTER_CORE_OFFSET 0x1C4#define OMAP5430_BGAP_THRESHOLD_CORE_OFFSET 0x1AC#define OMAP5430_BGAP_TSHUT_CORE_OFFSET 0x1B8 +#define OMAP5430_BGAP_CUMUL_DTEMP_CORE_OFFSET 0x1C4 +#define OMAP5430_BGAP_DTEMP_CORE_0_OFFSET 0x208 +#define OMAP5430_BGAP_DTEMP_CORE_1_OFFSET 0x20C +#define OMAP5430_BGAP_DTEMP_CORE_2_OFFSET 0x210 +#define OMAP5430_BGAP_DTEMP_CORE_3_OFFSET 0x214 +#define OMAP5430_BGAP_DTEMP_CORE_4_OFFSET 0x218 + +#define OMAP5430_BGAP_STATUS_OFFSET 0x1C8#define OMAP4460_TSHUT_HOT 900/* 122 deg C */ #define OMAP4460_TSHUT_COLD 895/* 100 deg C */
@@ -248,6 +299,10 @@ struct temp_sensor_registers {u32 bgap_mask_ctrl;u32 mask_hot_mask;u32 mask_cold_mask; +u32 mask_sidlemode_mask; +u32 mask_freeze_mask; +u32 mask_clear_mask; +u32 mask_clear_accum_mask;u32 bgap_mode_ctrl;u32 mode_ctrl_mask;
@@ -260,6 +315,8 @@ struct temp_sensor_registers {u32 threshold_tcold_mask;u32 tshut_threshold; +u32 tshut_efuse_mask; +u32 tshut_efuse_shift;u32 tshut_hot_mask;u32 tshut_cold_mask;
@@ -269,6 +326,12 @@ struct temp_sensor_registers {u32 status_hot_mask;u32 status_cold_mask; +u32 bgap_cumul_dtemp; +u32 ctrl_dtemp_0; +u32 ctrl_dtemp_1; +u32 ctrl_dtemp_2; +u32 ctrl_dtemp_3; +u32 ctrl_dtemp_4;u32 bgap_efuse; };
drivers/staging/omap-thermal/omap5-thermal.c +42 -6
104 lines not on this page · raw message
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 7/15 staging: omap-thermal: update OMAP54xx clock sources
In reply to Eduardo ValentinThis patch updates the OMAP54xx data structure to use the right clock source name for ES2.0.
--- drivers/staging/omap-thermal/omap5-thermal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/omap-thermal/omap5-thermal.c +2 -2
@@ -323,8 +323,8 @@ const struct omap_bandgap_data omap5430_data = {OMAP_BANDGAP_FEATURE_MODE_CONFIG |OMAP_BANDGAP_FEATURE_COUNTER | OMAP_BANDGAP_FEATURE_CLK_CTRL, - .fclock_name = "ts_clk_div_ck", - .div_ck_name = "ts_clk_div_ck", + .fclock_name = "l3instr_ts_gclk_div", + .div_ck_name = "l3instr_ts_gclk_div", .conv_table = omap5430_adc_to_temp, .expose_sensor = omap_thermal_expose_sensor, .remove_sensor = omap_thermal_remove_sensor,
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 8/15 staging: omap-thermal: update feature bitfield for OMAP54xx
In reply to Eduardo ValentinThis patch removes from OMAP54xx the features:
. CLK_CTRL
. COUNTER
. MODE_CONFIG
Because these features are not present in OMAP54xx ES2.0
--- drivers/staging/omap-thermal/omap5-thermal.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/staging/omap-thermal/omap5-thermal.c +1 -4
@@ -319,10 +319,7 @@ omap5430_adc_to_temp[/* TODO : Need to update the slope/constant for ES2.0 silicon */ const struct omap_bandgap_data omap5430_data = { .features =OMAP_BANDGAP_FEATURE_TSHUT_CONFIG | -OMAP_BANDGAP_FEATURE_TALERT | -OMAP_BANDGAP_FEATURE_MODE_CONFIG | -OMAP_BANDGAP_FEATURE_COUNTER | -OMAP_BANDGAP_FEATURE_CLK_CTRL , +OMAP_BANDGAP_FEATURE_TALERT , .fclock_name ="l3instr_ts_gclk_div" , .div_ck_name ="l3instr_ts_gclk_div" , .conv_table = omap5430_adc_to_temp,
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 9/15 staging: omap-thermal: remove dedicated counter register for OMAP5
In reply to Eduardo ValentinOn OMAP54xx there is only one counter register. For this reason, each domain must use the same counter register. This patch changes the data definition to coupe with this.
--- drivers/staging/omap-thermal/omap-bandgap.h | 5 ----- drivers/staging/omap-thermal/omap5-thermal.c | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-)
drivers/staging/omap-thermal/omap-bandgap.h +0 -5
@@ -140,8 +140,6 @@#define OMAP5430_MASK_CLEAR_ACCUM_MPU_MASK (1 << 15)/* BANDGAP_COUNTER */ -#define OMAP5430_REPEAT_MODE_SHIFT 31 -#define OMAP5430_REPEAT_MODE_MASK (1 << 31)#define OMAP5430_COUNTER_SHIFT 0#define OMAP5430_COUNTER_MASK (0xffffff << 0)
@@ -203,7 +201,6 @@/* 5430 - All goes relative to OPP_BGAP_GPU */ #define OMAP5430_FUSE_OPP_BGAP_GPU 0x0#define OMAP5430_TEMP_SENSOR_GPU_OFFSET 0x150 -#define OMAP5430_BGAP_COUNTER_GPU_OFFSET 0x1C0#define OMAP5430_BGAP_THRESHOLD_GPU_OFFSET 0x1A8#define OMAP5430_BGAP_TSHUT_GPU_OFFSET 0x1B4#define OMAP5430_BGAP_CUMUL_DTEMP_GPU_OFFSET 0x1C0
@@ -216,7 +213,6 @@#define OMAP5430_FUSE_OPP_BGAP_MPU 0x4#define OMAP5430_TEMP_SENSOR_MPU_OFFSET 0x14C#define OMAP5430_BGAP_CTRL_OFFSET 0x1A0 -#define OMAP5430_BGAP_COUNTER_MPU_OFFSET 0x1BC#define OMAP5430_BGAP_THRESHOLD_MPU_OFFSET 0x1A4#define OMAP5430_BGAP_TSHUT_MPU_OFFSET 0x1B0#define OMAP5430_BGAP_CUMUL_DTEMP_MPU_OFFSET 0x1BC
@@ -228,7 +224,6 @@#define OMAP5430_FUSE_OPP_BGAP_CORE 0x8#define OMAP5430_TEMP_SENSOR_CORE_OFFSET 0x154 -#define OMAP5430_BGAP_COUNTER_CORE_OFFSET 0x1C4#define OMAP5430_BGAP_THRESHOLD_CORE_OFFSET 0x1AC#define OMAP5430_BGAP_TSHUT_CORE_OFFSET 0x1B8#define OMAP5430_BGAP_CUMUL_DTEMP_CORE_OFFSET 0x1C4
drivers/staging/omap-thermal/omap5-thermal.c +3 -3
@@ -43,7 +43,7 @@ omap5430_mpu_temp_sensor_registers = { .mask_clear_accum_mask = OMAP5430_MASK_CLEAR_ACCUM_MPU_MASK, - .bgap_counter = OMAP5430_BGAP_COUNTER_MPU_OFFSET, + .bgap_counter = OMAP5430_BGAP_CTRL_OFFSET, .counter_mask = OMAP5430_COUNTER_MASK, .bgap_threshold = OMAP5430_BGAP_THRESHOLD_MPU_OFFSET,
@@ -87,7 +87,7 @@ omap5430_gpu_temp_sensor_registers = { .mask_clear_mask = OMAP5430_MASK_CLEAR_GPU_MASK, .mask_clear_accum_mask = OMAP5430_MASK_CLEAR_ACCUM_GPU_MASK, - .bgap_counter = OMAP5430_BGAP_COUNTER_GPU_OFFSET, + .bgap_counter = OMAP5430_BGAP_CTRL_OFFSET, .counter_mask = OMAP5430_COUNTER_MASK, .bgap_threshold = OMAP5430_BGAP_THRESHOLD_GPU_OFFSET,
@@ -132,7 +132,7 @@ omap5430_core_temp_sensor_registers = { .mask_clear_mask = OMAP5430_MASK_CLEAR_CORE_MASK, .mask_clear_accum_mask = OMAP5430_MASK_CLEAR_ACCUM_CORE_MASK, - .bgap_counter = OMAP5430_BGAP_COUNTER_CORE_OFFSET, + .bgap_counter = OMAP5430_BGAP_CTRL_OFFSET, .counter_mask = OMAP5430_COUNTER_MASK, .bgap_threshold = OMAP5430_BGAP_THRESHOLD_CORE_OFFSET,
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 10/15 staging: omap-thermal: introduze FREEZE_BIT feature
In reply to Eduardo ValentinFor ES2.0 devices, it is not guaranteed that current DTEMP or DTEMP0 from the history buffer are going to contain correct values, due to desynchronization between BG clk and OCP clk.
For this reason, this patch changes the driver to first:
a. consider a feature flag, FREEZE_BIT, in order to check it is possible to freeze the history buffer or not. b. whenever reading the temperature, it will fetch from DTEMP1 instead of DTEMP or DTEMP0.
This WA is applicable only for OMAP5430 ES2.0.
--- drivers/staging/omap-thermal/omap-bandgap.c | 60 +++++++++++++++++++------- drivers/staging/omap-thermal/omap-bandgap.h | 1 + drivers/staging/omap-thermal/omap5-thermal.c | 1 + 3 files changed, 46 insertions(+), 16 deletions(-)
drivers/staging/omap-thermal/omap-bandgap.c +44 -16
@@ -75,12 +75,44 @@ static int omap_bandgap_power(struct omap_bandgap *bg_ptr, bool on)return 0 ; } +static u32 omap_bandgap_read_temp (struct omap_bandgap *bg_ptr,int id) +{ +struct temp_sensor_registers *tsr; +u32 temp, ctrl, reg; + + tsr = bg_ptr->conf->sensors[id].registers; + reg = tsr->temp_sensor_ctrl; + +if (OMAP_BANDGAP_HAS (bg_ptr,FREEZE_BIT )) { + ctrl =omap_bandgap_readl (bg_ptr, tsr->bgap_mask_ctrl); + ctrl |= tsr->mask_freeze_mask; +omap_bandgap_writel (bg_ptr, ctrl, tsr->bgap_mask_ctrl); +/* +* In case we cannot read from cur_dtemp / dtemp_0, +* then we read from the last valid temp read +*/ + reg = tsr->ctrl_dtemp_1; + } + +/* read temperature */ + temp =omap_bandgap_readl (bg_ptr, reg); + temp &= tsr->bgap_dtemp_mask; + +if (OMAP_BANDGAP_HAS (bg_ptr,FREEZE_BIT )) { + ctrl =omap_bandgap_readl (bg_ptr, tsr->bgap_mask_ctrl); + ctrl &= ~tsr->mask_freeze_mask; +omap_bandgap_writel (bg_ptr, ctrl, tsr->bgap_mask_ctrl); + } + +return temp; +} +/* This is the Talert handler. Call it only if HAS(TALERT) is set */ static irqreturn_t talert_irq_handler (int irq,void *data) {struct omap_bandgap *bg_ptr = data;struct temp_sensor_registers *tsr; -u32 t_hot =0 , t_cold =0 , temp, ctrl; +u32 t_hot =0 , t_cold =0 , ctrl;int i; bg_ptr = data;
@@ -118,10 +150,6 @@ static irqreturn_t talert_irq_handler(int irq, void *data) __func__, bg_ptr->conf->sensors[i].domain, t_hot, t_cold); -/* read temperature */ - temp =omap_bandgap_readl (bg_ptr, tsr->temp_sensor_ctrl); - temp &= tsr->bgap_dtemp_mask; -/* report temperature to whom may concern */ if (bg_ptr->conf->report_temperature) bg_ptr->conf->report_temperature (bg_ptr, i);
@@ -190,11 +218,11 @@ static int temp_sensor_unmask_interrupts(struct omap_bandgap *bg_ptr, int id,u32 temp, reg_val;/* Read the current on die temperature */ - tsr = bg_ptr->conf->sensors[id].registers; - temp =omap_bandgap_readl (bg_ptr, tsr->temp_sensor_ctrl); - temp &= tsr->bgap_dtemp_mask; + temp =omap_bandgap_read_temp (bg_ptr, id); + tsr = bg_ptr->conf->sensors[id].registers; reg_val =omap_bandgap_readl (bg_ptr, tsr->bgap_mask_ctrl); +if (temp < t_hot) reg_val |= tsr->mask_hot_mask;else
@@ -625,8 +653,9 @@ int omap_bandgap_read_temperature(struct omap_bandgap *bg_ptr, int id,return ret; tsr = bg_ptr->conf->sensors[id].registers; - temp =omap_bandgap_readl (bg_ptr, tsr->temp_sensor_ctrl); - temp &= tsr->bgap_dtemp_mask; +mutex_lock (&bg_ptr->bg_mutex); + temp =omap_bandgap_read_temp (bg_ptr, id); +mutex_unlock (&bg_ptr->bg_mutex); ret |=adc_to_temp_conversion (bg_ptr, id, temp, &temp);if (ret)
@@ -694,12 +723,11 @@ omap_bandgap_force_single_read(struct omap_bandgap *bg_ptr, int id) temp |=1 <<__ffs (tsr->bgap_soc_mask);omap_bandgap_writel (bg_ptr, temp, tsr->temp_sensor_ctrl);/* Wait until DTEMP is updated */ - temp =omap_bandgap_readl (bg_ptr, tsr->temp_sensor_ctrl); - temp &= (tsr->bgap_dtemp_mask); -while ((temp ==0 ) && --counter) { - temp =omap_bandgap_readl (bg_ptr, tsr->temp_sensor_ctrl); - temp &= (tsr->bgap_dtemp_mask); - } + temp =omap_bandgap_read_temp (bg_ptr, id); + +while ((temp ==0 ) && --counter) + temp =omap_bandgap_read_temp (bg_ptr, id); +/* Start of Conversion = 0 */ temp =omap_bandgap_readl (bg_ptr, tsr->temp_sensor_ctrl); temp &= ~(1 <<__ffs (tsr->bgap_soc_mask));
drivers/staging/omap-thermal/omap-bandgap.h +1 -0
@@ -442,6 +442,7 @@ struct omap_bandgap_data {#define OMAP_BANDGAP_FEATURE_COUNTER (1 << 4)#define OMAP_BANDGAP_FEATURE_POWER_SWITCH (1 << 5)#define OMAP_BANDGAP_FEATURE_CLK_CTRL (1 << 6) +#define OMAP_BANDGAP_FEATURE_FREEZE_BIT (1 << 7)#define OMAP_BANDGAP_HAS (b, f) \ ((b)->conf->features & OMAP_BANDGAP_FEATURE_ ## f)unsigned int features;
drivers/staging/omap-thermal/omap5-thermal.c +1 -0
@@ -319,6 +319,7 @@ omap5430_adc_to_temp[/* TODO : Need to update the slope/constant for ES2.0 silicon */ const struct omap_bandgap_data omap5430_data = { .features =OMAP_BANDGAP_FEATURE_TSHUT_CONFIG | +OMAP_BANDGAP_FEATURE_FREEZE_BIT |OMAP_BANDGAP_FEATURE_TALERT , .fclock_name ="l3instr_ts_gclk_div" , .div_ck_name ="l3instr_ts_gclk_div" ,
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 11/15 staging: omap-thermal: update DT entry documentation
In reply to Eduardo ValentinSimple update on documentation file for DT. This patch also adds an example for OMAP4430 and 0MAP4470, and also updated OMAP4460's example.
--- drivers/staging/omap-thermal/omap_bandgap.txt | 27 ++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 3 deletions(-)
drivers/staging/omap-thermal/omap_bandgap.txt +24 -3
@@ -10,21 +10,42 @@ to the silicon temperature. Required properties: - compatible : Should be: - - "ti,omap4460-control-bandgap" : for OMAP4460 bandgap - - "ti,omap5430-control-bandgap" : for OMAP5430 bandgap + - "ti,omap4430-bandgap" : for OMAP4430 bandgap + - "ti,omap4460-bandgap" : for OMAP4460 bandgap + - "ti,omap4470-bandgap" : for OMAP4470 bandgap + - "ti,omap5430-bandgap" : for OMAP5430 bandgap - interrupts : this entry should indicate which interrupt line the talert signal is routed to; Specific: - ti,tshut-gpio : this entry should be used to inform which GPIO line the tshut signal is routed to; +- regs : this entry must also be specified and it is specific +to each bandgap version, because the mapping may change from +soc to soc, apart of depending on available features. Example: +OMAP4430: +bandgap { + reg = <0x4a002260 0x4 0x4a00232C 0x4>; + compatible = "ti,omap4430-bandgap"; +}; + +OMAP4460: +bandgap { + reg = <0x4a002260 0x4 + 0x4a00232C 0x4 + 0x4a002378 0x18>; + compatible = "ti,omap4460-bandgap"; + interrupts = <0 126 4>; /* talert */ + ti,tshut-gpio = <86>; +}; +OMAP4470: bandgap { reg = <0x4a002260 0x4 0x4a00232C 0x4 0x4a002378 0x18>; - compatible = "ti,omap4460-control-bandgap"; + compatible = "ti,omap4470-bandgap"; interrupts = <0 126 4>; /* talert */ ti,tshut-gpio = <86>; };
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 12/15 staging: omap-thermal: add DT example for OMAP54xx devices
In reply to Eduardo ValentinUpdate documentation with DT example for OMAP54xx devices.
--- drivers/staging/omap-thermal/omap_bandgap.txt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)
drivers/staging/omap-thermal/omap_bandgap.txt +9 -0
@@ -49,3 +49,12 @@ bandgap { interrupts = <0 126 4>; /* talert */ ti,tshut-gpio = <86>; }; + +OMAP5430: +bandgap { + reg = <0x4a0021e0 0xc + 0x4a00232c 0xc + 0x4a002380 0x2c + 0x4a0023C0 0x3c>; + compatible = "ti,omap5430-bandgap"; +};
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 13/15 staging: omap-thermal: Remove double conv_table reference
In reply to Eduardo ValentinThis patch removes from data structure the double reference of the conversion table. It keeps the reference coming from bandgap data definition. The patch also adapts the code accordingly.
--- drivers/staging/omap-thermal/omap-bandgap.c | 8 ++++---- drivers/staging/omap-thermal/omap-bandgap.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/staging/omap-thermal/omap-bandgap.c +4 -4
@@ -179,7 +179,7 @@ int adc_to_temp_conversion(struct omap_bandgap *bg_ptr, int id, int adc_val,if (adc_val < ts_data->adc_start_val || adc_val > ts_data->adc_end_val)return -ERANGE ; - *t = bg_ptr->conv_table[adc_val - ts_data->adc_start_val]; + *t = bg_ptr->conf->conv_table[adc_val - ts_data->adc_start_val];return 0 ; }
@@ -188,17 +188,18 @@ static int temp_to_adc_conversion(long temp, struct omap_bandgap *bg_ptr, int i, int *adc) {struct temp_sensor_data *ts_data = bg_ptr->conf->sensors[i].ts_data; +const int *conv_table = bg_ptr->conf->conv_table;int high, low, mid; low =0 ; high = ts_data->adc_end_val - ts_data->adc_start_val; mid = (high + low) /2 ; -if (temp < bg_ptr->conv_table[low] || temp > bg_ptr->conv_table[high]) +if (temp < conv_table[low] || temp > conv_table[high])return -EINVAL ;while (low < high) { -if (temp < bg_ptr->conv_table[mid]) +if (temp < conv_table[mid]) high = mid -1 ;else low = mid +1 ;
@@ -911,7 +912,6 @@ int omap_bandgap_probe(struct platform_device *pdev) goto free_irqs; } - bg_ptr->conv_table = bg_ptr->conf->conv_table;for (i =0 ; i < bg_ptr->conf->sensor_count; i++) {struct temp_sensor_registers *tsr;u32 val;
drivers/staging/omap-thermal/omap-bandgap.h +0 -1
@@ -369,7 +369,6 @@ struct omap_bandgap {struct omap_bandgap_data *conf;struct clk *fclock;struct clk *div_clk; -const int *conv_table;struct mutex bg_mutex;/* Mutex for irq and PM */ int irq;int tshut_gpio;
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 14/15 staging: omap-thermal: name data files accordingly
In reply to Eduardo ValentinThis patch simply changes the name of files containing data structure definition.
--- drivers/staging/omap-thermal/Makefile | 4 +- drivers/staging/omap-thermal/omap4-thermal-data.c | 262 +++++++++++++++ drivers/staging/omap-thermal/omap4-thermal.c | 262 --------------- drivers/staging/omap-thermal/omap5-thermal-data.c | 357 +++++++++++++++++++++ drivers/staging/omap-thermal/omap5-thermal.c | 357 --------------------- 5 files changed, 621 insertions(+), 621 deletions(-) create mode 100644 drivers/staging/omap-thermal/omap4-thermal-data.c delete mode 100644 drivers/staging/omap-thermal/omap4-thermal.c create mode 100644 drivers/staging/omap-thermal/omap5-thermal-data.c delete mode 100644 drivers/staging/omap-thermal/omap5-thermal.c
drivers/staging/omap-thermal/Makefile +2 -2
@@ -1,5 +1,5 @@ obj-$(CONFIG_OMAP_BANDGAP) += omap-thermal.o omap-thermal-y := omap-bandgap.o omap-thermal-$(CONFIG_OMAP_THERMAL) += omap-thermal-common.o -omap-thermal-$(CONFIG_OMAP4_THERMAL) += omap4-thermal.o -omap-thermal-$(CONFIG_OMAP5_THERMAL) += omap5-thermal.o +omap-thermal-$(CONFIG_OMAP4_THERMAL) += omap4-thermal-data.o +omap-thermal-$(CONFIG_OMAP5_THERMAL) += omap5-thermal-data.o
drivers/staging/omap-thermal/omap4-thermal-data.c new file +262 -0
262 lines not on this page · raw message
drivers/staging/omap-thermal/omap4-thermal.c deleted +0 -262
262 lines not on this page · raw message
drivers/staging/omap-thermal/omap5-thermal-data.c new file +357 -0
357 lines not on this page · raw message
drivers/staging/omap-thermal/omap5-thermal.c deleted +0 -357
357 lines not on this page · raw message
Signature · 1 line
1.7.7.1.488.ge8e1c
PATCH 15/15 staging: omap-thermal: update clock prepare count
In reply to Eduardo ValentinThis patch changes the clock management code to also update the clock prepare counter, this way we won't skip the enable/disable operation due to prepare dependencies.
--- drivers/staging/omap-thermal/omap-bandgap.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/staging/omap-thermal/omap-bandgap.c +5 -5
@@ -943,7 +943,7 @@ int omap_bandgap_probe(struct platform_device *pdev) bg_ptr->clk_rate = clk_rate;if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_enable (bg_ptr->fclock); +clk_prepare_enable (bg_ptr->fclock);mutex_init (&bg_ptr->bg_mutex);
@@ -1013,7 +1013,7 @@ int omap_bandgap_probe(struct platform_device *pdev) disable_clk:if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_disable (bg_ptr->fclock); +clk_disable_unprepare (bg_ptr->fclock); put_clks:clk_put (bg_ptr->fclock);clk_put (bg_ptr->div_clk);
@@ -1044,7 +1044,7 @@ int omap_bandgap_remove(struct platform_device *pdev)omap_bandgap_power (bg_ptr, false);if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_disable (bg_ptr->fclock); +clk_disable_unprepare (bg_ptr->fclock);clk_put (bg_ptr->fclock);clk_put (bg_ptr->div_clk);
@@ -1143,7 +1143,7 @@ static int omap_bandgap_suspend(struct device *dev)omap_bandgap_power (bg_ptr, false);if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_disable (bg_ptr->fclock); +clk_disable_unprepare (bg_ptr->fclock);return err; }
@@ -1153,7 +1153,7 @@ static int omap_bandgap_resume(struct device *dev)struct omap_bandgap *bg_ptr =dev_get_drvdata (dev);if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_enable (bg_ptr->fclock); +clk_prepare_enable (bg_ptr->fclock);omap_bandgap_power (bg_ptr, true);
Signature · 1 line
1.7.7.1.488.ge8e1c
Re: [PATCH 15/15] staging: omap-thermal: update clock prepare count
Quoting Eduardo Valentin (2013-02-26 14:53:38)
Quoted 5 lines
This patch changes the clock management code to also update the clock prepare counter, this way we won't skip the enable/disable operation due to prepare dependencies.
Signed-off-by Eduardo Valentin <[email protected]>
Hi Eduardo,
I didn't look through the other patches in this series (or even the existing driver that is merged). With that said, I have a question:
does this driver aggressively call clk_enable/clk_disable in call sites other than those listed in this patch?
If so it might be a good idea to call clk_prepare_enable and clk_disable_unprepare in those location. Of course only call it if the context can sleep (e.g. not an interrupt handler).
If the driver doesn't aggressively call enable/disable elsewhere than you can disregard my message ;-)
Regards,
Mike
Quoted 60 lines
--- drivers/staging/omap-thermal/omap-bandgap.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)drivers/staging/omap-thermal/omap-bandgap.c +5
-5@@ -943,7 +943,7 @@ int omap_bandgap_probe(struct platform_device *pdev) bg_ptr->clk_rate = clk_rate;if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_enable (bg_ptr->fclock); +clk_prepare_enable (bg_ptr->fclock);mutex_init (&bg_ptr->bg_mutex);@@ -1013,7 +1013,7 @@ int omap_bandgap_probe(struct platform_device *pdev) disable_clk:if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_disable (bg_ptr->fclock); +clk_disable_unprepare (bg_ptr->fclock); put_clks:clk_put (bg_ptr->fclock);clk_put (bg_ptr->div_clk);@@ -1044,7 +1044,7 @@ int omap_bandgap_remove(struct platform_device *pdev)omap_bandgap_power (bg_ptr, false);if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_disable (bg_ptr->fclock); +clk_disable_unprepare (bg_ptr->fclock);clk_put (bg_ptr->fclock);clk_put (bg_ptr->div_clk);@@ -1143,7 +1143,7 @@ static int omap_bandgap_suspend(struct device *dev)omap_bandgap_power (bg_ptr, false);if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_disable (bg_ptr->fclock); +clk_disable_unprepare (bg_ptr->fclock);return err; }@@ -1153,7 +1153,7 @@ static int omap_bandgap_resume(struct device *dev)struct omap_bandgap *bg_ptr =dev_get_drvdata (dev);if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_enable (bg_ptr->fclock); +clk_prepare_enable (bg_ptr->fclock);omap_bandgap_power (bg_ptr, true);Signature · 6 lines
1.7.7.1.488.ge8e1c -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 15/15] staging: omap-thermal: update clock prepare count
Mike,
Quoted 5 lines · Mike Turquette
Quoting Eduardo Valentin (2013-02-26 14:53:38)
Quoted 4 lines
This patch changes the clock management code to also update the clock prepare counter, this way we won't skip the enable/disable operation due to prepare dependencies.
Quoted 8 lines
Quoted 1 line
Signed-off-by Eduardo Valentin <[email protected]>Hi Eduardo,
I didn't look through the other patches in this series (or even the existing driver that is merged). With that said, I have a question:
does this driver aggressively call clk_enable/clk_disable in call sites other than those listed in this patch?
Not really, no. The only places it calls clk_enable/disable are those listed below. Idea is that we want to keep the sensor running all the time. There should come another patch to cover for core idle, which in that case, this driver must idle the sensor, and therefor gate the clock, otherwise core won't idle, on some OMAP versions.
Quoted 4 lines
If so it might be a good idea to call
clk_prepare_enableandclk_disable_unpreparein those location. Of course only call it if the context can sleep (e.g. not an interrupt handler).
Ok. For now at least it is not the case.
Quoted 3 lines
If the driver doesn't aggressively call enable/disable elsewhere than you can disregard my message ;-)
hheeh, alright:-)
thanks for your comment.
Quoted 66 lines
Regards,
MikeQuoted 60 lines
--- drivers/staging/omap-thermal/omap-bandgap.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)drivers/staging/omap-thermal/omap-bandgap.c +5
-6@@ -943,7 +943,7 @@ int omap_bandgap_probe(struct platform_device *pdev) bg_ptr->clk_rate = clk_rate;if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_enable (bg_ptr->fclock); +clk_prepare_enable (bg_ptr->fclock);mutex_init (&bg_ptr->bg_mutex);@@ -1013,7 +1013,7 @@ int omap_bandgap_probe(struct platform_device *pdev) disable_clk:if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_disable (bg_ptr->fclock); +clk_disable_unprepare (bg_ptr->fclock); put_clks:clk_put (bg_ptr->fclock);clk_put (bg_ptr->div_clk);@@ -1044,7 +1044,7 @@ int omap_bandgap_remove(struct platform_device *pdev)omap_bandgap_power (bg_ptr, false);if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_disable (bg_ptr->fclock); +clk_disable_unprepare (bg_ptr->fclock);clk_put (bg_ptr->fclock);clk_put (bg_ptr->div_clk);@@ -1143,7 +1143,7 @@ static int omap_bandgap_suspend(struct device *dev)omap_bandgap_power (bg_ptr, false);if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_disable (bg_ptr->fclock); +clk_disable_unprepare (bg_ptr->fclock);return err; }@@ -1153,7 +1153,7 @@ static int omap_bandgap_resume(struct device *dev)struct omap_bandgap *bg_ptr =dev_get_drvdata (dev);if (OMAP_BANDGAP_HAS (bg_ptr,CLK_CTRL )) -clk_enable (bg_ptr->fclock); +clk_prepare_enable (bg_ptr->fclock);omap_bandgap_power (bg_ptr, true); --1.7.7.1.488.ge8e1c
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html