From: Eric Nelson <eric.nelson@boundarydevices.com>
Date: Tue, 19 Feb 2013 10:07:02 +0000 (+0000)
Subject: i.MX6: crm_regs: define CCM_CCGRx for use in board config files
X-Git-Tag: v2013.04-rc2~24^2~1^2~28
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4f60c49a70a1201c2365651dc5dcb76503b58cf3;p=u-boot

i.MX6: crm_regs: define CCM_CCGRx for use in board config files

Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
---

diff --git a/arch/arm/include/asm/arch-mx6/crm_regs.h b/arch/arm/include/asm/arch-mx6/crm_regs.h
index d670f30c02..76764571a7 100644
--- a/arch/arm/include/asm/arch-mx6/crm_regs.h
+++ b/arch/arm/include/asm/arch-mx6/crm_regs.h
@@ -20,6 +20,17 @@
 #ifndef __ARCH_ARM_MACH_MX6_CCM_REGS_H__
 #define __ARCH_ARM_MACH_MX6_CCM_REGS_H__
 
+#define CCM_CCGR0		0x020C4068
+#define CCM_CCGR1		0x020C406c
+#define CCM_CCGR2		0x020C4070
+#define CCM_CCGR3		0x020C4074
+#define CCM_CCGR4		0x020C4078
+#define CCM_CCGR5		0x020C407c
+#define CCM_CCGR6		0x020C4080
+
+#define PMU_MISC2		0x020C8170
+
+#ifndef __ASSEMBLY__
 struct mxc_ccm_reg {
 	u32 ccr;	/* 0x0000 */
 	u32 ccdr;
@@ -105,6 +116,7 @@ struct mxc_ccm_reg {
 	u32 analog_pfd_528_clr;
 	u32 analog_pfd_528_tog;
 };
+#endif
 
 /* Define the bits in register CCR */
 #define MXC_CCM_CCR_RBC_EN				(1 << 27)