From 1001a0329ee18f6bb11bcf4c3435a8f48eb6adf6 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Thu, 10 Jun 2010 12:14:32 +0300
Subject: [PATCH] --- yaml --- r: 201587 b: refs/heads/master c:
 ac0eb0f3ca3e3fff6ac083ee3a51b98f87d67843 h: refs/heads/master i:   201585:
 7a40b2c5d6a0059ff39639efd914fc4152356376   201583:
 0dfca6c960e8f3ce4dfac99083b05fecfed54d8e v: v3

---
 [refs]                           |  2 +-
 trunk/arch/arm/mach-mx25/clock.c | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 83a77945ee83..1dca2f638c42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd3c46b3062ac1ce0aa532c81922f9a0e28a6454
+refs/heads/master: ac0eb0f3ca3e3fff6ac083ee3a51b98f87d67843
diff --git a/trunk/arch/arm/mach-mx25/clock.c b/trunk/arch/arm/mach-mx25/clock.c
index 74cf27d48bfb..2bb4f1d73cbb 100644
--- a/trunk/arch/arm/mach-mx25/clock.c
+++ b/trunk/arch/arm/mach-mx25/clock.c
@@ -179,6 +179,28 @@ static void clk_cgcr_disable(struct clk *clk)
 		.secondary	= s,			\
 	}
 
+/*
+ * Note: the following IPG clock gating bits are wrongly marked "Reserved" in
+ * the i.MX25 Reference Manual Rev 1, table 15-13. The information below is
+ * taken from the Freescale released BSP.
+ *
+ * bit	reg	offset	clock
+ *
+ * 0	CGCR1	0	AUDMUX
+ * 12	CGCR1	12	ESAI
+ * 16	CGCR1	16	GPIO1
+ * 17	CGCR1	17	GPIO2
+ * 18	CGCR1	18	GPIO3
+ * 23	CGCR1	23	I2C1
+ * 24	CGCR1	24	I2C2
+ * 25	CGCR1	25	I2C3
+ * 27	CGCR1	27	IOMUXC
+ * 28	CGCR1	28	KPP
+ * 30	CGCR1	30	OWIRE
+ * 36	CGCR2	4	RTIC
+ * 51	CGCR2	19	WDOG
+ */
+
 DEFINE_CLOCK(gpt_clk,    0, CCM_CGCR0,  5, get_rate_gpt, NULL, NULL);
 DEFINE_CLOCK(uart_per_clk, 0, CCM_CGCR0, 15, get_rate_uart, NULL, NULL);
 DEFINE_CLOCK(ssi1_per_clk, 0, CCM_CGCR0, 13, get_rate_ipg, NULL, NULL);