diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-26 11:36:58 +1000 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-05-26 11:36:58 +1000 |
| commit | 50d1e9302bab7d35dae7146f8c468e0943015616 (patch) | |
| tree | fa05320f4a297bd582686574cf94ba444e264b3f /arch/arm/mach-mx2/pcm970-baseboard.c | |
| parent | 7cc2835083aedfde42de02301005a5555e00c4b1 (diff) | |
| parent | dc4ccfd15d4fc7a91ddf222bc5eed5cc4bcf10e6 (diff) | |
| download | kernel_goldelico_gta04-50d1e9302bab7d35dae7146f8c468e0943015616.zip kernel_goldelico_gta04-50d1e9302bab7d35dae7146f8c468e0943015616.tar.gz kernel_goldelico_gta04-50d1e9302bab7d35dae7146f8c468e0943015616.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/crypto-2.6
Diffstat (limited to 'arch/arm/mach-mx2/pcm970-baseboard.c')
| -rw-r--r-- | arch/arm/mach-mx2/pcm970-baseboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx2/pcm970-baseboard.c b/arch/arm/mach-mx2/pcm970-baseboard.c index 4aafd5b..f490a40 100644 --- a/arch/arm/mach-mx2/pcm970-baseboard.c +++ b/arch/arm/mach-mx2/pcm970-baseboard.c @@ -201,9 +201,9 @@ static struct resource pcm970_sja1000_resources[] = { }; struct sja1000_platform_data pcm970_sja1000_platform_data = { - .clock = 16000000 / 2, - .ocr = 0x40 | 0x18, - .cdr = 0x40, + .osc_freq = 16000000, + .ocr = OCR_TX1_PULLDOWN | OCR_TX0_PUSHPULL, + .cdr = CDR_CBP, }; static struct platform_device pcm970_sja1000 = { |