diff options
| author | Wolfgang Grandegger <wg@grandegger.com> | 2010-05-17 22:39:48 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-17 22:39:48 -0700 |
| commit | 56e6943b902562e09d3e74126d8d8256b5ea17fb (patch) | |
| tree | 3b37d2e1382a666152b7c655a67b4f7b785c142f /include/linux/can | |
| parent | d19d56ddc88e7895429ef118db9c83c7bbe3ce6a (diff) | |
| download | kernel_samsung_smdk4412-56e6943b902562e09d3e74126d8d8256b5ea17fb.zip kernel_samsung_smdk4412-56e6943b902562e09d3e74126d8d8256b5ea17fb.tar.gz kernel_samsung_smdk4412-56e6943b902562e09d3e74126d8d8256b5ea17fb.tar.bz2 | |
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>
Diffstat (limited to 'include/linux/can')
| -rw-r--r-- | include/linux/can/platform/sja1000.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/can/platform/sja1000.h b/include/linux/can/platform/sja1000.h index 01ee2ae..96f8fcc 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 */ |