All of lore.kernel.org
 help / color / mirror / Atom feed
From: takasi-y@ops.dti.ne.jp
To: SH-Linux <linux-sh@vger.kernel.org>
Cc: Magnus Damm <magnus.damm@gmail.com>,
	ben.dooks@codethink.co.uk,
	Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>,
	devicetree@vger.kernel.org, linux-serial@vger.kernel.org,
	Simon Horman <horms@verge.net.au>,
	Paul Mundt <lethal@linux-sh.org>,
	Mike Turquette <mturquette@linaro.org>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 1/6] clocksource: em_sti: convert to clk_prepare/unprepare
Date: Tue, 24 Sep 2013 04:09:24 +0000	[thread overview]
Message-ID: <20130924130924.61d4ecedf3d4fca5952d55fc@ops.dti.ne.jp> (raw)
In-Reply-To: <52410F86.4040301@renesas.com>

From: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>

Add calls to clk_prepare and unprepare so that EMMA Mobile EV2 can
migrate to the common clock framework.

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
---
 drivers/clocksource/em_sti.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c
index 3a5909c..9d17083 100644
--- a/drivers/clocksource/em_sti.c
+++ b/drivers/clocksource/em_sti.c
@@ -78,7 +78,7 @@ static int em_sti_enable(struct em_sti_priv *p)
 	int ret;
 
 	/* enable clock */
-	ret = clk_enable(p->clk);
+	ret = clk_prepare_enable(p->clk);
 	if (ret) {
 		dev_err(&p->pdev->dev, "cannot enable clock\n");
 		return ret;
@@ -107,7 +107,7 @@ static void em_sti_disable(struct em_sti_priv *p)
 	em_sti_write(p, STI_INTENCLR, 3);
 
 	/* stop clock */
-	clk_disable(p->clk);
+	clk_disable_unprepare(p->clk);
 }
 
 static cycle_t em_sti_count(struct em_sti_priv *p)
-- 
1.8.1.5


WARNING: multiple messages have this Message-ID (diff)
From: takasi-y@ops.dti.ne.jp
To: SH-Linux <linux-sh@vger.kernel.org>
Cc: Magnus Damm <magnus.damm@gmail.com>,
	ben.dooks@codethink.co.uk,
	Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>,
	devicetree@vger.kernel.org, linux-serial@vger.kernel.org,
	Simon Horman <horms@verge.net.au>,
	Paul Mundt <lethal@linux-sh.org>,
	Mike Turquette <mturquette@linaro.org>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 1/6] clocksource: em_sti: convert to clk_prepare/unprepare
Date: Tue, 24 Sep 2013 13:09:24 +0900	[thread overview]
Message-ID: <20130924130924.61d4ecedf3d4fca5952d55fc@ops.dti.ne.jp> (raw)
In-Reply-To: <52410F86.4040301@renesas.com>

From: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>

Add calls to clk_prepare and unprepare so that EMMA Mobile EV2 can
migrate to the common clock framework.

Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com>
---
 drivers/clocksource/em_sti.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c
index 3a5909c..9d17083 100644
--- a/drivers/clocksource/em_sti.c
+++ b/drivers/clocksource/em_sti.c
@@ -78,7 +78,7 @@ static int em_sti_enable(struct em_sti_priv *p)
 	int ret;
 
 	/* enable clock */
-	ret = clk_enable(p->clk);
+	ret = clk_prepare_enable(p->clk);
 	if (ret) {
 		dev_err(&p->pdev->dev, "cannot enable clock\n");
 		return ret;
@@ -107,7 +107,7 @@ static void em_sti_disable(struct em_sti_priv *p)
 	em_sti_write(p, STI_INTENCLR, 3);
 
 	/* stop clock */
-	clk_disable(p->clk);
+	clk_disable_unprepare(p->clk);
 }
 
 static cycle_t em_sti_count(struct em_sti_priv *p)
