diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2017-11-10 11:06:02 +0100 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2017-11-29 08:02:39 +0100 |
| commit | f29074803c0855c323af2c29865d924690cb8bb0 (patch) | |
| tree | 0a6c64a7f3369510cca47f42664044462d8a0d17 /arch | |
| parent | c0823a76df4382ea8b8923dd6de016517bbd5929 (diff) | |
| download | u-boot-f29074803c0855c323af2c29865d924690cb8bb0.zip u-boot-f29074803c0855c323af2c29865d924690cb8bb0.tar.gz u-boot-f29074803c0855c323af2c29865d924690cb8bb0.tar.bz2 | |
arm: zynq: Add ps7GetSiliconVersion() to ps7_spl_init
Unfortunately camelcase is coming from ps7_init* format.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-zynq/include/mach/ps7_init_gpl.h | 6 | ||||
| -rw-r--r-- | arch/arm/mach-zynq/ps7_spl_init.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/include/mach/ps7_init_gpl.h b/arch/arm/mach-zynq/include/mach/ps7_init_gpl.h index c7c716e..fa5d486 100644 --- a/arch/arm/mach-zynq/include/mach/ps7_init_gpl.h +++ b/arch/arm/mach-zynq/include/mach/ps7_init_gpl.h @@ -30,6 +30,10 @@ #define PS7_POLL_FAILED_DMA (4) #define PS7_POLL_FAILED_PLL (5) +#define PCW_SILICON_VERSION_1 0 +#define PCW_SILICON_VERSION_2 1 +#define PCW_SILICON_VERSION_3 2 + /* Called by spl.c */ int ps7_init(void); int ps7_post_config(void); @@ -37,4 +41,6 @@ int ps7_post_config(void); /* Defined in ps7_init_common.c */ int ps7_config(unsigned long *ps7_config_init); +unsigned long ps7GetSiliconVersion(void); + #endif /* _ASM_ARCH_PS7_INIT_GPL_H */ diff --git a/arch/arm/mach-zynq/ps7_spl_init.c b/arch/arm/mach-zynq/ps7_spl_init.c index 1800995..0698278 100644 --- a/arch/arm/mach-zynq/ps7_spl_init.c +++ b/arch/arm/mach-zynq/ps7_spl_init.c @@ -7,6 +7,7 @@ #include <asm/io.h> #include <asm/spl.h> +#include <asm/arch/sys_proto.h> #include <asm/arch/ps7_init_gpl.h> __weak int ps7_init(void) @@ -134,3 +135,8 @@ int __weak ps7_config(unsigned long *ps7_config_init) ptr += numargs; } } + +unsigned long __weak __maybe_unused ps7GetSiliconVersion(void) +{ + return zynq_get_silicon_version(); +} |