diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-03-27 07:36:55 +0000 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2013-04-03 11:36:34 +0200 |
commit | 38e70077253a6ac55cee276be72fb4e6844042cd (patch) | |
tree | 48c83011aa844d39c176823d3c55a6d6098eec9c /arch/arm/cpu | |
parent | 50cea244fe6bd62d65fd3379e24e5fc5ac016658 (diff) | |
download | u-boot-imx-38e70077253a6ac55cee276be72fb4e6844042cd.zip u-boot-imx-38e70077253a6ac55cee276be72fb4e6844042cd.tar.gz u-boot-imx-38e70077253a6ac55cee276be72fb4e6844042cd.tar.bz2 |
mx6: Fix get_board_rev() for the mx6 solo case
When booting a Freescale kernel 3.0.35 on a Wandboard solo, the get_board_rev()
returns 0x62xxx, which is not a value understood by the VPU
(Video Processing Unit) library in the kernel and causes the video playback to
fail.
The expected values for get_board_rev are:
0x63xxx: For mx6quad/dual
0x61xxx: For mx6dual-lite/solo
So adjust get_board_rev() accordingly and make it as weak function, so that we
do not need to define it in every mx6 board file.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Dirk Behme <dirk.behme@de.bosch.com>
Acked-by: Eric Nelson <eric.nelson@boundarydevices.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r-- | arch/arm/cpu/armv7/mx6/soc.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 193ba12..2ea8ca3 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -61,6 +61,18 @@ u32 get_cpu_rev(void) return (type << 12) | (reg + 0x10); } +#ifdef CONFIG_REVISION_TAG +u32 __weak get_board_rev(void) +{ + u32 cpurev = get_cpu_rev(); + u32 type = ((cpurev >> 12) & 0xff); + if (type == MXC_CPU_MX6SOLO) + cpurev = (MXC_CPU_MX6DL) << 12 | (cpurev & 0xFFF); + + return cpurev; +} +#endif + void init_aips(void) { struct aipstz_regs *aips1, *aips2; |