Merge remote-tracking branch 'u-boot/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / arch / arm / include / asm / arch-am33xx / sys_proto.h

diff --git a/arch/arm/include/asm/arch-am33xx/sys_proto.h b/arch/arm/include/asm/arch-am33xx/sys_proto.h
index 55f57ac9be611f9b50e5865f86722c806ceb6de4..7eacf27a935b640d7b337626bac8796a2ba371ca 100644 (file)
--- a/arch/arm/include/asm/arch-am33xx/sys_proto.h
+++ b/arch/arm/include/asm/arch-am33xx/sys_proto.h
@@ -10,16 +10,13 @@
 
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
-
-#define BOARD_REV_ID   0x0
+#include <linux/mtd/omap_gpmc.h>
+#include <asm/ti-common/sys_proto.h>
+#include <asm/arch/cpu.h>
 
 u32 get_cpu_rev(void);
 u32 get_sysboot_value(void);
 
-#ifdef CONFIG_DISPLAY_CPUINFO
-int print_cpuinfo(void);
-#endif
-
 extern struct ctrl_stat *cstat;
 u32 get_device_type(void);
 void save_omap_boot_params(void);
@@ -43,4 +40,6 @@ u32 wait_on_value(u32, u32, void *, u32);
 void enable_norboot_pin_mux(void);
 #endif
 void am33xx_spl_board_init(void);
+int am335x_get_efuse_mpu_max_freq(struct ctrl_dev *cdev);
+int am335x_get_tps65910_mpu_vdd(int sil_rev, int frequency);
 #endif