Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / arch / arm / include / asm / arch-mx6 / sys_proto.h

diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h
index 8c21364e71b7ca72cff54dd7344da533fe77cdc1..38851a135c8a5bf4686226ed715cf3d3ad791e4d 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx6/sys_proto.h
@@ -9,13 +9,7 @@
 #define _SYS_PROTO_H_
 
 #include <asm/imx-common/regs-common.h>
-
-#define MXC_CPU_MX51           0x51
-#define MXC_CPU_MX53           0x53
-#define MXC_CPU_MX6SL          0x60
-#define MXC_CPU_MX6DL          0x61
-#define MXC_CPU_MX6SOLO                0x62
-#define MXC_CPU_MX6Q           0x63
+#include "../arch-imx/cpu.h"
 
 #define is_soc_rev(rev)        ((get_cpu_rev() & 0xFF) - rev)
 u32 get_cpu_rev(void);
@@ -29,8 +23,6 @@ u32 get_cpu_rev(void);
 const char *get_imx_type(u32 imxtype);
 unsigned imx_ddr_size(void);
 
-void set_vddsoc(u32 mv);
-
 /*
  * Initializes on-chip ethernet controllers.
  * to override, implement board_eth_init()