From 0b4ea14cf08c1b11ea830bec2b5d91850c3fea72 Mon Sep 17 00:00:00 2001 From: Saeed Bishara Date: Tue, 1 Jun 2010 18:09:26 +0300 Subject: [PATCH] --- yaml --- r: 201521 b: refs/heads/master c: 1c2003a1d6445f939c8628116452c7bbeff6759c h: refs/heads/master i: 201519: 5ed46412d0191786a0946369107b7c7d8a50a429 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-kirkwood/common.c | 4 ++++ trunk/arch/arm/mach-kirkwood/include/mach/kirkwood.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 88f618c79558..c4d763cb19a0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29333cfae728de0ff0dd09a476b97ea49ce9eedb +refs/heads/master: 1c2003a1d6445f939c8628116452c7bbeff6759c diff --git a/trunk/arch/arm/mach-kirkwood/common.c b/trunk/arch/arm/mach-kirkwood/common.c index 6072eaa5e66a..c780c4a30434 100644 --- a/trunk/arch/arm/mach-kirkwood/common.c +++ b/trunk/arch/arm/mach-kirkwood/common.c @@ -891,11 +891,15 @@ static char * __init kirkwood_id(void) return "MV88F6192-Z0"; else if (rev == MV88F6192_REV_A0) return "MV88F6192-A0"; + else if (rev == MV88F6192_REV_A1) + return "MV88F6192-A1"; else return "MV88F6192-Rev-Unsupported"; } else if (dev == MV88F6180_DEV_ID) { if (rev == MV88F6180_REV_A0) return "MV88F6180-Rev-A0"; + else if (rev == MV88F6180_REV_A1) + return "MV88F6180-Rev-A1"; else return "MV88F6180-Rev-Unsupported"; } else { diff --git a/trunk/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/trunk/arch/arm/mach-kirkwood/include/mach/kirkwood.h index a15cf0ee22bd..d61b9aabfd18 100644 --- a/trunk/arch/arm/mach-kirkwood/include/mach/kirkwood.h +++ b/trunk/arch/arm/mach-kirkwood/include/mach/kirkwood.h @@ -107,8 +107,10 @@ #define MV88F6192_DEV_ID 0x6192 #define MV88F6192_REV_Z0 0 #define MV88F6192_REV_A0 2 +#define MV88F6192_REV_A1 3 #define MV88F6180_DEV_ID 0x6180 #define MV88F6180_REV_A0 2 +#define MV88F6180_REV_A1 3 #endif