rk3368: efuse: change efuse get temp func

Signed-off-by: David Wu <wdc@rock-chips.com>

diff --git a/arch/arm/mach-rockchip/efuse.c b/arch/arm/mach-rockchip/efuse.c
index f48b1c2e677c3db706057675c071e39a66a2791a..35fb4dec0caebf4c42a29e7223c71fc8ec875d30 100644 (file)
--- 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 3480ddbc28eadc122826b9b79b9e0cf839bf1b87..01c894c6a9b0b8eb5e62c5765a2550af088f1d9c 100644 (file)
--- 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 15e15255430a519496d5f4e8d07a4255a50a1838..7ee48169cafacee32e4076d1c40dce7465424690 100755 (executable)
--- 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);