summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoît Thébaudeau <benoit.thebaudeau@advansee.com>2012-09-27 10:27:44 +0000
committerTom Rini <trini@ti.com>2012-10-15 11:54:13 -0700
commit17c7cf71b44a4fe23a34de1f9d572623d2ed19f7 (patch)
tree15efc9134e78ee9cf3e179b43c6d1e2ed1a849db
parentc3b518903192fd1ee346211ed8c7e020ea2fc050 (diff)
downloadu-boot-imx-17c7cf71b44a4fe23a34de1f9d572623d2ed19f7.zip
u-boot-imx-17c7cf71b44a4fe23a34de1f9d572623d2ed19f7.tar.gz
u-boot-imx-17c7cf71b44a4fe23a34de1f9d572623d2ed19f7.tar.bz2
mx25 clocks: Fix MXC_FEC_CLK
mxc_get_clock(MXC_FEC_CLK) should return the IPG clock, not the AHB clock. Also, imx_get_fecclk() was correct but reimplemented the calculation of the IPG clock, so remove the duplicated code. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com> Cc: Stefano Babic <sbabic@denx.de>
-rw-r--r--arch/arm/cpu/arm926ejs/mx25/generic.c3
-rw-r--r--arch/arm/include/asm/arch-mx25/clock.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 0d1ae20..fc92c9b 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -129,9 +129,8 @@ unsigned int mxc_get_clock(enum mxc_clock clk)
return imx_get_ahbclk();
case MXC_IPG_CLK:
case MXC_CSPI_CLK:
- return imx_get_ipgclk();
case MXC_FEC_CLK:
- return imx_get_ahbclk();
+ return imx_get_ipgclk();
default:
return imx_get_perclk(clk);
}
diff --git a/arch/arm/include/asm/arch-mx25/clock.h b/arch/arm/include/asm/arch-mx25/clock.h
index 9823f46..a532da5 100644
--- a/arch/arm/include/asm/arch-mx25/clock.h
+++ b/arch/arm/include/asm/arch-mx25/clock.h
@@ -71,7 +71,7 @@ ulong imx_get_perclk(int clk);
ulong imx_get_ahbclk(void);
#define imx_get_uartclk() imx_get_perclk(15)
-#define imx_get_fecclk() (imx_get_ahbclk()/2)
+#define imx_get_fecclk() mxc_get_clock(MXC_FEC_CLK)
unsigned int mxc_get_clock(enum mxc_clock clk);