summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2016-03-20 22:04:29 +0100
committerStefano Babic <sbabic@denx.de>2016-03-20 22:04:29 +0100
commit312a6c016a2d81aa3fbc605f5c0c315b6a4e3464 (patch)
tree3b7675802858da0878f6d8713b4d032696a96880 /arch/arm/include/asm
parente4fb863f6dec0002069d57422ebe3ce3af69a273 (diff)
parente25a0656bac63c5fcd20ef4313dc09c409fc512d (diff)
downloadtalos-obmc-uboot-312a6c016a2d81aa3fbc605f5c0c315b6a4e3464.tar.gz
talos-obmc-uboot-312a6c016a2d81aa3fbc605f5c0c315b6a4e3464.zip
Merge branch 'next'
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/arch-imx/cpu.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-imx/cpu.h b/arch/arm/include/asm/arch-imx/cpu.h
index 8a75902ee5..7c63c13d7b 100644
--- a/arch/arm/include/asm/arch-imx/cpu.h
+++ b/arch/arm/include/asm/arch-imx/cpu.h
@@ -21,6 +21,7 @@
#define MXC_CPU_MX6D 0x67
#define MXC_CPU_MX6DP 0x68
#define MXC_CPU_MX6QP 0x69
+#define MXC_CPU_MX7S 0x71 /* dummy ID */
#define MXC_CPU_MX7D 0x72
#define MXC_CPU_VF610 0xF6 /* dummy ID */
OpenPOWER on IntegriCloud