[U-Boot] [PATCH] ARM: kirkwood: fix cpu info for 6282 device id

[U-Boot] [PATCH] ARM: kirkwood: fix cpu info for 6282 device id

[Luka Perkov]

Signed-off-by: Luka Perkov <luka@openwrt.org>
CC: Prafulla Wadaskar <prafulla@marvell.com>
CC: Stefan Roese <sr@denx.de>
---
 arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
index da80240..312d2b2 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
@@ -252,7 +252,7 @@ static void kw_sysrst_check(void)
 #if defined(CONFIG_DISPLAY_CPUINFO)
 int print_cpuinfo(void)
 {
-	char *rev;
+	char *rev = "??";
 	u16 devid = (readl(KW_REG_PCIE_DEVID) >> 16) & 0xffff;
 	u8 revid = readl(KW_REG_PCIE_REVID) & 0xff;
 
@@ -263,7 +263,13 @@ int print_cpuinfo(void)
 
 	switch (revid) {
 	case 0:
-		rev = "Z0";
+		if (devid == 0x6281)
+			rev = "Z0";
+		else if (devid == 0x6282)
+			rev = "A0";
+		break;
+	case 1:
+		rev = "A1";
 		break;
 	case 2:
 		rev = "A0";
@@ -272,7 +278,6 @@ int print_cpuinfo(void)
 		rev = "A1";
 		break;
 	default:
-		rev = "??";
 		break;
 	}
 
-- 
2.0.1

[U-Boot] [PATCH] ARM: kirkwood: fix cpu info for 6282 device id

[Stefan Roese]

On 02.07.2014 02:17, Luka Perkov wrote:
> Signed-off-by: Luka Perkov <luka@openwrt.org>
> CC: Prafulla Wadaskar <prafulla@marvell.com>
> CC: Stefan Roese <sr@denx.de>

Acked-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

[U-Boot] [PATCH] ARM: kirkwood: fix cpu info for 6282 device id

[Prafulla Wadaskar]

> -----Original Message-----
> From: Luka Perkov [mailto:luka at openwrt.org]
> Sent: 02 July 2014 05:48
> To: u-boot at lists.denx.de
> Cc: luka at openwrt.org; Prafulla Wadaskar; Stefan Roese
> Subject: [PATCH] ARM: kirkwood: fix cpu info for 6282
> device id
> 
> Signed-off-by: Luka Perkov <luka@openwrt.org>
> CC: Prafulla Wadaskar <prafulla@marvell.com>
> CC: Stefan Roese <sr@denx.de>
> ---
>  arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
> b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
> index da80240..312d2b2 100644
> --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
> +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
> @@ -252,7 +252,7 @@ static void kw_sysrst_check(void)
>  #if defined(CONFIG_DISPLAY_CPUINFO)
>  int print_cpuinfo(void)
>  {
> -	char *rev;
> +	char *rev = "??";
>  	u16 devid = (readl(KW_REG_PCIE_DEVID) >> 16) &
> 0xffff;
>  	u8 revid = readl(KW_REG_PCIE_REVID) & 0xff;
> 
> @@ -263,7 +263,13 @@ int print_cpuinfo(void)
> 
>  	switch (revid) {
>  	case 0:
> -		rev = "Z0";
> +		if (devid == 0x6281)
> +			rev = "Z0";
> +		else if (devid == 0x6282)
> +			rev = "A0";
> +		break;
> +	case 1:
> +		rev = "A1";
>  		break;
>  	case 2:
>  		rev = "A0";
> @@ -272,7 +278,6 @@ int print_cpuinfo(void)
>  		rev = "A1";
>  		break;
>  	default:
> -		rev = "??";
>  		break;
>  	}
> 

Acked-By: Prafulla Wadaskar <prafulla@marvell.com>

Will be pulled latter.

Regards...
Prafulla . . .

[U-Boot] [PATCH] ARM: kirkwood: fix cpu info for 6282 device id

[Albert ARIBAUD]

Hi Prafulla,

On Fri, 4 Jul 2014 11:43:48 -0700, Prafulla Wadaskar
<prafulla@marvell.com> wrote:

> 
> 
> > -----Original Message-----
> > From: Luka Perkov [mailto:luka at openwrt.org]
> > Sent: 02 July 2014 05:48
> > To: u-boot at lists.denx.de
> > Cc: luka at openwrt.org; Prafulla Wadaskar; Stefan Roese
> > Subject: [PATCH] ARM: kirkwood: fix cpu info for 6282
> > device id
> > 
> > Signed-off-by: Luka Perkov <luka@openwrt.org>
> > CC: Prafulla Wadaskar <prafulla@marvell.com>
> > CC: Stefan Roese <sr@denx.de>
> > ---
> >  arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 11 ++++++++---
> >  1 file changed, 8 insertions(+), 3 deletions(-)
> > 
> > diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
> > b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
> > index da80240..312d2b2 100644
> > --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
> > +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
> > @@ -252,7 +252,7 @@ static void kw_sysrst_check(void)
> >  #if defined(CONFIG_DISPLAY_CPUINFO)
> >  int print_cpuinfo(void)
> >  {
> > -	char *rev;
> > +	char *rev = "??";
> >  	u16 devid = (readl(KW_REG_PCIE_DEVID) >> 16) &
> > 0xffff;
> >  	u8 revid = readl(KW_REG_PCIE_REVID) & 0xff;
> > 
> > @@ -263,7 +263,13 @@ int print_cpuinfo(void)
> > 
> >  	switch (revid) {
> >  	case 0:
> > -		rev = "Z0";
> > +		if (devid == 0x6281)
> > +			rev = "Z0";
> > +		else if (devid == 0x6282)
> > +			rev = "A0";
> > +		break;
> > +	case 1:
> > +		rev = "A1";
> >  		break;
> >  	case 2:
> >  		rev = "A0";
> > @@ -272,7 +278,6 @@ int print_cpuinfo(void)
> >  		rev = "A1";
> >  		break;
> >  	default:
> > -		rev = "??";
> >  		break;
> >  	}
> > 
> 
> Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
> 
> Will be pulled latter.

Prafulla, just a note in case you intend to send a PR for 2014.07: I'll
be unavailable for U-Boot work from Monday july 7th to Tuesday july 22nd
inclusive, so meanwhile, a Marvell PR for 2014.07 would have to be sent
to Tom Rini.

> Regards...
> Prafulla . . .

Amicalement,
-- 
Albert.