All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wei Ni <wni@nvidia.com>
To: edubezval@gmail.com, rui.zhang@intel.com, thierry.reding@gmail.com
Cc: MLongnecker@nvidia.com, swarren@wwwdotorg.org,
	mikko.perttunen@kapsi.fi, linux-tegra@vger.kernel.org,
	linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
	Wei Ni <wni@nvidia.com>
Subject: [PATCH V9 RESEND 10/14] thermal: tegra: handle clocks in one function
Date: Tue, 29 Mar 2016 18:29:20 +0800	[thread overview]
Message-ID: <1459247364-1139-11-git-send-email-wni@nvidia.com> (raw)
In-Reply-To: <1459247364-1139-1-git-send-email-wni@nvidia.com>

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


WARNING: multiple messages have this Message-ID (diff)
From: Wei Ni <wni@nvidia.com>
To: <edubezval@gmail.com>, <rui.zhang@intel.com>, <thierry.reding@gmail.com>
Cc: <MLongnecker@nvidia.com>, <swarren@wwwdotorg.org>,
	<mikko.perttunen@kapsi.fi>, <linux-tegra@vger.kernel.org>,
	<linux-pm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	Wei Ni <wni@nvidia.com>
Subject: [PATCH V9 RESEND 10/14] thermal: tegra: handle clocks in one function
Date: Tue, 29 Mar 2016 18:29:20 +0800	[thread overview]
Message-ID: <1459247364-1139-11-git-send-email-wni@nvidia.com> (raw)
In-Reply-To: <1459247364-1139-1-git-send-email-wni@nvidia.com>

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

  parent reply	other threads:[~2016-03-29 10:29 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-29 10:29 [PATCH V9 RESEND 00/14] Add T210 support in Tegra soctherm Wei Ni
2016-03-29 10:29 ` Wei Ni
2016-03-29 10:29 ` [PATCH V9 RESEND 02/14] thermal: tegra: combine sensor group-related data Wei Ni
2016-03-29 10:29   ` Wei Ni
2016-03-29 10:29 ` [PATCH V9 RESEND 03/14] thermal: tegra: get rid of PDIV/HOTSPOT hack Wei Ni
2016-03-29 10:29   ` Wei Ni
2016-03-29 10:29 ` [PATCH V9 RESEND 04/14] thermal: tegra: split tegra_soctherm driver Wei Ni
2016-03-29 10:29   ` Wei Ni
2016-03-29 10:29 ` [PATCH V9 RESEND 05/14] thermal: tegra: add Tegra210 specific SOC_THERM driver Wei Ni
2016-03-29 10:29   ` Wei Ni
2016-03-29 10:29 ` [PATCH V9 RESEND 08/14] of: add notes of critical trips for soctherm Wei Ni
2016-03-29 10:29   ` Wei Ni
2016-03-29 10:29 ` [PATCH V9 RESEND 09/14] thermal: tegra: add thermtrip function Wei Ni
2016-03-29 10:29   ` Wei Ni
2016-03-29 10:29 ` Wei Ni [this message]
2016-03-29 10:29   ` [PATCH V9 RESEND 10/14] thermal: tegra: handle clocks in one function Wei Ni
2016-03-29 10:29 ` [PATCH V9 RESEND 12/14] thermal: tegra: add PM support Wei Ni
2016-03-29 10:29   ` Wei Ni
2016-03-29 10:29 ` [PATCH V9 RESEND 14/14] arm: tegra: set critical trips for Tegra124 Wei Ni
2016-03-29 10:29   ` Wei Ni
2016-03-29 15:17   ` Eduardo Valentin
     [not found]     ` <20160329151705.GC1855-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2016-04-01  7:04       ` Wei Ni
2016-04-01  7:04         ` Wei Ni
2016-04-12  8:53         ` Wei Ni
2016-04-12  8:53           ` Wei Ni
2016-03-30 10:30   ` Wei Ni
2016-03-30 10:30     ` Wei Ni
2016-03-29 10:36 ` [PATCH V9 RESEND 00/14] Add T210 support in Tegra soctherm Wei Ni
2016-03-29 10:36   ` Wei Ni
2016-03-29 15:13   ` Eduardo Valentin
     [not found] ` <1459247364-1139-1-git-send-email-wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2016-03-29 10:29   ` [PATCH V9 RESEND 01/14] thermal: tegra: move tegra thermal files into tegra directory Wei Ni
2016-03-29 10:29     ` Wei Ni
2016-03-29 10:29   ` [PATCH V9 RESEND 06/14] thermal: tegra: add a debugfs to show registers Wei Ni
2016-03-29 10:29     ` Wei Ni
2016-03-29 10:29   ` [PATCH V9 RESEND 07/14] thermal: of-thermal: allow setting trip_temp on hardware Wei Ni
2016-03-29 10:29     ` Wei Ni
2016-03-29 10:29   ` [PATCH V9 RESEND 11/14] thermal: tegra: handle HW initialization in one funcotion Wei Ni
2016-03-29 10:29     ` Wei Ni
2016-03-29 10:29   ` [PATCH V9 RESEND 13/14] arm64: tegra: add soctherm node for Tegra210 Wei Ni
2016-03-29 10:29     ` Wei Ni
     [not found]     ` <1459247364-1139-14-git-send-email-wni-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2016-03-29 15:16       ` Eduardo Valentin
2016-03-29 15:16         ` Eduardo Valentin
2016-03-30  3:24         ` Wei Ni
2016-03-30  3:24           ` Wei Ni
     [not found]           ` <56FB4703.7020201-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2016-03-30 10:28             ` Wei Ni
2016-03-30 10:28               ` Wei Ni
2016-04-01  7:01         ` Wei Ni
2016-04-01  7:01           ` Wei Ni
2016-04-12  8:53           ` Wei Ni
2016-04-12  8:53             ` Wei Ni
     [not found]             ` <570CB781.8040208-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2016-04-26  3:36               ` Wei Ni
2016-04-26  3:36                 ` Wei Ni
2016-05-03  9:29                 ` Wei Ni
2016-05-03  9:29                   ` Wei Ni
2016-03-29 15:18   ` [PATCH V9 RESEND 00/14] Add T210 support in Tegra soctherm Eduardo Valentin
2016-03-29 15:18     ` Eduardo Valentin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459247364-1139-11-git-send-email-wni@nvidia.com \
    --to=wni@nvidia.com \
    --cc=MLongnecker@nvidia.com \
    --cc=edubezval@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=mikko.perttunen@kapsi.fi \
    --cc=rui.zhang@intel.com \
    --cc=swarren@wwwdotorg.org \
    --cc=thierry.reding@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.