| Message ID | 1446974768-25795-6-git-send-email-wxt@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Caesar,
[auto build test WARNING on: soc-thermal/next]
[also build test WARNING on: next-20151106]
[cannot apply to: rockchip/for-next v4.3]
url: https://github.com/0day-ci/linux/commits/Caesar-Wang/Better-compatible-for-the-rockchip-thermal-and-support-RK3368-SoCs/20151108-173308
base: https://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal next
config: x86_64-randconfig-x014-201545 (attached as .config)
reproduce:
# save the attached .config to linux build tree
make ARCH=x86_64
All warnings (new ones prefixed by >>):
drivers/thermal/rockchip_thermal.c: In function 'rk_tsadcv2_code_to_temp':
>> drivers/thermal/rockchip_thermal.c:239:10: warning: switch condition has boolean value [-Wswitch-bool]
switch (table.sort_flag) {
^
drivers/thermal/rockchip_thermal.c: In function 'rockchip_thermal_suspend':
drivers/thermal/rockchip_thermal.c:720:2: error: implicit declaration of function 'pinctrl_pm_select_sleep_state' [-Werror=implicit-function-declaration]
pinctrl_pm_select_sleep_state(dev);
^
drivers/thermal/rockchip_thermal.c: In function 'rockchip_thermal_resume':
drivers/thermal/rockchip_thermal.c:759:2: error: implicit declaration of function 'pinctrl_pm_select_default_state' [-Werror=implicit-function-declaration]
pinctrl_pm_select_default_state(dev);
^
cc1: some warnings being treated as errors
vim +239 drivers/thermal/rockchip_thermal.c
223 }
224
225 return 0;
226 }
227
228 static int rk_tsadcv2_code_to_temp(struct chip_tsadc_table table, u32 code,
229 int *temp)
230 {
231 unsigned int low = 1;
232 unsigned int high = table.length - 1;
233 unsigned int mid = (low + high) / 2;
234 unsigned int num;
235 unsigned long denom;
236
237 WARN_ON(table.length < 2);
238
> 239 switch (table.sort_flag) {
240 case ADC_DECREMENT:
241 code &= table.data_mask;
242 if (code < table.id[high].code)
243 return -EAGAIN; /* Incorrect reading */
244
245 while (low <= high) {
246 if (code >= table.id[mid].code &&
247 code < table.id[mid - 1].code)
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index 3116d07..c1ab346 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -53,6 +53,16 @@ enum sensor_id { }; /** +* The conversion table has the adc value and temperature. +* ADC_DECREMENT is the adc value decremnet.(e.g. v2_code_table) +* ADC_INCREMNET is the adc value incremnet.(e.g. v3_code_table) +*/ +enum sort_flag { + ADC_DECREMENT = 0, + ADC_INCREMENT, +}; + +/** * The max sensors is two in rockchip SoCs. * Two sensors: CPU and GPU sensor. */ @@ -66,6 +76,9 @@ struct chip_tsadc_table { /* that analogic mask data */ u32 data_mask; + + /* the flag is adc value that increment or decrement in table */ + bool sort_flag; }; struct rockchip_tsadc_chip { @@ -223,19 +236,43 @@ static int rk_tsadcv2_code_to_temp(struct chip_tsadc_table table, u32 code, WARN_ON(table.length < 2); - code &= table.data_mask; - if (code < table.id[high].code) - return -EAGAIN; /* Incorrect reading */ - - while (low <= high) { - if (code >= table.id[mid].code && - code < table.id[mid - 1].code) - break; - else if (code < table.id[mid].code) - low = mid + 1; - else - high = mid - 1; - mid = (low + high) / 2; + switch (table.sort_flag) { + case ADC_DECREMENT: + code &= table.data_mask; + if (code < table.id[high].code) + return -EAGAIN; /* Incorrect reading */ + + while (low <= high) { + if (code >= table.id[mid].code && + code < table.id[mid - 1].code) + break; + else if (code < table.id[mid].code) + low = mid + 1; + else + high = mid - 1; + + mid = (low + high) / 2; + } + break; + case ADC_INCREMENT: + code &= table.data_mask; + if (code < table.id[low].code) + return -EAGAIN; /* Incorrect reading */ + + while (low <= high) { + if (code >= table.id[mid - 1].code && + code < table.id[mid].code) + break; + else if (code > table.id[mid].code) + low = mid + 1; + else + high = mid - 1; + + mid = (low + high) / 2; + } + break; + default: + pr_err("Invalid the conversion table\n"); } /* @@ -245,8 +282,8 @@ static int rk_tsadcv2_code_to_temp(struct chip_tsadc_table table, u32 code, * to produce less granular result. */ num = table.id[mid].temp - v2_code_table[mid - 1].temp; - num *= table.id[mid - 1].code - code; - denom = table.id[mid - 1].code - table.id[mid].code; + num *= abs(table.id[mid - 1].code - code); + denom = abs(table.id[mid - 1].code - table.id[mid].code); *temp = table.id[mid - 1].temp + (num / denom); return 0; @@ -367,6 +404,7 @@ static const struct rockchip_tsadc_chip rk3288_tsadc_data = { .id = v2_code_table, .length = ARRAY_SIZE(v2_code_table), .data_mask = TSADCV2_DATA_MASK, + .sort_flag = ADC_DECREMENT, }, };
The conversion table has the adc value and temperature. In fact, the adc value only has the increment or decrement mode in conversion table. Moment, we can add the sort flag to be better support the *code_to_temp* for differenr SoCs. Signed-off-by: Caesar Wang <wxt@rock-chips.com> --- Changes in v3: - rename the flag-> sort_flag. - fix the indentation. - change the pr_err information. Changes in v2: None Changes in v1: None drivers/thermal/rockchip_thermal.c | 68 +++++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 15 deletions(-)