From mboxrd@z Thu Jan  1 00:00:00 1970
From: Troy Kisky <troy.kisky@boundarydevices.com>
Date: Wed, 27 Mar 2013 10:32:44 -0700
Subject: [U-Boot] [PATCH] mx6: Fix get_board_rev() for the mx6 solo case
In-Reply-To: <1364402175-6824-1-git-send-email-fabio.estevam@freescale.com>
References: <1364402175-6824-1-git-send-email-fabio.estevam@freescale.com>
Message-ID: <51532D3C.50404@boundarydevices.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On 3/27/2013 9:36 AM, Fabio Estevam wrote:
> 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>
> ---
>   arch/arm/cpu/armv7/mx6/soc.c                  |   12 ++++++++++++
>   board/boundary/nitrogen6x/nitrogen6x.c        |    5 -----
>   board/freescale/mx6qsabrelite/mx6qsabrelite.c |    5 -----
>   board/freescale/mx6qsabresd/mx6qsabresd.c     |    5 -----
>   board/wandboard/wandboard.c                   |    5 -----
>   5 files changed, 12 insertions(+), 20 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
> index 193ba12..4f3cd14 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 | (get_cpu_rev() & 0xFFF);

Why call get_cpu_rev again?