UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'exynos-fix' of .git into next

This commit is contained in:
Zhang Rui 2013-04-25 00:04:06 +08:00
parent 335553ce40 b6cee53c19
commit a502be1873
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/thermal/exynos_thermal.c
View File

@ -854,6 +854,10 @@ static const struct of_device_id exynos_tmu_match[] = {
.compatible = "samsung,exynos4210-tmu", .compatible = "samsung,exynos4210-tmu",
.data = (void *)EXYNOS4210_TMU_DRV_DATA, .data = (void *)EXYNOS4210_TMU_DRV_DATA,
}, },
{
.compatible = "samsung,exynos4412-tmu",
.data = (void *)EXYNOS_TMU_DRV_DATA,
},
{ {
.compatible = "samsung,exynos5250-tmu", .compatible = "samsung,exynos5250-tmu",
.data = (void *)EXYNOS_TMU_DRV_DATA, .data = (void *)EXYNOS_TMU_DRV_DATA,
@ -937,12 +941,16 @@ static int exynos_tmu_probe(struct platform_device *pdev)
return ret; return ret;
} }
data->clk = clk_get(NULL, "tmu_apbif"); data->clk = devm_clk_get(&pdev->dev, "tmu_apbif");
if (IS_ERR(data->clk)) { if (IS_ERR(data->clk)) {
dev_err(&pdev->dev, "Failed to get clock\n"); dev_err(&pdev->dev, "Failed to get clock\n");
return PTR_ERR(data->clk); return PTR_ERR(data->clk);
} }
ret = clk_prepare(data->clk);
if (ret)
return ret;
if (pdata->type == SOC_ARCH_EXYNOS || if (pdata->type == SOC_ARCH_EXYNOS ||
pdata->type == SOC_ARCH_EXYNOS4210) pdata->type == SOC_ARCH_EXYNOS4210)
data->soc = pdata->type; data->soc = pdata->type;
@ -994,7 +1002,7 @@ static int exynos_tmu_probe(struct platform_device *pdev)
return 0; return 0;
err_clk: err_clk:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
clk_put(data->clk); clk_unprepare(data->clk);
return ret; return ret;
} }
@ -1006,7 +1014,7 @@ static int exynos_tmu_remove(struct platform_device *pdev)
exynos_unregister_thermal(); exynos_unregister_thermal();
clk_put(data->clk); clk_unprepare(data->clk);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);