merged branches/netlink in rev. 1037 back to trunk.

[socketcan-devel.git] / kernel / 2.6 / include / linux / can / platform / sja1000.h

diff --git a/kernel/2.6/include/linux/can/platform/sja1000.h b/kernel/2.6/include/linux/can/platform/sja1000.h
index 241f59626e5e6a4acb7f8c9b0a83627ea629bc9a..01ee2aeb048df36e535982e20b30c7b004e1a5c9 100644 (file)
--- a/kernel/2.6/include/linux/can/platform/sja1000.h
+++ b/kernel/2.6/include/linux/can/platform/sja1000.h
@@ -1,5 +1,5 @@
-#ifndef _CAN_SJA1000_PLATFORM_H_
-#define _CAN_SJA1000_PLATFORM_H_
+#ifndef _CAN_PLATFORM_SJA1000_H_
+#define _CAN_PLATFORM_SJA1000_H_
 
 /* clock divider register */
 #define CDR_CLKOUT_MASK 0x07
@@ -13,6 +13,7 @@
 #define OCR_MODE_TEST     0x01
 #define OCR_MODE_NORMAL   0x02
 #define OCR_MODE_CLOCK    0x03
+#define OCR_MODE_MASK     0x07
 #define OCR_TX0_INVERT    0x04
 #define OCR_TX0_PULLDOWN  0x08
 #define OCR_TX0_PULLUP    0x10
@@ -21,6 +22,8 @@
 #define OCR_TX1_PULLDOWN  0x40
 #define OCR_TX1_PULLUP    0x80
 #define OCR_TX1_PUSHPULL  0xc0
+#define OCR_TX_MASK       0xfc
+#define OCR_TX_SHIFT      2
 
 struct sja1000_platform_data {
        u32 clock;      /* CAN bus oscillator frequency in Hz */
@@ -29,4 +32,4 @@ struct sja1000_platform_data {
        u8 cdr;         /* clock divider register */
 };
 
-#endif /* !_CAN_SJA1000_PLATFORM_H_ */
+#endif /* !_CAN_PLATFORM_SJA1000_H_ */