* [U-Boot] [PATCH] ARM: kirkwood: fix cpu info for 6282 device id
@ 2014-07-02 0:17 Luka Perkov
2014-07-02 13:24 ` Stefan Roese
2014-07-04 18:43 ` Prafulla Wadaskar
0 siblings, 2 replies; 4+ messages in thread
From: Luka Perkov @ 2014-07-02 0:17 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [U-Boot] [PATCH] ARM: kirkwood: fix cpu info for 6282 device id
2014-07-02 0:17 [U-Boot] [PATCH] ARM: kirkwood: fix cpu info for 6282 device id Luka Perkov
@ 2014-07-02 13:24 ` Stefan Roese
2014-07-04 18:43 ` Prafulla Wadaskar
1 sibling, 0 replies; 4+ messages in thread
From: Stefan Roese @ 2014-07-02 13:24 UTC (permalink / raw)
To: u-boot
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] ARM: kirkwood: fix cpu info for 6282 device id
2014-07-02 0:17 [U-Boot] [PATCH] ARM: kirkwood: fix cpu info for 6282 device id Luka Perkov
2014-07-02 13:24 ` Stefan Roese
@ 2014-07-04 18:43 ` Prafulla Wadaskar
2014-07-04 19:14 ` Albert ARIBAUD
1 sibling, 1 reply; 4+ messages in thread
From: Prafulla Wadaskar @ 2014-07-04 18:43 UTC (permalink / raw)
To: u-boot
> -----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 . . .
^ permalink raw reply [flat|nested] 4+ messages in thread* [U-Boot] [PATCH] ARM: kirkwood: fix cpu info for 6282 device id
2014-07-04 18:43 ` Prafulla Wadaskar
@ 2014-07-04 19:14 ` Albert ARIBAUD
0 siblings, 0 replies; 4+ messages in thread
From: Albert ARIBAUD @ 2014-07-04 19:14 UTC (permalink / raw)
To: u-boot
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-07-04 19:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-02 0:17 [U-Boot] [PATCH] ARM: kirkwood: fix cpu info for 6282 device id Luka Perkov
2014-07-02 13:24 ` Stefan Roese
2014-07-04 18:43 ` Prafulla Wadaskar
2014-07-04 19:14 ` Albert ARIBAUD
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox