linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: shawn.guo@freescale.com (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/10] ARM: mx28: update clocks for dual fec support
Date: Tue, 28 Dec 2010 22:55:51 +0800	[thread overview]
Message-ID: <1293548155-16328-7-git-send-email-shawn.guo@freescale.com> (raw)
In-Reply-To: <1293548155-16328-1-git-send-email-shawn.guo@freescale.com>

* Change fec clock registration to use con_id only for looking up,
  so that dual fec driver can find the same clock for both fec0
  and fec1.

* Explicitly call clk_enable for some clocks that have been on to
  reflect the clock status and get usecount updated. Otherwise,
  clocks could be turned off by pair call of clk_enable/clk_disable
  in drivers, because of the incorrect initial usecount.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
---
 arch/arm/mach-mxs/clock-mx28.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c
index dd6d158..6b77aff 100644
--- a/arch/arm/mach-mxs/clock-mx28.c
+++ b/arch/arm/mach-mxs/clock-mx28.c
@@ -603,7 +603,7 @@ _DEFINE_CLOCK(fec_clk, ENET, DISABLE, &hbus_clk);
 
 static struct clk_lookup lookups[] = {
 	_REGISTER_CLOCK("uart", NULL, uart_clk)
-	_REGISTER_CLOCK("fec.0", NULL, fec_clk)
+	_REGISTER_CLOCK(NULL, "fec_clk", fec_clk)
 	_REGISTER_CLOCK("rtc", NULL, rtc_clk)
 	_REGISTER_CLOCK("pll2", NULL, pll2_clk)
 	_REGISTER_CLOCK(NULL, "hclk", hbus_clk)
@@ -726,6 +726,11 @@ int __init mx28_clocks_init(void)
 {
 	clk_misc_init();
 
+	clk_enable(&cpu_clk);
+	clk_enable(&hbus_clk);
+	clk_enable(&emi_clk);
+	clk_enable(&uart_clk);
+
 	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
 
 	mxs_timer_init(&clk32k_clk, MX28_INT_TIMER0);
-- 
1.7.1

  parent reply	other threads:[~2010-12-28 14:55 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-28 14:55 [PATCH 00/10] net/fec: add dual fec support for i.MX28 Shawn Guo
2010-12-28 14:55 ` [PATCH 01/10] net/fec: fix MMFR_OP type in fec_enet_mdio_write Shawn Guo
2010-12-28 14:55 ` [PATCH 02/10] net/fec: remove the use of "index" which is legacy Shawn Guo
2010-12-28 14:55 ` [PATCH 03/10] net/fec: add mac field into platform data and consolidate fec_get_mac Shawn Guo
2010-12-29  5:29   ` Greg Ungerer
2010-12-29  9:51     ` Shawn Guo
2010-12-29  6:53   ` Baruch Siach
2010-12-29 10:05     ` Shawn Guo
2010-12-29 10:31       ` Uwe Kleine-König
2010-12-29 11:58         ` Shawn Guo
2010-12-29 12:42           ` Uwe Kleine-König
2010-12-30  2:12             ` Shawn Guo
2010-12-30  8:04               ` Uwe Kleine-König
2010-12-30  4:29       ` Shawn Guo
2010-12-30  5:29         ` Baruch Siach
2010-12-30  7:20           ` Shawn Guo
2010-12-29 10:30     ` Shawn Guo
2010-12-29 10:37       ` Uwe Kleine-König
2010-12-29 11:08         ` Shawn Guo
2010-12-29 11:10           ` Uwe Kleine-König
2010-12-29 12:00             ` Shawn Guo
2010-12-28 14:55 ` [PATCH 04/10] net/fec: improve pm for better suspend/resume Shawn Guo
2010-12-28 14:55 ` [PATCH 05/10] net/fec: add dual fec support for mx28 Shawn Guo
2010-12-28 14:55 ` Shawn Guo [this message]
2010-12-29  6:57   ` [PATCH 06/10] ARM: mx28: update clocks for dual fec support Baruch Siach
2010-12-29  8:10     ` Uwe Kleine-König
2010-12-29 10:14       ` Shawn Guo
2010-12-29 10:28         ` Uwe Kleine-König
2010-12-28 14:55 ` [PATCH 07/10] ARM: mx28: add the second fec device registration Shawn Guo
2010-12-29 10:50   ` Uwe Kleine-König
2010-12-29 12:05     ` Shawn Guo
2010-12-28 14:55 ` [PATCH 08/10] ARM: mxs: add ocotp read function Shawn Guo
2010-12-29 10:47   ` Uwe Kleine-König
2010-12-29 12:08     ` Shawn Guo
2010-12-29 13:47       ` Uwe Kleine-König
2010-12-29 11:22   ` Uwe Kleine-König
2010-12-30  5:50     ` Shawn Guo
2010-12-30  9:15       ` Uwe Kleine-König
2010-12-31  1:43         ` Shawn Guo
2010-12-31 16:11           ` Uwe Kleine-König
2011-01-01 13:03             ` Shawn Guo
2010-12-30  8:41     ` Shawn Guo
2010-12-30  9:02       ` Uwe Kleine-König
2010-12-31  1:46         ` Shawn Guo
2010-12-28 14:55 ` [PATCH 09/10] ARM: mx28: read fec mac address from ocotp Shawn Guo
2010-12-29 10:53   ` Uwe Kleine-König
2010-12-29 12:13     ` Shawn Guo
2010-12-29 12:45       ` Uwe Kleine-König
2010-12-30  2:19         ` Shawn Guo
2010-12-30  8:33         ` Shawn Guo
2010-12-28 14:55 ` [PATCH 10/10] ARM: mxs: add initial pm support Shawn Guo
2010-12-29 10:57   ` Uwe Kleine-König
2010-12-29 12:15     ` Shawn Guo
2010-12-30  8:50     ` Shawn Guo
2010-12-29  5:26 ` [PATCH 00/10] net/fec: add dual fec support for i.MX28 Greg Ungerer

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=1293548155-16328-7-git-send-email-shawn.guo@freescale.com \
    --to=shawn.guo@freescale.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).