Prev: Dell activity led WMI driver
Next: [patch 0/7] per-bdi flushing model improvements. reiser4
From: Stephen Rothwell on 1 Feb 2010 19:10
Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-mx25/clock.c between commit
828df43f139c7fbf0d505c7b9a666d321a0f2c25 ("mx25: properly initialize
clocks") from the arm-current tree and commit
dd84ce18c8f522d26aef6e9e9c05c32485b667a7 ("ARM: Consolidate clks_register
() and similar") from the arm tree.

I fixed it up (see below) and can carry the fix for a while.
--
Cheers,
Stephen Rothwell sfr(a)canb.auug.org.au

diff --cc arch/arm/mach-mx25/clock.c
index 6acc88b,66916f1..0000000
--- a/arch/arm/mach-mx25/clock.c
+++ b/arch/arm/mach-mx25/clock.c
@@@ -216,21 -208,9 +216,18 @@@ static struct clk_lookup lookups[] =
_REGISTER_CLOCK("fec.0", NULL, fec_clk)
};

-int __init mx25_clocks_init(unsigned long fref)
+int __init mx25_clocks_init(void)
{
- int i;
-
- for (i = 0; i < ARRAY_SIZE(lookups); i++)
- clkdev_add(&lookups[i]);
+ clkdev_add_table(lookups, ARRAY_SIZE(lookups));
+
+ /* Turn off all clocks except the ones we need to survive, namely:
+ * EMI, GPIO1-3 (CCM_CGCR1[18:16]), GPT1, IOMUXC (CCM_CGCR1[27]), IIM,
+ * SCC
+ */
+ __raw_writel((1 << 19), CRM_BASE + CCM_CGCR0);
+ __raw_writel((0xf << 16) | (3 << 26), CRM_BASE + CCM_CGCR1);
+ __raw_writel((1 << 5), CRM_BASE + CCM_CGCR2);
+
mxc_timer_init(&gpt_clk, MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), 54);

return 0;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: Dell activity led WMI driver
Next: [patch 0/7] per-bdi flushing model improvements. reiser4