iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thermal: tegra: handle clocks in one function

Browse Source 
Handle clock enable/disable codes in one function
soctherm_clk_enable(), so that the codes are more clear.

Signed-off-by: Wei Ni <wni@nvidia.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Wei Ni 2016-03-29 18:29:20 +08:00 committed by Eduardo Valentin
parent 2a895871f2
commit 8de2ab0235
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/thermal/tegra/soctherm.c
View File

@ -428,6 +428,39 @@ static void soctherm_debug_init(struct platform_device *pdev)
static inline void soctherm_debug_init(struct platform_device *pdev) {} static inline void soctherm_debug_init(struct platform_device *pdev) {}
#endif #endif
static int soctherm_clk_enable(struct platform_device *pdev, bool enable)
{
struct tegra_soctherm *tegra = platform_get_drvdata(pdev);
int err;
if (!tegra->clock_soctherm || !tegra->clock_tsensor)
return -EINVAL;
reset_control_assert(tegra->reset);
if (enable) {
err = clk_prepare_enable(tegra->clock_soctherm);
if (err) {
reset_control_deassert(tegra->reset);
return err;
}
err = clk_prepare_enable(tegra->clock_tsensor);
if (err) {
clk_disable_unprepare(tegra->clock_soctherm);
reset_control_deassert(tegra->reset);
return err;
}
} else {
clk_disable_unprepare(tegra->clock_tsensor);
clk_disable_unprepare(tegra->clock_soctherm);
}
reset_control_deassert(tegra->reset);
return 0;
}
static const struct of_device_id tegra_soctherm_of_match[] = { static const struct of_device_id tegra_soctherm_of_match[] = {
#ifdef CONFIG_ARCH_TEGRA_124_SOC #ifdef CONFIG_ARCH_TEGRA_124_SOC
{ {
@ -496,20 +529,10 @@ static int tegra_soctherm_probe(struct platform_device *pdev)
return PTR_ERR(tegra->clock_soctherm); return PTR_ERR(tegra->clock_soctherm);
} }
reset_control_assert(tegra->reset); err = soctherm_clk_enable(pdev, true);
err = clk_prepare_enable(tegra->clock_soctherm);
if (err) if (err)
return err; return err;
err = clk_prepare_enable(tegra->clock_tsensor);
if (err) {
clk_disable_unprepare(tegra->clock_soctherm);
return err;
}
reset_control_deassert(tegra->reset);
/* Initialize raw sensors */ /* Initialize raw sensors */
tegra->calib = devm_kzalloc(&pdev->dev, tegra->calib = devm_kzalloc(&pdev->dev,
@ -579,8 +602,7 @@ static int tegra_soctherm_probe(struct platform_device *pdev)
return 0; return 0;
disable_clocks: disable_clocks:
clk_disable_unprepare(tegra->clock_tsensor); soctherm_clk_enable(pdev, false);
clk_disable_unprepare(tegra->clock_soctherm);
return err; return err;
} }
@ -591,8 +613,7 @@ static int tegra_soctherm_remove(struct platform_device *pdev)
debugfs_remove_recursive(tegra->debugfs_dir); debugfs_remove_recursive(tegra->debugfs_dir);
clk_disable_unprepare(tegra->clock_tsensor); soctherm_clk_enable(pdev, false);
clk_disable_unprepare(tegra->clock_soctherm);
return 0; return 0;
} }