diff options
| author | Saeed Bishara <saeed@marvell.com> | 2010-06-01 11:09:26 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2010-07-16 22:01:58 -0400 |
| commit | 1c2003a1d6445f939c8628116452c7bbeff6759c (patch) | |
| tree | b1f22a085056a9a3478cafacd913ccd5eb7286e8 | |
| parent | 29333cfae728de0ff0dd09a476b97ea49ce9eedb (diff) | |
[ARM] Kirkwood: add support for rev A1 of the 88f6192 and 88f6180 chips.
Signed-off-by: Saeed Bishara <saeed@marvell.com>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
| -rw-r--r-- | arch/arm/mach-kirkwood/common.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/kirkwood.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 6072eaa5e66a..c780c4a30434 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
| @@ -891,11 +891,15 @@ static char * __init kirkwood_id(void) | |||
| 891 | return "MV88F6192-Z0"; | 891 | return "MV88F6192-Z0"; |
| 892 | else if (rev == MV88F6192_REV_A0) | 892 | else if (rev == MV88F6192_REV_A0) |
| 893 | return "MV88F6192-A0"; | 893 | return "MV88F6192-A0"; |
| 894 | else if (rev == MV88F6192_REV_A1) | ||
| 895 | return "MV88F6192-A1"; | ||
| 894 | else | 896 | else |
| 895 | return "MV88F6192-Rev-Unsupported"; | 897 | return "MV88F6192-Rev-Unsupported"; |
| 896 | } else if (dev == MV88F6180_DEV_ID) { | 898 | } else if (dev == MV88F6180_DEV_ID) { |
| 897 | if (rev == MV88F6180_REV_A0) | 899 | if (rev == MV88F6180_REV_A0) |
| 898 | return "MV88F6180-Rev-A0"; | 900 | return "MV88F6180-Rev-A0"; |
| 901 | else if (rev == MV88F6180_REV_A1) | ||
| 902 | return "MV88F6180-Rev-A1"; | ||
| 899 | else | 903 | else |
| 900 | return "MV88F6180-Rev-Unsupported"; | 904 | return "MV88F6180-Rev-Unsupported"; |
| 901 | } else { | 905 | } else { |
diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h index a15cf0ee22bd..d61b9aabfd18 100644 --- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h +++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h | |||
| @@ -107,8 +107,10 @@ | |||
| 107 | #define MV88F6192_DEV_ID 0x6192 | 107 | #define MV88F6192_DEV_ID 0x6192 |
| 108 | #define MV88F6192_REV_Z0 0 | 108 | #define MV88F6192_REV_Z0 0 |
| 109 | #define MV88F6192_REV_A0 2 | 109 | #define MV88F6192_REV_A0 2 |
| 110 | #define MV88F6192_REV_A1 3 | ||
| 110 | 111 | ||
| 111 | #define MV88F6180_DEV_ID 0x6180 | 112 | #define MV88F6180_DEV_ID 0x6180 |
| 112 | #define MV88F6180_REV_A0 2 | 113 | #define MV88F6180_REV_A0 2 |
| 114 | #define MV88F6180_REV_A1 3 | ||
| 113 | 115 | ||
| 114 | #endif | 116 | #endif |
