diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-07 16:10:56 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-07 16:10:56 +0000 |
| commit | 725278e0ecdabbbced6f1b05a23473ec9e4cafee (patch) | |
| tree | 6f0843aa39f5a2df292613b9ed0b537be5047301 /arch/arm/mach-kirkwood/common.c | |
| parent | c947f69fff183e5d2a06160d9262b5dab7359e95 (diff) | |
| parent | 7350f419724fd9472d3b5cc521538713f9797b62 (diff) | |
| download | talos-op-linux-725278e0ecdabbbced6f1b05a23473ec9e4cafee.tar.gz talos-op-linux-725278e0ecdabbbced6f1b05a23473ec9e4cafee.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion
Diffstat (limited to 'arch/arm/mach-kirkwood/common.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/common.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 51ff23b72d3a..3688123b5ad8 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c @@ -854,10 +854,9 @@ int __init kirkwood_find_tclk(void) kirkwood_pcie_id(&dev, &rev); - if ((dev == MV88F6281_DEV_ID && (rev == MV88F6281_REV_A0 || - rev == MV88F6281_REV_A1)) || - (dev == MV88F6282_DEV_ID)) - return 200000000; + if (dev == MV88F6281_DEV_ID || dev == MV88F6282_DEV_ID) + if (((readl(SAMPLE_AT_RESET) >> 21) & 1) == 0) + return 200000000; return 166666667; } |
