diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-kirkwood/common.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/kirkwood.h | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 0f6919838011..0acb61f3c10b 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
@@ -838,7 +838,8 @@ int __init kirkwood_find_tclk(void) | |||
838 | u32 dev, rev; | 838 | u32 dev, rev; |
839 | 839 | ||
840 | kirkwood_pcie_id(&dev, &rev); | 840 | kirkwood_pcie_id(&dev, &rev); |
841 | if (dev == MV88F6281_DEV_ID && rev == MV88F6281_REV_A0) | 841 | if (dev == MV88F6281_DEV_ID && (rev == MV88F6281_REV_A0 || |
842 | rev == MV88F6281_REV_A1)) | ||
842 | return 200000000; | 843 | return 200000000; |
843 | 844 | ||
844 | return 166666667; | 845 | return 166666667; |
@@ -872,6 +873,8 @@ static char * __init kirkwood_id(void) | |||
872 | return "MV88F6281-Z0"; | 873 | return "MV88F6281-Z0"; |
873 | else if (rev == MV88F6281_REV_A0) | 874 | else if (rev == MV88F6281_REV_A0) |
874 | return "MV88F6281-A0"; | 875 | return "MV88F6281-A0"; |
876 | else if (rev == MV88F6281_REV_A1) | ||
877 | return "MV88F6281-A1"; | ||
875 | else | 878 | else |
876 | return "MV88F6281-Rev-Unsupported"; | 879 | return "MV88F6281-Rev-Unsupported"; |
877 | } else if (dev == MV88F6192_DEV_ID) { | 880 | } else if (dev == MV88F6192_DEV_ID) { |
diff --git a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h index 07af858814a0..54c132731d2d 100644 --- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h +++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h | |||
@@ -101,6 +101,7 @@ | |||
101 | #define MV88F6281_DEV_ID 0x6281 | 101 | #define MV88F6281_DEV_ID 0x6281 |
102 | #define MV88F6281_REV_Z0 0 | 102 | #define MV88F6281_REV_Z0 0 |
103 | #define MV88F6281_REV_A0 2 | 103 | #define MV88F6281_REV_A0 2 |
104 | #define MV88F6281_REV_A1 3 | ||
104 | 105 | ||
105 | #define MV88F6192_DEV_ID 0x6192 | 106 | #define MV88F6192_DEV_ID 0x6192 |
106 | #define MV88F6192_REV_Z0 0 | 107 | #define MV88F6192_REV_Z0 0 |