Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1262925

[PATCH v2 5/9] thermal: rockchip: Add the flag for adc value increment or decrement

Show all headers | View raw

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 flag to be better support the *code_to_temp*
for differenr SoCs.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
---

Changes in v2: None
Changes in v1: None

 drivers/thermal/rockchip_thermal.c | 64 ++++++++++++++++++++++++++++++--------
 1 file changed, 51 insertions(+), 13 deletions(-)

diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index e828f18..9df027f 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 adc_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 */
 	unsigned long data_mask;
+
+	/* adc value is increment or decrement */
+	unsigned int 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)
+	switch (table.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;
+		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 table conversion\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,
+		.flag = ADC_DECREMENT,
 	},
 };
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/9] Better compatible for the rockchip thermal and support RK3368 SoCs Caesar Wang <wxt@rock-chips.com> - 2015-11-05 06:20 +0100
  [PATCH v2 5/9] thermal: rockchip: Add the flag for adc value increment or decrement Caesar Wang <wxt@rock-chips.com> - 2015-11-05 06:20 +0100
    Re: [PATCH v2 5/9] thermal: rockchip: Add the flag for adc value  increment or decrement Eduardo Valentin <edubezval@gmail.com> - 2015-11-06 20:20 +0100
      Re: [PATCH v2 5/9] thermal: rockchip: Add the flag for adc value  increment or decrement Caesar Wang <caesar.upstream@gmail.com> - 2015-11-07 16:40 +0100
        Re: [PATCH v2 5/9] thermal: rockchip: Add the flag for adc value  increment or decrement Caesar Wang <caesar.upstream@gmail.com> - 2015-11-09 04:30 +0100
  Re: [PATCH v2 0/9] Better compatible for the rockchip thermal and  support RK3368 SoCs Eduardo Valentin <edubezval@gmail.com> - 2015-11-06 19:50 +0100
    Re: [PATCH v2 0/9] Better compatible for the rockchip thermal and support RK3368 SoCs Heiko Stuebner <heiko@sntech.de> - 2015-11-06 20:10 +0100
      Re: [PATCH v2 0/9] Better compatible for the rockchip thermal and  support RK3368 SoCs Eduardo Valentin <edubezval@gmail.com> - 2015-11-06 20:20 +0100
      Re: [PATCH v2 0/9] Better compatible for the rockchip thermal and  support RK3368 SoCs Caesar Wang <caesar.upstream@gmail.com> - 2015-11-07 17:00 +0100
        Re: [PATCH v2 0/9] Better compatible for the rockchip thermal and support RK3368 SoCs Heiko Stuebner <heiko@sntech.de> - 2015-11-08 00:20 +0100
          Re: [PATCH v2 0/9] Better compatible for the rockchip thermal and  support RK3368 SoCs Caesar Wang <caesar.upstream@gmail.com> - 2015-11-08 10:40 +0100
    Re: [PATCH v2 0/9] Better compatible for the rockchip thermal and  support RK3368 SoCs Caesar Wang <caesar.upstream@gmail.com> - 2015-11-07 16:50 +0100

csiph-web