summaryrefslogtreecommitdiff
path: root/arch/arm/imx-common
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2015-05-04 17:48:07 +0800
committerMax Krummenacher <max.krummenacher@toradex.com>2016-03-09 14:42:29 +0100
commit59299b30b670acca74b0a1c3a0889b4fe54617fa (patch)
tree1ef965d14094d81a6f4fb3b8bfe6725cf8a13337 /arch/arm/imx-common
parent0a36bb6fc95536cd48d7ed189412b1f69474e6af (diff)
MLK-10808-5 imx: mx6ul: Update soc relevant settings
Remove PCIe, xPU power, PL310 L2 Cache for MX6UL. Update FEC MAC address, WDOG settings, USDHC clock rate. Signed-off-by: Ye.Li <B37916@freescale.com>
Diffstat (limited to 'arch/arm/imx-common')
-rw-r--r--arch/arm/imx-common/speed.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/imx-common/speed.c b/arch/arm/imx-common/speed.c
index 26132bf71da..0dd1a4b3618 100644
--- a/arch/arm/imx-common/speed.c
+++ b/arch/arm/imx-common/speed.c
@@ -2,7 +2,7 @@
* (C) Copyright 2000-2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
- * Copyright (C) 2004-2007 Freescale Semiconductor, Inc.
+ * Copyright (C) 2004-2015 Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
*
* SPDX-License-Identifier: GPL-2.0+
@@ -22,10 +22,12 @@ int get_clocks(void)
#ifdef CONFIG_FSL_USDHC
#if CONFIG_SYS_FSL_ESDHC_ADDR == USDHC2_BASE_ADDR
gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK);
+#ifndef CONFIG_MX6UL
#elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC3_BASE_ADDR
gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
#elif CONFIG_SYS_FSL_ESDHC_ADDR == USDHC4_BASE_ADDR
gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
+#endif
#else
gd->arch.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
#endif