From: Caesar Wang <wxt@rock-chips.com> To: Heiko Stuebner <heiko@sntech.de>, Eduardo Valentin <edubezval@gmail.com> Cc: linux-rockchip@lists.infradead.org, lkp@intel.com, Caesar Wang <wxt@rock-chips.com>, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Zhang Rui <rui.zhang@intel.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 05/10] thermal: rockchip: Add the sort mode for adc value increment or decrement Date: Mon, 9 Nov 2015 12:48:57 +0800 [thread overview] Message-ID: <1447044542-30859-6-git-send-email-wxt@rock-chips.com> (raw) In-Reply-To: <1447044542-30859-1-git-send-email-wxt@rock-chips.com> 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 mode to be better support the *code_to_temp* for differenr SoCs. Signed-off-by: Caesar Wang <wxt@rock-chips.com> --- Changes in v4: - rename the flag as mode. - with enum type instead of bool type. 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(-) diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index bbf082c..7c5b784 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -54,6 +54,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 adc_sort_mode { + ADC_DECREMENT = 0, + ADC_INCREMENT, +}; + +/** * The max sensors is two in rockchip SoCs. * Two sensors: CPU and GPU sensor. */ @@ -67,6 +77,9 @@ struct chip_tsadc_table { /* that analogic mask data */ u32 data_mask; + + /* the sort mode is adc value that increment or decrement in table */ + enum adc_sort_mode mode; }; struct rockchip_tsadc_chip { @@ -224,19 +237,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.mode) { + 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"); } /* @@ -246,8 +283,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; @@ -368,6 +405,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, + .mode = ADC_DECREMENT, }, }; -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: wxt@rock-chips.com (Caesar Wang) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 05/10] thermal: rockchip: Add the sort mode for adc value increment or decrement Date: Mon, 9 Nov 2015 12:48:57 +0800 [thread overview] Message-ID: <1447044542-30859-6-git-send-email-wxt@rock-chips.com> (raw) In-Reply-To: <1447044542-30859-1-git-send-email-wxt@rock-chips.com> 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 mode to be better support the *code_to_temp* for differenr SoCs. Signed-off-by: Caesar Wang <wxt@rock-chips.com> --- Changes in v4: - rename the flag as mode. - with enum type instead of bool type. 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(-) diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index bbf082c..7c5b784 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -54,6 +54,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 adc_sort_mode { + ADC_DECREMENT = 0, + ADC_INCREMENT, +}; + +/** * The max sensors is two in rockchip SoCs. * Two sensors: CPU and GPU sensor. */ @@ -67,6 +77,9 @@ struct chip_tsadc_table { /* that analogic mask data */ u32 data_mask; + + /* the sort mode is adc value that increment or decrement in table */ + enum adc_sort_mode mode; }; struct rockchip_tsadc_chip { @@ -224,19 +237,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.mode) { + 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"); } /* @@ -246,8 +283,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; @@ -368,6 +405,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, + .mode = ADC_DECREMENT, }, }; -- 1.9.1
next prev parent reply other threads:[~2015-11-09 4:50 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-09 4:48 [PATCH v4 00/10] Better compatible for the rockchip thermal and support RK3368 SoCs Caesar Wang 2015-11-09 4:48 ` Caesar Wang 2015-11-09 4:48 ` Caesar Wang 2015-11-09 4:48 ` [PATCH v4 01/10] dt-bindings: rockchip-thermal: Support the RK3368 SoCs compatible Caesar Wang 2015-11-09 4:48 ` Caesar Wang 2015-11-09 4:48 ` Caesar Wang 2015-11-09 4:48 ` [PATCH v4 02/10] thermal: rockchip: better to compatible the driver for different SoCs Caesar Wang 2015-11-09 4:48 ` Caesar Wang 2015-11-09 4:48 ` Caesar Wang 2015-11-09 4:48 ` [PATCH v4 03/10] thermal: rockchip: trivial: fix typo in commit Caesar Wang 2015-11-09 4:48 ` Caesar Wang 2015-11-09 4:48 ` Caesar Wang 2015-11-09 4:48 ` [PATCH v4 04/10] thermal: rockchip: improve the conversion function Caesar Wang 2015-11-09 4:48 ` Caesar Wang 2015-11-09 4:48 ` Caesar Wang 2015-11-09 4:48 ` Caesar Wang [this message] 2015-11-09 4:48 ` [PATCH v4 05/10] thermal: rockchip: Add the sort mode for adc value increment or decrement Caesar Wang 2015-11-09 4:48 ` [PATCH v4 06/10] thermal: rockchip: consistently use int for temperatures Caesar Wang 2015-11-09 4:48 ` Caesar Wang 2015-12-02 18:38 ` Brian Norris 2015-12-02 18:38 ` Brian Norris 2015-12-02 18:38 ` Brian Norris [not found] ` <565F8FFE.3080807@rock-chips.com> 2015-12-03 0:49 ` Brian Norris 2015-12-03 0:49 ` Brian Norris 2015-12-03 0:49 ` Brian Norris 2015-12-03 1:16 ` Caesar Wang 2015-12-03 1:16 ` Caesar Wang 2015-11-09 4:48 ` [PATCH v4 07/10] thermal: rockchip: Support the RK3368 SoCs in thermal driver Caesar Wang 2015-11-09 4:48 ` Caesar Wang 2015-11-09 4:49 ` [PATCH v4 08/10] arm64: dts: Add the thermal data found on RK3368 Caesar Wang 2015-11-09 4:49 ` Caesar Wang 2015-11-09 4:49 ` Caesar Wang 2015-11-09 4:49 ` [PATCH v4 09/10] arm64: dts: Add main Thermal info to rk3368.dtsi Caesar Wang 2015-11-09 4:49 ` Caesar Wang 2015-11-09 4:49 ` Caesar Wang [not found] ` <1447044542-30859-10-git-send-email-wxt-TNX95d0MmH7DzftRWevZcw@public.gmane.org> 2016-02-09 8:30 ` Heiko Stuebner 2016-02-09 8:30 ` Heiko Stuebner 2016-02-15 3:36 ` Caesar Wang 2016-02-15 3:36 ` Caesar Wang 2015-11-09 4:49 ` [PATCH v4 10/10] arm64: dts: Enable the Thermal on R88 board Caesar Wang 2015-11-09 4:49 ` Caesar Wang 2015-11-12 18:29 ` [PATCH v4 00/10] Better compatible for the rockchip thermal and support RK3368 SoCs Eduardo Valentin 2015-11-12 18:29 ` Eduardo Valentin 2015-11-12 18:31 ` Eduardo Valentin 2015-11-12 18:31 ` Eduardo Valentin 2015-11-21 16:41 ` Heiko Stuebner 2015-11-21 16:41 ` Heiko Stuebner 2015-11-21 16:41 ` Heiko Stuebner 2015-11-12 22:14 ` Heiko Stuebner 2015-11-12 22:14 ` Heiko Stuebner 2015-11-14 6:31 ` Caesar Wang 2015-11-14 6:31 ` Caesar Wang 2015-11-14 6:30 ` Caesar Wang 2015-11-14 6:30 ` Caesar Wang 2015-11-14 6:30 ` Caesar Wang
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=1447044542-30859-6-git-send-email-wxt@rock-chips.com \ --to=wxt@rock-chips.com \ --cc=edubezval@gmail.com \ --cc=heiko@sntech.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=lkp@intel.com \ --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: linkBe 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.