Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1366135
| From | Wei Ni <wni@nvidia.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH V9 RESEND 10/14] thermal: tegra: handle clocks in one function |
| Date | 2016-03-29 12:40 +0200 |
| Message-ID | <rhZe3-4MC-41@gated-at.bofh.it> (permalink) |
| References | <rhZ4m-4HB-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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>
---
drivers/thermal/tegra/soctherm.c | 51 ++++++++++++++++++++++++++++------------
1 file changed, 36 insertions(+), 15 deletions(-)
diff --git a/drivers/thermal/tegra/soctherm.c b/drivers/thermal/tegra/soctherm.c
index 365b45213327..deeb3b7e4dac 100644
--- a/drivers/thermal/tegra/soctherm.c
+++ b/drivers/thermal/tegra/soctherm.c
@@ -428,6 +428,39 @@ static void soctherm_debug_init(struct platform_device *pdev)
static inline void soctherm_debug_init(struct platform_device *pdev) {}
#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[] = {
#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);
}
- reset_control_assert(tegra->reset);
-
- err = clk_prepare_enable(tegra->clock_soctherm);
+ err = soctherm_clk_enable(pdev, true);
if (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 */
tegra->calib = devm_kzalloc(&pdev->dev,
@@ -579,8 +602,7 @@ static int tegra_soctherm_probe(struct platform_device *pdev)
return 0;
disable_clocks:
- clk_disable_unprepare(tegra->clock_tsensor);
- clk_disable_unprepare(tegra->clock_soctherm);
+ soctherm_clk_enable(pdev, false);
return err;
}
@@ -591,8 +613,7 @@ static int tegra_soctherm_remove(struct platform_device *pdev)
debugfs_remove_recursive(tegra->debugfs_dir);
- clk_disable_unprepare(tegra->clock_tsensor);
- clk_disable_unprepare(tegra->clock_soctherm);
+ soctherm_clk_enable(pdev, false);
return 0;
}
--
1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH V9 RESEND 00/14] Add T210 support in Tegra soctherm Wei Ni <wni@nvidia.com> - 2016-03-29 12:30 +0200
[PATCH V9 RESEND 06/14] thermal: tegra: add a debugfs to show registers Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
Re: [PATCH V9 RESEND 00/14] Add T210 support in Tegra soctherm Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
Re: [PATCH V9 RESEND 00/14] Add T210 support in Tegra soctherm Eduardo Valentin <edubezval@gmail.com> - 2016-03-29 17:20 +0200
[PATCH V9 RESEND 03/14] thermal: tegra: get rid of PDIV/HOTSPOT hack Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
[PATCH V9 RESEND 13/14] arm64: tegra: add soctherm node for Tegra210 Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
Re: [PATCH V9 RESEND 13/14] arm64: tegra: add soctherm node for Tegra210 Eduardo Valentin <edubezval@gmail.com> - 2016-03-29 17:20 +0200
Re: [PATCH V9 RESEND 13/14] arm64: tegra: add soctherm node for Tegra210 Wei Ni <wni@nvidia.com> - 2016-03-30 05:30 +0200
Re: [PATCH V9 RESEND 13/14] arm64: tegra: add soctherm node for Tegra210 Wei Ni <wni@nvidia.com> - 2016-03-30 12:30 +0200
Re: [PATCH V9 RESEND 13/14] arm64: tegra: add soctherm node for Tegra210 Wei Ni <wni@nvidia.com> - 2016-04-01 09:10 +0200
[PATCH V9 RESEND 02/14] thermal: tegra: combine sensor group-related data Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
[PATCH V9 RESEND 11/14] thermal: tegra: handle HW initialization in one funcotion Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
[PATCH V9 RESEND 07/14] thermal: of-thermal: allow setting trip_temp on hardware Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
[PATCH V9 RESEND 01/14] thermal: tegra: move tegra thermal files into tegra directory Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
[PATCH V9 RESEND 05/14] thermal: tegra: add Tegra210 specific SOC_THERM driver Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
[PATCH V9 RESEND 09/14] thermal: tegra: add thermtrip function Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
[PATCH V9 RESEND 10/14] thermal: tegra: handle clocks in one function Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
[PATCH V9 RESEND 14/14] arm: tegra: set critical trips for Tegra124 Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
Re: [PATCH V9 RESEND 14/14] arm: tegra: set critical trips for Tegra124 Eduardo Valentin <edubezval@gmail.com> - 2016-03-29 17:20 +0200
Re: [PATCH V9 RESEND 14/14] arm: tegra: set critical trips for Tegra124 Wei Ni <wni@nvidia.com> - 2016-04-01 09:10 +0200
Re: [PATCH V9 RESEND 14/14] arm: tegra: set critical trips for Tegra124 Wei Ni <wni@nvidia.com> - 2016-03-30 12:40 +0200
[PATCH V9 RESEND 12/14] thermal: tegra: add PM support Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
[PATCH V9 RESEND 08/14] of: add notes of critical trips for soctherm Wei Ni <wni@nvidia.com> - 2016-03-29 12:40 +0200
Re: [PATCH V9 RESEND 00/14] Add T210 support in Tegra soctherm Eduardo Valentin <edubezval@gmail.com> - 2016-03-29 17:20 +0200
csiph-web