From 31cfefaa3f06ab60ac84eda7a83da1c4a727b11e Mon Sep 17 00:00:00 2001 From: David Wu Date: Fri, 27 Mar 2015 15:02:47 +0800 Subject: [PATCH] rk3368: efuse: change efuse get temp func Signed-off-by: David Wu --- arch/arm/mach-rockchip/efuse.c | 2 +- arch/arm/mach-rockchip/efuse.h | 2 +- drivers/thermal/rockchip_thermal.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rockchip/efuse.c b/arch/arm/mach-rockchip/efuse.c index f48b1c2e677c..35fb4dec0cae 100644 --- a/arch/arm/mach-rockchip/efuse.c +++ b/arch/arm/mach-rockchip/efuse.c @@ -314,7 +314,7 @@ int rockchip_get_leakage(int ch) } return 0; } -int rockchip_get_temp(int ch) +int rockchip_efuse_get_temp(int ch) { int ret = 0; int temp = 0; diff --git a/arch/arm/mach-rockchip/efuse.h b/arch/arm/mach-rockchip/efuse.h index 3480ddbc28ea..01c894c6a9b0 100644 --- a/arch/arm/mach-rockchip/efuse.h +++ b/arch/arm/mach-rockchip/efuse.h @@ -28,5 +28,5 @@ int rockchip_efuse_version(void); int rockchip_process_version(void); int rockchip_get_leakage(int ch); -int rockchip_get_temp(int ch); +int rockchip_efuse_get_temp(int ch); #endif diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c index 15e15255430a..7ee48169cafa 100755 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -1041,7 +1041,7 @@ static int rockchip_thermal_probe(struct platform_device *pdev) error); goto err_disable_pclk; } - thermal->cpu_temp_adjust = rockchip_get_temp(0); + thermal->cpu_temp_adjust = rockchip_efuse_get_temp(0); if (thermal->chip->mode == TSADC_AUTO_MODE) { thermal->chip->initialize(thermal->regs, thermal->tshut_polarity); -- 2.34.1