From 359ec824c60dffdca80f42ca626fb5baf67ad20e Mon Sep 17 00:00:00 2001 From: Terry Lv Date: Tue, 21 Sep 2010 15:24:04 +0800 Subject: ENGR00131779: Use serial_mxc as uart driver for all platforms Use serial_mxc as uart driver for all platforms. Signed-off-by: Terry Lv --- include/asm-arm/arch-mx31/mx31.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'include/asm-arm/arch-mx31/mx31.h') diff --git a/include/asm-arm/arch-mx31/mx31.h b/include/asm-arm/arch-mx31/mx31.h index 53b9f27..3f8e3ca 100644 --- a/include/asm-arm/arch-mx31/mx31.h +++ b/include/asm-arm/arch-mx31/mx31.h @@ -24,21 +24,28 @@ #ifndef __ASM_ARCH_MX31_H #define __ASM_ARCH_MX31_H -extern u32 mx31_get_ipg_clk(void); -extern void mx31_gpio_mux(unsigned long mode); +#ifndef __ASSEMBLER__ + +enum mxc_clock { + MXC_ARM_CLK, + MXC_UART_CLK, +}; enum mx31_gpio_direction { MX31_GPIO_DIRECTION_IN, MX31_GPIO_DIRECTION_OUT, }; +extern int mxc_get_clock(enum mxc_clock clk); +extern void mx31_gpio_mux(unsigned long mode); + #ifdef CONFIG_MX31_GPIO extern int mx31_gpio_direction(unsigned int gpio, - enum mx31_gpio_direction direction); + enum mx31_gpio_direction direction); extern void mx31_gpio_set(unsigned int gpio, unsigned int value); #else static inline int mx31_gpio_direction(unsigned int gpio, - enum mx31_gpio_direction direction) + enum mx31_gpio_direction direction) { return 1; } @@ -50,4 +57,6 @@ static inline void mx31_gpio_set(unsigned int gpio, unsigned int value) void mx31_uart1_hw_init(void); void mx31_spi2_hw_init(void); +#endif + #endif /* __ASM_ARCH_MX31_H */ -- cgit v1.1