Merge branch 'master' of git://git.denx.de/u-boot-i2c

[oweals/u-boot.git] / 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 f89a401bbcf3f8b9d11d381fabd55b098fcb1d98..53b9f27333db9547dd3b59e7852bd0ce9409235c 100644 (file)
--- a/include/asm-arm/arch-mx31/mx31.h
+++ b/include/asm-arm/arch-mx31/mx31.h
@@ -24,9 +24,30 @@
 #ifndef __ASM_ARCH_MX31_H
 #define __ASM_ARCH_MX31_H
 
-u32 mx31_get_mpl_dpdgck_clk(void);
-u32 mx31_get_mcu_main_clk(void);
-u32 mx31_get_ipg_clk(void);
-void mx31_gpio_mux(unsigned long mode);
+extern u32 mx31_get_ipg_clk(void);
+extern void mx31_gpio_mux(unsigned long mode);
+
+enum mx31_gpio_direction {
+       MX31_GPIO_DIRECTION_IN,
+       MX31_GPIO_DIRECTION_OUT,
+};
+
+#ifdef CONFIG_MX31_GPIO
+extern int mx31_gpio_direction(unsigned int gpio,
+                              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)
+{
+       return 1;
+}
+static inline void mx31_gpio_set(unsigned int gpio, unsigned int value)
+{
+}
+#endif
+
+void mx31_uart1_hw_init(void);
+void mx31_spi2_hw_init(void);
 
 #endif /* __ASM_ARCH_MX31_H */