From 17c7cf71b44a4fe23a34de1f9d572623d2ed19f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= <benoit.thebaudeau@advansee.com> Date: Thu, 27 Sep 2012 10:27:44 +0000 Subject: [PATCH] mx25 clocks: Fix MXC_FEC_CLK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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> --- arch/arm/cpu/arm926ejs/mx25/generic.c | 3 +-- arch/arm/include/asm/arch-mx25/clock.h | 2 +- 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 0d1ae206ab5..fc92c9bf1d9 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 9823f46adaf..a532da5dbea 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); -- GitLab