Patched in Tegra support.

3 files changed, 15 insertions, 62 deletions

diff --git a/include/linux/can/core.h b/include/linux/can/core.h
index 78c6c52073a..5ce6b5d62ec 100644
--- a/include/linux/can/core.h
+++ b/include/linux/can/core.h
@@ -8,6 +8,8 @@
  * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
  * All rights reserved.
  *
+ * Send feedback to <socketcan-users@lists.berlios.de>
+ *
  */
 
 #ifndef CAN_CORE_H
@@ -17,10 +19,10 @@
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
 
-#define CAN_VERSION "20120528"
+#define CAN_VERSION "20090105"
 
 /* increment this number each time you change some user-space interface */
-#define CAN_ABI_VERSION "9"
+#define CAN_ABI_VERSION "8"
 
 #define CAN_VERSION_STRING "rev " CAN_VERSION " abi " CAN_ABI_VERSION
 
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 2b2fc345afc..cc0bb496166 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -8,6 +8,7 @@
  *
  * Copyright (C) 2008 Wolfgang Grandegger <wg@grandegger.com>
  *
+ * Send feedback to <socketcan-users@lists.berlios.de>
  */
 
 #ifndef CAN_DEV_H
@@ -33,7 +34,7 @@ struct can_priv {
         struct can_device_stats can_stats;
 
         struct can_bittiming bittiming;
-        const struct can_bittiming_const *bittiming_const;
+        struct can_bittiming_const *bittiming_const;
         struct can_clock clock;
 
         enum can_state state;
@@ -61,40 +62,23 @@ struct can_priv {
  * To be used in the CAN netdriver receive path to ensure conformance with
  * ISO 11898-1 Chapter 8.4.2.3 (DLC field)
  */
-#define get_can_dlc(i)          (min_t(__u8, (i), CAN_MAX_DLC))
-#define get_canfd_dlc(i)        (min_t(__u8, (i), CANFD_MAX_DLC))
+#define get_can_dlc(i)  (min_t(__u8, (i), 8))
 
 /* Drop a given socketbuffer if it does not contain a valid CAN frame. */
 static inline int can_dropped_invalid_skb(struct net_device *dev,
                                           struct sk_buff *skb)
 {
-        const struct canfd_frame *cfd = (struct canfd_frame *)skb->data;
-
-        if (skb->protocol == htons(ETH_P_CAN)) {
-                if (unlikely(skb->len != CAN_MTU ||
-                             cfd->len > CAN_MAX_DLEN))
-                        goto inval_skb;
-        } else if (skb->protocol == htons(ETH_P_CANFD)) {
-                if (unlikely(skb->len != CANFD_MTU ||
-                             cfd->len > CANFD_MAX_DLEN))
-                        goto inval_skb;
-        } else
-                goto inval_skb;
+        const struct can_frame *cf = (struct can_frame *)skb->data;
 
-        return 0;
+        if (unlikely(skb->len != sizeof(*cf) || cf->can_dlc > 8)) {
+                kfree_skb(skb);
+                dev->stats.tx_dropped++;
+                return 1;
+        }
 
-inval_skb:
-        kfree_skb(skb);
-        dev->stats.tx_dropped++;
-        return 1;
+        return 0;
 }
 
-/* get data length from can_dlc with sanitized can_dlc */
-u8 can_dlc2len(u8 can_dlc);
-
-/* map the sanitized data length to an appropriate data length code */
-u8 can_len2dlc(u8 len);
-
 struct net_device *alloc_candev(int sizeof_priv, unsigned int echo_skb_max);
 void free_candev(struct net_device *dev);
 
@@ -109,7 +93,7 @@ void can_bus_off(struct net_device *dev);
 
 void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,
                       unsigned int idx);
-unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx);
+void can_get_echo_skb(struct net_device *dev, unsigned int idx);
 void can_free_echo_skb(struct net_device *dev, unsigned int idx);
 
 struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf);
diff --git a/include/linux/can/platform/cc770.h b/include/linux/can/platform/cc770.h
deleted file mode 100644
index 7702641f87e..00000000000
--- a/include/linux/can/platform/cc770.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _CAN_PLATFORM_CC770_H_
-#define _CAN_PLATFORM_CC770_H_
-
-/* CPU Interface Register (0x02) */
-#define CPUIF_CEN       0x01    /* Clock Out Enable */
-#define CPUIF_MUX       0x04    /* Multiplex */
-#define CPUIF_SLP       0x08    /* Sleep */
-#define CPUIF_PWD       0x10    /* Power Down Mode */
-#define CPUIF_DMC       0x20    /* Divide Memory Clock */
-#define CPUIF_DSC       0x40    /* Divide System Clock */
-#define CPUIF_RST       0x80    /* Hardware Reset Status */
-
-/* Clock Out Register (0x1f) */
-#define CLKOUT_CD_MASK  0x0f    /* Clock Divider mask */
-#define CLKOUT_SL_MASK  0x30    /* Slew Rate mask */
-#define CLKOUT_SL_SHIFT 4
-
-/* Bus Configuration Register (0x2f) */
-#define BUSCFG_DR0      0x01    /* Disconnect RX0 Input / Select RX input */
-#define BUSCFG_DR1      0x02    /* Disconnect RX1 Input / Silent mode */
-#define BUSCFG_DT1      0x08    /* Disconnect TX1 Output */
-#define BUSCFG_POL      0x20    /* Polarity dominant or recessive */
-#define BUSCFG_CBY      0x40    /* Input Comparator Bypass */
-
-struct cc770_platform_data {
-        u32 osc_freq;   /* CAN bus oscillator frequency in Hz */
-
-        u8 cir;         /* CPU Interface Register */
-        u8 cor;         /* Clock Out Register */
-        u8 bcr;         /* Bus Configuration Register */
-};
-
-#endif  /* !_CAN_PLATFORM_CC770_H_ */