Merge branch 'next' of git://git.denx.de/u-boot-net into next

[u-boot] / arch / arm / include / asm / arch-mx31 / clock.h

diff --git a/arch/arm/include/asm/arch-mx31/clock.h b/arch/arm/include/asm/arch-mx31/clock.h
index fb035c4993ff44282479affb175e15076cb89733..852c19c1a74c45acd296001aa5749cc0f0351c45 100644 (file)
--- a/arch/arm/include/asm/arch-mx31/clock.h
+++ b/arch/arm/include/asm/arch-mx31/clock.h
@@ -27,16 +27,21 @@
 enum mxc_clock {
        MXC_ARM_CLK,
        MXC_IPG_CLK,
+       MXC_IPG_PERCLK,
        MXC_CSPI_CLK,
        MXC_UART_CLK,
+       MXC_IPU_CLK,
+       MXC_ESDHC_CLK,
 };
 
 unsigned int mxc_get_clock(enum mxc_clock clk);
-extern u32 imx_get_uartclk();
+extern u32 imx_get_uartclk(void);
 extern void mx31_gpio_mux(unsigned long mode);
 extern void mx31_set_pad(enum iomux_pins pin, u32 config);
+extern void mx31_set_gpr(enum iomux_gp_func gp, char en);
 
 void mx31_uart1_hw_init(void);
+void mx31_uart2_hw_init(void);
 void mx31_spi2_hw_init(void);
 void mxc_hw_watchdog_enable(void);
 void mxc_hw_watchdog_reset(void);