OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

thermal: rockchip: fix the tsadc sequence output on rk3228/rk3399 

As the TRM says, add the tsadc_q_sel to control the temperature-code
sequence since the rk3228/rk3399 need set this bit (1024 - tsadc_q)
as output.

Fixes: commit
b0d7033 "thermal: rockchip: Support the RK3399 SoCs in thermal driver"
7b02a5e "thermal: rockchip: Support the RK3228 SoCs in thermal driver"

Reported-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Caesar Wang 2016-02-15 15:33:31 +08:00 committed by Eduardo Valentin
parent 952418a34f
commit 7ea38c6c36
1 changed files with 102 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
drivers/thermal/rockchip_thermal.c
View File

@ -155,6 +155,13 @@ struct rockchip_thermal_data {
#define TSADCV2_AUTO_EN BIT(0) #define TSADCV2_AUTO_EN BIT(0)
#define TSADCV2_AUTO_SRC_EN(chn) BIT(4 + (chn)) #define TSADCV2_AUTO_SRC_EN(chn) BIT(4 + (chn))
#define TSADCV2_AUTO_TSHUT_POLARITY_HIGH BIT(8) #define TSADCV2_AUTO_TSHUT_POLARITY_HIGH BIT(8)
/**
* TSADCV1_AUTO_Q_SEL_EN:
* whether select (1024 - tsadc_q) as output
* 1'b0:use tsadc_q as output(temperature-code is rising sequence)
* 1'b1:use(1024 - tsadc_q) as output (temperature-code is falling sequence)
*/
#define TSADCV3_AUTO_Q_SEL_EN BIT(1)
#define TSADCV2_INT_SRC_EN(chn) BIT(chn) #define TSADCV2_INT_SRC_EN(chn) BIT(chn)
#define TSADCV2_SHUT_2GPIO_SRC_EN(chn) BIT(4 + (chn)) #define TSADCV2_SHUT_2GPIO_SRC_EN(chn) BIT(4 + (chn))
@ -184,41 +191,42 @@ struct tsadc_table {
* Code to Temperature mapping should be updated based on sillcon results. * Code to Temperature mapping should be updated based on sillcon results.
*/ */
static const struct tsadc_table rk3228_code_table[] = { static const struct tsadc_table rk3228_code_table[] = {
{TSADCV3_DATA_MASK, -40000}, {0, -40000},
{436, -40000}, {588, -40000},
{431, -35000}, {593, -35000},
{426, -30000}, {598, -30000},
{421, -25000}, {603, -25000},
{416, -20000}, {608, -20000},
{411, -15000}, {613, -15000},
{406, -10000}, {618, -10000},
{401, -5000}, {623, -5000},
{395, 0}, {629, 0},
{390, 5000}, {634, 5000},
{385, 10000}, {639, 10000},
{380, 15000}, {644, 15000},
{375, 20000}, {649, 20000},
{370, 25000}, {654, 25000},
{364, 30000}, {660, 30000},
{359, 35000}, {665, 35000},
{354, 40000}, {670, 40000},
{349, 45000}, {675, 45000},
{343, 50000}, {681, 50000},
{338, 55000}, {686, 55000},
{333, 60000}, {691, 60000},
{328, 65000}, {696, 65000},
{322, 70000}, {702, 70000},
{317, 75000}, {707, 75000},
{312, 80000}, {712, 80000},
{307, 85000}, {717, 85000},
{301, 90000}, {723, 90000},
{296, 95000}, {728, 95000},
{291, 100000}, {733, 100000},
{286, 105000}, {738, 105000},
{280, 110000}, {744, 110000},
{275, 115000}, {749, 115000},
{270, 120000}, {754, 120000},
{264, 125000}, {760, 125000},
{TSADCV2_DATA_MASK, 125000},
}; };
static const struct tsadc_table rk3288_code_table[] = { static const struct tsadc_table rk3288_code_table[] = {
@ -299,41 +307,42 @@ static const struct tsadc_table rk3368_code_table[] = {
}; };
static const struct tsadc_table rk3399_code_table[] = { static const struct tsadc_table rk3399_code_table[] = {
{TSADCV3_DATA_MASK, -40000}, {0, -40000},
{431, -40000}, {593, -40000},
{426, -35000}, {598, -35000},
{421, -30000}, {603, -30000},
{415, -25000}, {609, -25000},
{410, -20000}, {614, -20000},
{405, -15000}, {619, -15000},
{399, -10000}, {625, -10000},
{394, -5000}, {630, -5000},
{389, 0}, {635, 0},
{383, 5000}, {641, 5000},
{378, 10000}, {646, 10000},
{373, 15000}, {651, 15000},
{367, 20000}, {657, 20000},
{362, 25000}, {662, 25000},
{357, 30000}, {667, 30000},
{351, 35000}, {673, 35000},
{346, 40000}, {678, 40000},
{340, 45000}, {684, 45000},
{335, 50000}, {689, 50000},
{330, 55000}, {694, 55000},
{324, 60000}, {700, 60000},
{319, 65000}, {705, 65000},
{313, 70000}, {711, 70000},
{308, 75000}, {716, 75000},
{302, 80000}, {722, 80000},
{297, 85000}, {727, 85000},
{291, 90000}, {733, 90000},
{286, 95000}, {738, 95000},
{281, 100000}, {743, 100000},
{275, 105000}, {749, 105000},
{270, 110000}, {754, 110000},
{264, 115000}, {760, 115000},
{259, 120000}, {765, 120000},
{253, 125000}, {771, 125000},
{TSADCV3_DATA_MASK, 125000},
}; };
static u32 rk_tsadcv2_temp_to_code(struct chip_tsadc_table table, static u32 rk_tsadcv2_temp_to_code(struct chip_tsadc_table table,
@ -488,6 +497,25 @@ static void rk_tsadcv2_control(void __iomem *regs, bool enable)
writel_relaxed(val, regs + TSADCV2_AUTO_CON); writel_relaxed(val, regs + TSADCV2_AUTO_CON);
} }
/**
* @rk_tsadcv3_control:
* TSADC controller works at auto mode, and some SoCs need set the tsadc_q_sel
* bit on TSADCV2_AUTO_CON[1]. The (1024 - tsadc_q) as output adc value if
* setting this bit to enable.
*/
static void rk_tsadcv3_control(void __iomem *regs, bool enable)
{
u32 val;
val = readl_relaxed(regs + TSADCV2_AUTO_CON);
if (enable)
val |= TSADCV2_AUTO_EN | TSADCV3_AUTO_Q_SEL_EN;
else
val &= ~TSADCV2_AUTO_EN;
writel_relaxed(val, regs + TSADCV2_AUTO_CON);
}
static int rk_tsadcv2_get_temp(struct chip_tsadc_table table, static int rk_tsadcv2_get_temp(struct chip_tsadc_table table,
int chn, void __iomem *regs, int *temp) int chn, void __iomem *regs, int *temp)
{ {
@ -538,7 +566,7 @@ static const struct rockchip_tsadc_chip rk3228_tsadc_data = {
.initialize = rk_tsadcv2_initialize, .initialize = rk_tsadcv2_initialize,
.irq_ack = rk_tsadcv3_irq_ack, .irq_ack = rk_tsadcv3_irq_ack,
.control = rk_tsadcv2_control, .control = rk_tsadcv3_control,
.get_temp = rk_tsadcv2_get_temp, .get_temp = rk_tsadcv2_get_temp,
.set_tshut_temp = rk_tsadcv2_tshut_temp, .set_tshut_temp = rk_tsadcv2_tshut_temp,
.set_tshut_mode = rk_tsadcv2_tshut_mode, .set_tshut_mode = rk_tsadcv2_tshut_mode,
@ -547,7 +575,7 @@ static const struct rockchip_tsadc_chip rk3228_tsadc_data = {
.id = rk3228_code_table, .id = rk3228_code_table,
.length = ARRAY_SIZE(rk3228_code_table), .length = ARRAY_SIZE(rk3228_code_table),
.data_mask = TSADCV3_DATA_MASK, .data_mask = TSADCV3_DATA_MASK,
.mode = ADC_DECREMENT, .mode = ADC_INCREMENT,
}, },
}; };
@ -610,7 +638,7 @@ static const struct rockchip_tsadc_chip rk3399_tsadc_data = {
.initialize = rk_tsadcv2_initialize, .initialize = rk_tsadcv2_initialize,
.irq_ack = rk_tsadcv3_irq_ack, .irq_ack = rk_tsadcv3_irq_ack,
.control = rk_tsadcv2_control, .control = rk_tsadcv3_control,
.get_temp = rk_tsadcv2_get_temp, .get_temp = rk_tsadcv2_get_temp,
.set_tshut_temp = rk_tsadcv2_tshut_temp, .set_tshut_temp = rk_tsadcv2_tshut_temp,
.set_tshut_mode = rk_tsadcv2_tshut_mode, .set_tshut_mode = rk_tsadcv2_tshut_mode,
@ -619,7 +647,7 @@ static const struct rockchip_tsadc_chip rk3399_tsadc_data = {
.id = rk3399_code_table, .id = rk3399_code_table,
.length = ARRAY_SIZE(rk3399_code_table), .length = ARRAY_SIZE(rk3399_code_table),
.data_mask = TSADCV3_DATA_MASK, .data_mask = TSADCV3_DATA_MASK,
.mode = ADC_DECREMENT, .mode = ADC_INCREMENT,
}, },
}; };