remove ifdef'd clock selection code from serial_mxc.c and replace with call to imx_get_uartclk
Add definitions for imx_get_uartclk to imx31 and imx27 include files.
This makes it easier to add new imx platforms.
Signed-off-by: John Rigby jcrigby@gmail.com --- drivers/serial/serial_mxc.c | 6 +----- include/asm-arm/arch-mx27/clock.h | 2 ++ include/asm-arm/arch-mx31/mx31.h | 1 + 3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/serial/serial_mxc.c b/drivers/serial/serial_mxc.c index acc5b7d..7dcedf6 100644 --- a/drivers/serial/serial_mxc.c +++ b/drivers/serial/serial_mxc.c @@ -166,11 +166,7 @@ DECLARE_GLOBAL_DATA_PTR;
void serial_setbrg (void) { -#ifdef CONFIG_MX31 - u32 clk = mx31_get_ipg_clk(); -#else - u32 clk = imx_get_perclk1(); -#endif + u32 clk = imx_get_uartclk();
if (!gd->baudrate) gd->baudrate = CONFIG_BAUDRATE; diff --git a/include/asm-arm/arch-mx27/clock.h b/include/asm-arm/arch-mx27/clock.h index 5fc75c5..472e8f2 100644 --- a/include/asm-arm/arch-mx27/clock.h +++ b/include/asm-arm/arch-mx27/clock.h @@ -36,4 +36,6 @@ ulong imx_get_perclk2(void); ulong imx_get_perclk3(void); ulong imx_get_ahbclk(void);
+#define imx_get_uartclk imx_get_perclk1 + #endif /* __ASM_ARCH_CLOCK_H */ diff --git a/include/asm-arm/arch-mx31/mx31.h b/include/asm-arm/arch-mx31/mx31.h index 53b9f27..3cc4b35 100644 --- a/include/asm-arm/arch-mx31/mx31.h +++ b/include/asm-arm/arch-mx31/mx31.h @@ -25,6 +25,7 @@ #define __ASM_ARCH_MX31_H
extern u32 mx31_get_ipg_clk(void); +#define imx_get_uartclk mx31_get_ipg_clk extern void mx31_gpio_mux(unsigned long mode);
enum mx31_gpio_direction {