zynqmp: Provide function for reading implementation platform

Add hooks for QEMU, ep108, etc platforms.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/cpu/armv8/zynqmp/Makefile b/arch/arm/cpu/armv8/zynqmp/Makefile
index 2db71f1e25a9aaeaeb731ba5a0a89aab7c1edcfa..39568fc70aa906ed486d5091674be849ddb01fcf 100644 (file)
--- a/arch/arm/cpu/armv8/zynqmp/Makefile
+++ b/arch/arm/cpu/armv8/zynqmp/Makefile
@@ -6,4 +6,5 @@
 #
 
 obj-y  += clk.o
+obj-y  += cpu.o
 obj-y  += timer.o

diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c
new file mode 100644 (file)
index 0000000..a908231
--- /dev/null
+++ b/arch/arm/cpu/armv8/zynqmp/cpu.c
@@ -0,0 +1,24 @@
+/*
+ * (C) Copyright 2014 Xilinx, Inc.
+ * Michal Simek <michal.simek@xilinx.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/io.h>
+
+#define ZYNQ_SILICON_VER_MASK  0xF000
+#define ZYNQ_SILICON_VER_SHIFT 12
+
+unsigned int zynqmp_get_silicon_version(void)
+{
+       unsigned int ver;
+
+       ver = (readl(&csu_base->version) & ZYNQ_SILICON_VER_MASK) >>
+              ZYNQ_SILICON_VER_SHIFT;
+
+       return ver;
+}

diff --git a/arch/arm/include/asm/arch-zynqmp/hardware.h b/arch/arm/include/asm/arch-zynqmp/hardware.h
index f1c16a0092d03c348e29f782678bf569f7486f0b..d51d1a236e23547eedb844c0b49e69158b5bef20 100644 (file)
--- a/arch/arm/include/asm/arch-zynqmp/hardware.h
+++ b/arch/arm/include/asm/arch-zynqmp/hardware.h
@@ -39,4 +39,19 @@ struct crlapb_regs {
 #define SD_MODE                0x00000005
 #define JTAG_MODE      0x00000000
 
+#define ZYNQMP_CSU_BASEADDR    0xFFCC0000
+
+struct csu_regs {
+       u32 reserved0[24];
+       u32 version; /* 0x60 will be moved to 0x24 */
+};
+
+#define csu_base ((struct csu_regs *)ZYNQMP_CSU_BASEADDR)
+
+/* Board version value */
+#define ZYNQMP_CSU_VERSION_SILICON     0x0
+#define ZYNQMP_CSU_VERSION_EP108       0x1
+#define ZYNQMP_CSU_VERSION_VELOCE      0x2
+#define ZYNQMP_CSU_VERSION_QEMU                0x3
+
 #endif /* _ASM_ARCH_HARDWARE_H */

diff --git a/arch/arm/include/asm/arch-zynqmp/sys_proto.h b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
index 11fbca459d45b1d96e51f5896d17d4a4ddcb26d7..5b6305546e59191dbd2a53671abf3d02dc032ace 100644 (file)
--- a/arch/arm/include/asm/arch-zynqmp/sys_proto.h
+++ b/arch/arm/include/asm/arch-zynqmp/sys_proto.h
@@ -15,4 +15,6 @@ static inline void zynq_slcr_gem_clk_setup(u32 gem_id, unsigned long clk_rate)
 
 extern int zynq_sdhci_init(u32 regbase);
 
+extern unsigned int zynqmp_get_silicon_version(void);
+
 #endif /* _ASM_ARCH_SYS_PROTO_H */