summaryrefslogtreecommitdiff
path: root/cpu/arm_cortexa8
diff options
context:
space:
mode:
authorAllen Xu <allen.xu@freescale.com>2011-11-03 11:15:48 +0800
committerAllen Xu <allen.xu@freescale.com>2011-11-03 11:29:26 +0800
commit13b7fad6b3fc8034738543f5946378239aae440f (patch)
tree12e3d8a4c7462ac6d38c22cb9261c512b748b2bc /cpu/arm_cortexa8
parent01a080fe6c11de531f79d0a05d7a06dac1708e41 (diff)
downloadu-boot-imx-13b7fad6b3fc8034738543f5946378239aae440f.zip
u-boot-imx-13b7fad6b3fc8034738543f5946378239aae440f.tar.gz
u-boot-imx-13b7fad6b3fc8034738543f5946378239aae440f.tar.bz2
ENGR00161254 MX6Q: Add NAND support in Uboot
Add iomux and clock setting in Uboot code to support NAND, due to the conflict between NAND and SD, NAND function is not enabled in default configuration. Signed-off-by: Allen Xu <allen.xu@freescale.com>
Diffstat (limited to 'cpu/arm_cortexa8')
-rw-r--r--cpu/arm_cortexa8/mx6/generic.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu/arm_cortexa8/mx6/generic.c b/cpu/arm_cortexa8/mx6/generic.c
index 11fac50..3ffc420 100644
--- a/cpu/arm_cortexa8/mx6/generic.c
+++ b/cpu/arm_cortexa8/mx6/generic.c
@@ -280,7 +280,7 @@ static u32 __get_nfc_clk(void)
break;
}
- return clkroot / pred / podf;
+ return clkroot / (pred+1) / (podf+1);
}
static u32 __get_ddr_clk(void)
@@ -390,6 +390,8 @@ unsigned int mxc_get_clock(enum mxc_clock clk)
case MXC_SATA_CLK:
return __get_ahb_clk();
case MXC_NFC_CLK:
+ case MXC_GPMI_CLK:
+ case MXC_BCH_CLK:
return __get_nfc_clk();
default:
break;