openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

can: sja1000 platform data fixes 

The member "clock" of struct "sja1000_platform_data" is documented as
"CAN bus oscillator frequency in Hz" but it's actually used as the CAN
clock frequency, which is half of it. To avoid further confusion, this
patch fixes it by renaming the member to "osc_freq". That way, also
non mainline users will notice the change. The platform code for the
relevant boards is updated accordingly. Furthermore, pre-defined
values are now used for the members "ocr" and "cdr".

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Wolfgang Grandegger 2010-05-17 22:39:48 -07:00 committed by David S. Miller
parent d19d56ddc8
commit 56e6943b90
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-mx2/pcm970-baseboard.c
View File

@ -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, .osc_freq = 16000000,
.ocr = 0x40 | 0x18, .ocr = OCR_TX1_PULLDOWN | OCR_TX0_PUSHPULL,
.cdr = 0x40, .cdr = CDR_CBP,
}; };
static struct platform_device pcm970_sja1000 = { static struct platform_device pcm970_sja1000 = {

6
arch/arm/mach-mx3/mach-pcm037.c
View File

@ -530,9 +530,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, .osc_freq = 16000000,
.ocr = 0x40 | 0x18, .ocr = OCR_TX1_PULLDOWN | OCR_TX0_PUSHPULL,
.cdr = 0x40, .cdr = CDR_CBP,
}; };
static struct platform_device pcm970_sja1000 = { static struct platform_device pcm970_sja1000 = {

3
drivers/net/can/sja1000/sja1000_platform.c
View File

@ -111,7 +111,8 @@ static int sp_probe(struct platform_device *pdev)
dev->irq = res_irq->start; dev->irq = res_irq->start;
priv->irq_flags = res_irq->flags & (IRQF_TRIGGER_MASK | IRQF_SHARED); priv->irq_flags = res_irq->flags & (IRQF_TRIGGER_MASK | IRQF_SHARED);
priv->reg_base = addr; 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->ocr = pdata->ocr;
priv->cdr = pdata->cdr; priv->cdr = pdata->cdr;

2
include/linux/can/platform/sja1000.h
View File

@ -26,7 +26,7 @@
#define OCR_TX_SHIFT 2 #define OCR_TX_SHIFT 2
struct sja1000_platform_data { 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 ocr; /* output control register */
u8 cdr; /* clock divider register */ u8 cdr; /* clock divider register */