From: Caesar Wang <wxt@rock-chips.com> To: Heiko Stuebner <heiko@sntech.de>, Eduardo Valentin <edubezval@gmail.com> Cc: linux-rockchip@lists.infradead.org, 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 v3 07/10] thermal: rockchip: Support the RK3368 SoCs in thermal drivers Date: Sun, 8 Nov 2015 17:26:05 +0800 [thread overview] Message-ID: <1446974768-25795-8-git-send-email-wxt@rock-chips.com> (raw) In-Reply-To: <1446974768-25795-1-git-send-email-wxt@rock-chips.com> The RK3368 SoCs support to 2 channel TS-ADC, the temperature criteria of each channel can be configurable. The system has two Temperature Sensors, channel 0 is for CPU, and channel 1 is for GPU. Signed-off-by: Caesar Wang <wxt@rock-chips.com> --- Changes in v3: - :%s/flag/sort_flag - fix the rk3368 sort_flag as increment mode. Series-changes: 2 - remove some unused, completed on other patchs. Changes in v2: None Changes in v1: None drivers/thermal/rockchip_thermal.c | 72 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index 067ecdd..df28049 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -1,6 +1,9 @@ /* * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd * + * Copyright (c) 2015, Fuzhou Rockchip Electronics Co., Ltd + * Caesar Wang <wxt@rock-chips.com> + * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. @@ -152,6 +155,8 @@ struct rockchip_thermal_data { #define TSADCV2_INT_PD_CLEAR_MASK ~BIT(8) #define TSADCV2_DATA_MASK 0xfff +#define TSADCV3_DATA_MASK 0x3ff + #define TSADCV2_HIGHT_INT_DEBOUNCE_COUNT 4 #define TSADCV2_HIGHT_TSHUT_DEBOUNCE_COUNT 4 #define TSADCV2_AUTO_PERIOD_TIME 250 /* msec */ @@ -200,6 +205,45 @@ static const struct tsadc_table v2_code_table[] = { {3421, 125000}, }; +static const struct tsadc_table v3_code_table[] = { + {0, -40000}, + {106, -40000}, + {108, -35000}, + {110, -30000}, + {112, -25000}, + {114, -20000}, + {116, -15000}, + {118, -10000}, + {120, -5000}, + {122, 0}, + {124, 5000}, + {126, 10000}, + {128, 15000}, + {130, 20000}, + {132, 25000}, + {134, 30000}, + {136, 35000}, + {138, 40000}, + {140, 45000}, + {142, 50000}, + {144, 55000}, + {146, 60000}, + {148, 65000}, + {150, 70000}, + {152, 75000}, + {154, 80000}, + {156, 85000}, + {158, 90000}, + {160, 95000}, + {162, 100000}, + {163, 105000}, + {165, 110000}, + {167, 115000}, + {169, 120000}, + {171, 125000}, + {TSADCV3_DATA_MASK, 125000}, +}; + static u32 rk_tsadcv2_temp_to_code(struct chip_tsadc_table table, int temp) { @@ -408,11 +452,39 @@ static const struct rockchip_tsadc_chip rk3288_tsadc_data = { }, }; +static const struct rockchip_tsadc_chip rk3368_tsadc_data = { + .chn_id[SENSOR_CPU] = 0, /* cpu sensor is channel 0 */ + .chn_id[SENSOR_GPU] = 1, /* gpu sensor is channel 1 */ + .chn_num = 2, /* two channels for tsadc */ + + .tshut_mode = TSHUT_MODE_GPIO, /* default TSHUT via GPIO give PMIC */ + .tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */ + .tshut_temp = 95000, + + .initialize = rk_tsadcv2_initialize, + .irq_ack = rk_tsadcv2_irq_ack, + .control = rk_tsadcv2_control, + .get_temp = rk_tsadcv2_get_temp, + .set_tshut_temp = rk_tsadcv2_tshut_temp, + .set_tshut_mode = rk_tsadcv2_tshut_mode, + + .table = { + .id = v3_code_table, + .length = ARRAY_SIZE(v3_code_table), + .data_mask = TSADCV3_DATA_MASK, + .sort_flag = ADC_INCREMENT, + }, +}; + static const struct of_device_id of_rockchip_thermal_match[] = { { .compatible = "rockchip,rk3288-tsadc", .data = (void *)&rk3288_tsadc_data, }, + { + .compatible = "rockchip,rk3368-tsadc", + .data = (void *)&rk3368_tsadc_data, + }, { /* end */ }, }; MODULE_DEVICE_TABLE(of, of_rockchip_thermal_match); -- 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 v3 07/10] thermal: rockchip: Support the RK3368 SoCs in thermal drivers Date: Sun, 8 Nov 2015 17:26:05 +0800 [thread overview] Message-ID: <1446974768-25795-8-git-send-email-wxt@rock-chips.com> (raw) In-Reply-To: <1446974768-25795-1-git-send-email-wxt@rock-chips.com> The RK3368 SoCs support to 2 channel TS-ADC, the temperature criteria of each channel can be configurable. The system has two Temperature Sensors, channel 0 is for CPU, and channel 1 is for GPU. Signed-off-by: Caesar Wang <wxt@rock-chips.com> --- Changes in v3: - :%s/flag/sort_flag - fix the rk3368 sort_flag as increment mode. Series-changes: 2 - remove some unused, completed on other patchs. Changes in v2: None Changes in v1: None drivers/thermal/rockchip_thermal.c | 72 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index 067ecdd..df28049 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -1,6 +1,9 @@ /* * Copyright (c) 2014, Fuzhou Rockchip Electronics Co., Ltd * + * Copyright (c) 2015, Fuzhou Rockchip Electronics Co., Ltd + * Caesar Wang <wxt@rock-chips.com> + * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, * version 2, as published by the Free Software Foundation. @@ -152,6 +155,8 @@ struct rockchip_thermal_data { #define TSADCV2_INT_PD_CLEAR_MASK ~BIT(8) #define TSADCV2_DATA_MASK 0xfff +#define TSADCV3_DATA_MASK 0x3ff + #define TSADCV2_HIGHT_INT_DEBOUNCE_COUNT 4 #define TSADCV2_HIGHT_TSHUT_DEBOUNCE_COUNT 4 #define TSADCV2_AUTO_PERIOD_TIME 250 /* msec */ @@ -200,6 +205,45 @@ static const struct tsadc_table v2_code_table[] = { {3421, 125000}, }; +static const struct tsadc_table v3_code_table[] = { + {0, -40000}, + {106, -40000}, + {108, -35000}, + {110, -30000}, + {112, -25000}, + {114, -20000}, + {116, -15000}, + {118, -10000}, + {120, -5000}, + {122, 0}, + {124, 5000}, + {126, 10000}, + {128, 15000}, + {130, 20000}, + {132, 25000}, + {134, 30000}, + {136, 35000}, + {138, 40000}, + {140, 45000}, + {142, 50000}, + {144, 55000}, + {146, 60000}, + {148, 65000}, + {150, 70000}, + {152, 75000}, + {154, 80000}, + {156, 85000}, + {158, 90000}, + {160, 95000}, + {162, 100000}, + {163, 105000}, + {165, 110000}, + {167, 115000}, + {169, 120000}, + {171, 125000}, + {TSADCV3_DATA_MASK, 125000}, +}; + static u32 rk_tsadcv2_temp_to_code(struct chip_tsadc_table table, int temp) { @@ -408,11 +452,39 @@ static const struct rockchip_tsadc_chip rk3288_tsadc_data = { }, }; +static const struct rockchip_tsadc_chip rk3368_tsadc_data = { + .chn_id[SENSOR_CPU] = 0, /* cpu sensor is channel 0 */ + .chn_id[SENSOR_GPU] = 1, /* gpu sensor is channel 1 */ + .chn_num = 2, /* two channels for tsadc */ + + .tshut_mode = TSHUT_MODE_GPIO, /* default TSHUT via GPIO give PMIC */ + .tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */ + .tshut_temp = 95000, + + .initialize = rk_tsadcv2_initialize, + .irq_ack = rk_tsadcv2_irq_ack, + .control = rk_tsadcv2_control, + .get_temp = rk_tsadcv2_get_temp, + .set_tshut_temp = rk_tsadcv2_tshut_temp, + .set_tshut_mode = rk_tsadcv2_tshut_mode, + + .table = { + .id = v3_code_table, + .length = ARRAY_SIZE(v3_code_table), + .data_mask = TSADCV3_DATA_MASK, + .sort_flag = ADC_INCREMENT, + }, +}; + static const struct of_device_id of_rockchip_thermal_match[] = { { .compatible = "rockchip,rk3288-tsadc", .data = (void *)&rk3288_tsadc_data, }, + { + .compatible = "rockchip,rk3368-tsadc", + .data = (void *)&rk3368_tsadc_data, + }, { /* end */ }, }; MODULE_DEVICE_TABLE(of, of_rockchip_thermal_match); -- 1.9.1
next prev parent reply other threads:[~2015-11-08 9:27 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-11-08 9:25 [PATCH v3 00/10] Better compatible for the rockchip thermal and support RK3368 SoCs Caesar Wang 2015-11-08 9:25 ` Caesar Wang 2015-11-08 9:25 ` Caesar Wang 2015-11-08 9:25 ` [PATCH v3 01/10] dt-bindings: rockchip-thermal: Support the RK3368 SoCs compatible Caesar Wang 2015-11-08 9:25 ` Caesar Wang 2015-11-08 9:25 ` Caesar Wang 2015-11-08 9:26 ` [PATCH v3 02/10] thermal: rockchip: better to compatible the driver for different SoCs Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:26 ` [PATCH v3 03/10] thermal: rockchip: trivial: fix typo in commit Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:26 ` [PATCH v3 04/10] thermal: rockchip: improve the conversion function Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:26 ` [PATCH v3 05/10] thermal: rockchip: Add the sort flag for adc value increment or decrement Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:42 ` kbuild test robot 2015-11-08 9:42 ` kbuild test robot 2015-11-08 9:42 ` kbuild test robot 2015-11-08 9:26 ` [PATCH v3 06/10] thermal: rockchip: consistently use int for temperatures Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:26 ` Caesar Wang [this message] 2015-11-08 9:26 ` [PATCH v3 07/10] thermal: rockchip: Support the RK3368 SoCs in thermal drivers Caesar Wang 2015-11-08 9:26 ` [PATCH v3 08/10] arm64: dts: Add the thermal data found on RK3368 Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:26 ` [PATCH v3 09/10] arm64: dts: Add main Thermal info to rk3368.dtsi Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 9:26 ` [PATCH v3 10/10] arm64: dts: Enable the Thermal on R88 board Caesar Wang 2015-11-08 9:26 ` Caesar Wang 2015-11-08 13:42 ` kbuild test robot 2015-11-08 13:42 ` kbuild test robot 2015-11-08 13:42 ` kbuild test robot 2015-11-08 14:14 ` 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=1446974768-25795-8-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=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.