-- 
1.8.1.5


  reply	other threads:[~2013-09-24  4:09 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-24  4:05 [PATCH 0/6] ARM: shmobile: kzm9d-reference: migrate to common clock framework with DT Takashi Yoshii
2013-09-24  4:05 ` Takashi Yoshii
2013-09-24  4:09 ` takasi-y [this message]
2013-09-24  4:09   ` [PATCH 1/6] clocksource: em_sti: convert to clk_prepare/unprepare takasi-y
2013-09-24  4:42   ` Simon Horman
2013-09-24  4:42     ` Simon Horman
2013-09-26 10:18     ` Daniel Lezcano
2013-09-26 10:18       ` Daniel Lezcano
     [not found]   ` <20130924130924.61d4ecedf3d4fca5952d55fc-nDL5PR/MsHhHfZP73Gtkiw@public.gmane.org>
2013-09-30 15:25     ` Laurent Pinchart
2013-09-30 15:25       ` Laurent Pinchart
2013-09-30 15:25       ` Laurent Pinchart
     [not found]       ` <52440A07.4050101-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2013-10-03  2:30         ` Simon Horman
2013-10-03  2:30           ` Simon Horman
2013-10-03  2:30           ` Simon Horman
2013-10-01  9:05     ` Magnus Damm
2013-10-01  9:05       ` Magnus Damm
2013-10-01  9:05       ` Magnus Damm
2013-09-24  4:10 ` [PATCH 2/6] serial8250-em: " takasi-y
2013-09-24  4:10   ` takasi-y
2013-09-24  4:44   ` Simon Horman
2013-09-24  4:44     ` Simon Horman
2013-09-24 13:41     ` Greg Kroah-Hartman
2013-09-24 13:41       ` Greg Kroah-Hartman
2013-09-30 15:25   ` Laurent Pinchart
2013-09-30 15:25     ` Laurent Pinchart
     [not found]     ` <20130924134113.GA7246-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2013-10-03  2:30       ` Simon Horman
2013-10-03  2:30         ` Simon Horman
2013-10-03  2:30         ` Simon Horman
     [not found]   ` <20130924131039.3c871cad7acb2a068a988d0f-nDL5PR/MsHhHfZP73Gtkiw@public.gmane.org>
2013-10-01  9:07     ` Magnus Damm
2013-10-01  9:07       ` Magnus Damm
2013-10-01  9:07       ` Magnus Damm
2013-09-24  4:12 ` [PATCH 3/6] sh: clkfwk: Select sh-/common- clkfwk alternatively takasi-y
2013-09-24  4:12   ` takasi-y
2013-09-30 18:40   ` Laurent Pinchart
2013-09-30 18:40     ` Laurent Pinchart
2013-10-04  5:25     ` takasi-y
2013-10-04  5:25       ` takasi-y-nDL5PR/MsHhHfZP73Gtkiw
2013-10-04  5:25       ` takasi-y
2013-10-01  9:30   ` Magnus Damm
2013-10-01  9:30     ` Magnus Damm
2013-09-24  4:13 ` [PATCH 4/6] ARM: shmobile: emev2: Define SMU clock DT bindings takasi-y
2013-09-24  4:13   ` takasi-y
     [not found]   ` <20130924131331.0e9a5f830f531655b2ea0ebe-nDL5PR/MsHhHfZP73Gtkiw@public.gmane.org>
2013-09-24  4:52     ` Simon Horman
2013-09-24  4:52       ` Simon Horman
2013-09-24  4:52       ` Simon Horman
2013-09-24  9:00       ` takashi.yoshii.zj
2013-09-24  9:00         ` takashi.yoshii.zj
     [not found]       ` <20130924045215.GE3619-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>
2013-10-01 11:36         ` Laurent Pinchart
2013-10-01 11:36           ` Laurent Pinchart
2013-10-01 11:36           ` Laurent Pinchart
2013-10-02  1:28           ` Simon Horman
2013-10-02  1:28             ` Simon Horman
2013-10-06 17:16           ` Takashi YOSHII
2013-10-06 17:16             ` Takashi YOSHII
2013-10-06 17:16             ` Takashi YOSHII
2013-09-24  4:56 ` [PATCH 0/6] ARM: shmobile: kzm9d-reference: migrate to common clock framework with DT Simon Horman
2013-09-24  4:56   ` Simon Horman
     [not found] ` <52410F86.4040301-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2013-09-24  4:15   ` [PATCH 5/6] clk: emev2: Add support for emev2 SMU clocks " takasi-y
2013-09-24  4:15     ` takasi-y-nDL5PR/MsHhHfZP73Gtkiw
2013-09-24  4:15     ` takasi-y
     [not found]     ` <20130924131542.f865fad4dec98e024c0d4676-nDL5PR/MsHhHfZP73Gtkiw@public.gmane.org>
2013-10-01  9:15       ` Magnus Damm
2013-10-01  9:15         ` Magnus Damm
2013-10-01  9:15         ` Magnus Damm
2013-10-01 12:27         ` Laurent Pinchart
2013-10-01 12:27           ` Laurent Pinchart
2013-10-01 12:27           ` Laurent Pinchart
     [not found]         ` <CANqRtoRD35Ei31PK8a_TOp=2uiYPCoaJuDb6tyZtQL8s0PavNw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-10-04  5:44           ` takasi-y
2013-10-04  5:44             ` takasi-y-nDL5PR/MsHhHfZP73Gtkiw
2013-10-04  5:44             ` takasi-y
2013-09-24  4:17   ` [PATCH 6/6] ARM: shmobile: kzm9d-reference: Use common clock framework takasi-y
2013-09-24  4:17     ` takasi-y-nDL5PR/MsHhHfZP73Gtkiw
2013-09-24  4:17     ` takasi-y
2013-09-24  4:55     ` Simon Horman
2013-09-24  4:55       ` Simon Horman
2013-10-01  9:23     ` Magnus Damm
2013-10-01  9:23       ` Magnus Damm
2013-09-25  7:17   ` [PATCH 0/6] ARM: shmobile: kzm9d-reference: migrate to common clock framework with DT Kuninori Morimoto
2013-09-25  7:17     ` Kuninori Morimoto
2013-09-25  7:17     ` Kuninori Morimoto
     [not found]     ` <87siwtl69z.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2013-10-04  1:12       ` takasi-y
2013-10-04  1:12         ` takasi-y-nDL5PR/MsHhHfZP73Gtkiw
2013-10-04  1:12         ` takasi-y

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=20130924130924.61d4ecedf3d4fca5952d55fc@ops.dti.ne.jp \
    --to=takasi-y@ops.dti.ne.jp \
    --cc=ben.dooks@codethink.co.uk \
    --cc=devicetree@vger.kernel.org \
    --cc=horms@verge.net.au \
    --cc=lethal@linux-sh.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=magnus.damm@gmail.com \
    --cc=mturquette@linaro.org \
    --cc=shinya.kuribayashi.px@renesas.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.