4 files changed, 9 insertions, 8 deletions

diff --git a/arch/arm/mach-mx2/pcm970-baseboard.c b/arch/arm/mach-mx2/pcm970-baseboard.c
index 4aafd5b8b85b..f490a406d57e 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 = {
diff --git a/arch/arm/mach-mx3/mach-pcm037.c b/arch/arm/mach-mx3/mach-pcm037.c
index 2df1ec55a97e..78ecd751549b 100644
--- a/arch/arm/mach-mx3/mach-pcm037.c
+++ b/arch/arm/mach-mx3/mach-pcm037.c
@@ -530,9 +530,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 = {
diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c
index b65cabb361ab..d9fadc489b32 100644
--- a/drivers/net/can/sja1000/sja1000_platform.c
+++ b/drivers/net/can/sja1000/sja1000_platform.c
@@ -111,7 +111,8 @@ static int sp_probe(struct platform_device *pdev)
         dev->irq = res_irq->start;
         priv->irq_flags = res_irq->flags & (IRQF_TRIGGER_MASK | IRQF_SHARED);
         priv->reg_base = addr;
-        priv->can.clock.freq = pdata->clock;
+        /* The CAN clock frequency is half the oscillator clock frequency */
+        priv->can.clock.freq = pdata->osc_freq / 2;
         priv->ocr = pdata->ocr;
         priv->cdr = pdata->cdr;
 
diff --git a/include/linux/can/platform/sja1000.h b/include/linux/can/platform/sja1000.h
index 01ee2aeb048d..96f8fcc78d78 100644
--- a/include/linux/can/platform/sja1000.h
+++ b/include/linux/can/platform/sja1000.h
@@ -26,7 +26,7 @@
 #define OCR_TX_SHIFT      2
 
 struct sja1000_platform_data {
-        u32 clock;      /* CAN bus oscillator frequency in Hz */
+        u32 osc_freq;   /* CAN bus oscillator frequency in Hz */
 
         u8 ocr;         /* output control register */
         u8 cdr;         /* clock divider register */