diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-15 05:54:00 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-15 05:54:00 +0100 |
| commit | 344ac148442e3223ac1b0e29ef3d3fb73c5ed61a (patch) | |
| tree | 7b654a74727c57344296768c3a2d7d03b17f37ea /arch/arm/mach-kirkwood/common.c | |
| parent | Merge branches 'sh/rtc' and 'common/clkfwk' into sh/urgent (diff) | |
| parent | Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/... (diff) | |
| download | linux-344ac148442e3223ac1b0e29ef3d3fb73c5ed61a.tar.xz linux-344ac148442e3223ac1b0e29ef3d3fb73c5ed61a.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/urgent
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; } |