git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx2
/
pcm970-baseboard.c
diff --git
a/arch/arm/mach-mx2/pcm970-baseboard.c
b/arch/arm/mach-mx2/pcm970-baseboard.c
index
4aafd5b
..
f490a40
100644
(file)
--- 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 = {
};
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 = {
};
static struct platform_device pcm970_sja1000 = {