Commit e732cdd4 authored by David S. Miller's avatar David S. Miller

Merge tag 'linux-can-fixes-for-4.2-20150825' of...

Merge tag 'linux-can-fixes-for-4.2-20150825' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
this is the updated pull request of one patch by me for the peak_usb
driver. It fixes the driver, so that non FD adapters don't provide CAN
FD bittimings.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 83bc805b 06b23f7f
...@@ -854,15 +854,7 @@ static int pcan_usb_probe(struct usb_interface *intf) ...@@ -854,15 +854,7 @@ static int pcan_usb_probe(struct usb_interface *intf)
/* /*
* describe the PCAN-USB adapter * describe the PCAN-USB adapter
*/ */
const struct peak_usb_adapter pcan_usb = { static const struct can_bittiming_const pcan_usb_const = {
.name = "PCAN-USB",
.device_id = PCAN_USB_PRODUCT_ID,
.ctrl_count = 1,
.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
.clock = {
.freq = PCAN_USB_CRYSTAL_HZ / 2 ,
},
.bittiming_const = {
.name = "pcan_usb", .name = "pcan_usb",
.tseg1_min = 1, .tseg1_min = 1,
.tseg1_max = 16, .tseg1_max = 16,
...@@ -872,7 +864,17 @@ const struct peak_usb_adapter pcan_usb = { ...@@ -872,7 +864,17 @@ const struct peak_usb_adapter pcan_usb = {
.brp_min = 1, .brp_min = 1,
.brp_max = 64, .brp_max = 64,
.brp_inc = 1, .brp_inc = 1,
};
const struct peak_usb_adapter pcan_usb = {
.name = "PCAN-USB",
.device_id = PCAN_USB_PRODUCT_ID,
.ctrl_count = 1,
.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
.clock = {
.freq = PCAN_USB_CRYSTAL_HZ / 2 ,
}, },
.bittiming_const = &pcan_usb_const,
/* size of device private data */ /* size of device private data */
.sizeof_dev_private = sizeof(struct pcan_usb), .sizeof_dev_private = sizeof(struct pcan_usb),
......
...@@ -792,9 +792,9 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter, ...@@ -792,9 +792,9 @@ static int peak_usb_create_dev(const struct peak_usb_adapter *peak_usb_adapter,
dev->ep_msg_out = peak_usb_adapter->ep_msg_out[ctrl_idx]; dev->ep_msg_out = peak_usb_adapter->ep_msg_out[ctrl_idx];
dev->can.clock = peak_usb_adapter->clock; dev->can.clock = peak_usb_adapter->clock;
dev->can.bittiming_const = &peak_usb_adapter->bittiming_const; dev->can.bittiming_const = peak_usb_adapter->bittiming_const;
dev->can.do_set_bittiming = peak_usb_set_bittiming; dev->can.do_set_bittiming = peak_usb_set_bittiming;
dev->can.data_bittiming_const = &peak_usb_adapter->data_bittiming_const; dev->can.data_bittiming_const = peak_usb_adapter->data_bittiming_const;
dev->can.do_set_data_bittiming = peak_usb_set_data_bittiming; dev->can.do_set_data_bittiming = peak_usb_set_data_bittiming;
dev->can.do_set_mode = peak_usb_set_mode; dev->can.do_set_mode = peak_usb_set_mode;
dev->can.do_get_berr_counter = peak_usb_adapter->do_get_berr_counter; dev->can.do_get_berr_counter = peak_usb_adapter->do_get_berr_counter;
......
...@@ -48,8 +48,8 @@ struct peak_usb_adapter { ...@@ -48,8 +48,8 @@ struct peak_usb_adapter {
u32 device_id; u32 device_id;
u32 ctrlmode_supported; u32 ctrlmode_supported;
struct can_clock clock; struct can_clock clock;
const struct can_bittiming_const bittiming_const; const struct can_bittiming_const * const bittiming_const;
const struct can_bittiming_const data_bittiming_const; const struct can_bittiming_const * const data_bittiming_const;
unsigned int ctrl_count; unsigned int ctrl_count;
int (*intf_probe)(struct usb_interface *intf); int (*intf_probe)(struct usb_interface *intf);
......
...@@ -990,16 +990,7 @@ static void pcan_usb_fd_free(struct peak_usb_device *dev) ...@@ -990,16 +990,7 @@ static void pcan_usb_fd_free(struct peak_usb_device *dev)
} }
/* describes the PCAN-USB FD adapter */ /* describes the PCAN-USB FD adapter */
const struct peak_usb_adapter pcan_usb_fd = { static const struct can_bittiming_const pcan_usb_fd_const = {
.name = "PCAN-USB FD",
.device_id = PCAN_USBFD_PRODUCT_ID,
.ctrl_count = PCAN_USBFD_CHANNEL_COUNT,
.ctrlmode_supported = CAN_CTRLMODE_FD |
CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
.clock = {
.freq = PCAN_UFD_CRYSTAL_HZ,
},
.bittiming_const = {
.name = "pcan_usb_fd", .name = "pcan_usb_fd",
.tseg1_min = 1, .tseg1_min = 1,
.tseg1_max = 64, .tseg1_max = 64,
...@@ -1009,8 +1000,9 @@ const struct peak_usb_adapter pcan_usb_fd = { ...@@ -1009,8 +1000,9 @@ const struct peak_usb_adapter pcan_usb_fd = {
.brp_min = 1, .brp_min = 1,
.brp_max = 1024, .brp_max = 1024,
.brp_inc = 1, .brp_inc = 1,
}, };
.data_bittiming_const = {
static const struct can_bittiming_const pcan_usb_fd_data_const = {
.name = "pcan_usb_fd", .name = "pcan_usb_fd",
.tseg1_min = 1, .tseg1_min = 1,
.tseg1_max = 16, .tseg1_max = 16,
...@@ -1020,7 +1012,19 @@ const struct peak_usb_adapter pcan_usb_fd = { ...@@ -1020,7 +1012,19 @@ const struct peak_usb_adapter pcan_usb_fd = {
.brp_min = 1, .brp_min = 1,
.brp_max = 1024, .brp_max = 1024,
.brp_inc = 1, .brp_inc = 1,
};
const struct peak_usb_adapter pcan_usb_fd = {
.name = "PCAN-USB FD",
.device_id = PCAN_USBFD_PRODUCT_ID,
.ctrl_count = PCAN_USBFD_CHANNEL_COUNT,
.ctrlmode_supported = CAN_CTRLMODE_FD |
CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
.clock = {
.freq = PCAN_UFD_CRYSTAL_HZ,
}, },
.bittiming_const = &pcan_usb_fd_const,
.data_bittiming_const = &pcan_usb_fd_data_const,
/* size of device private data */ /* size of device private data */
.sizeof_dev_private = sizeof(struct pcan_usb_fd_device), .sizeof_dev_private = sizeof(struct pcan_usb_fd_device),
...@@ -1058,16 +1062,7 @@ const struct peak_usb_adapter pcan_usb_fd = { ...@@ -1058,16 +1062,7 @@ const struct peak_usb_adapter pcan_usb_fd = {
}; };
/* describes the PCAN-USB Pro FD adapter */ /* describes the PCAN-USB Pro FD adapter */
const struct peak_usb_adapter pcan_usb_pro_fd = { static const struct can_bittiming_const pcan_usb_pro_fd_const = {
.name = "PCAN-USB Pro FD",
.device_id = PCAN_USBPROFD_PRODUCT_ID,
.ctrl_count = PCAN_USBPROFD_CHANNEL_COUNT,
.ctrlmode_supported = CAN_CTRLMODE_FD |
CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
.clock = {
.freq = PCAN_UFD_CRYSTAL_HZ,
},
.bittiming_const = {
.name = "pcan_usb_pro_fd", .name = "pcan_usb_pro_fd",
.tseg1_min = 1, .tseg1_min = 1,
.tseg1_max = 64, .tseg1_max = 64,
...@@ -1077,8 +1072,9 @@ const struct peak_usb_adapter pcan_usb_pro_fd = { ...@@ -1077,8 +1072,9 @@ const struct peak_usb_adapter pcan_usb_pro_fd = {
.brp_min = 1, .brp_min = 1,
.brp_max = 1024, .brp_max = 1024,
.brp_inc = 1, .brp_inc = 1,
}, };
.data_bittiming_const = {
static const struct can_bittiming_const pcan_usb_pro_fd_data_const = {
.name = "pcan_usb_pro_fd", .name = "pcan_usb_pro_fd",
.tseg1_min = 1, .tseg1_min = 1,
.tseg1_max = 16, .tseg1_max = 16,
...@@ -1088,7 +1084,19 @@ const struct peak_usb_adapter pcan_usb_pro_fd = { ...@@ -1088,7 +1084,19 @@ const struct peak_usb_adapter pcan_usb_pro_fd = {
.brp_min = 1, .brp_min = 1,
.brp_max = 1024, .brp_max = 1024,
.brp_inc = 1, .brp_inc = 1,
};
const struct peak_usb_adapter pcan_usb_pro_fd = {
.name = "PCAN-USB Pro FD",
.device_id = PCAN_USBPROFD_PRODUCT_ID,
.ctrl_count = PCAN_USBPROFD_CHANNEL_COUNT,
.ctrlmode_supported = CAN_CTRLMODE_FD |
CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
.clock = {
.freq = PCAN_UFD_CRYSTAL_HZ,
}, },
.bittiming_const = &pcan_usb_pro_fd_const,
.data_bittiming_const = &pcan_usb_pro_fd_data_const,
/* size of device private data */ /* size of device private data */
.sizeof_dev_private = sizeof(struct pcan_usb_fd_device), .sizeof_dev_private = sizeof(struct pcan_usb_fd_device),
......
...@@ -1004,15 +1004,7 @@ int pcan_usb_pro_probe(struct usb_interface *intf) ...@@ -1004,15 +1004,7 @@ int pcan_usb_pro_probe(struct usb_interface *intf)
/* /*
* describe the PCAN-USB Pro adapter * describe the PCAN-USB Pro adapter
*/ */
const struct peak_usb_adapter pcan_usb_pro = { static const struct can_bittiming_const pcan_usb_pro_const = {
.name = "PCAN-USB Pro",
.device_id = PCAN_USBPRO_PRODUCT_ID,
.ctrl_count = PCAN_USBPRO_CHANNEL_COUNT,
.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
.clock = {
.freq = PCAN_USBPRO_CRYSTAL_HZ,
},
.bittiming_const = {
.name = "pcan_usb_pro", .name = "pcan_usb_pro",
.tseg1_min = 1, .tseg1_min = 1,
.tseg1_max = 16, .tseg1_max = 16,
...@@ -1022,7 +1014,17 @@ const struct peak_usb_adapter pcan_usb_pro = { ...@@ -1022,7 +1014,17 @@ const struct peak_usb_adapter pcan_usb_pro = {
.brp_min = 1, .brp_min = 1,
.brp_max = 1024, .brp_max = 1024,
.brp_inc = 1, .brp_inc = 1,
};
const struct peak_usb_adapter pcan_usb_pro = {
.name = "PCAN-USB Pro",
.device_id = PCAN_USBPRO_PRODUCT_ID,
.ctrl_count = PCAN_USBPRO_CHANNEL_COUNT,
.ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
.clock = {
.freq = PCAN_USBPRO_CRYSTAL_HZ,
}, },
.bittiming_const = &pcan_usb_pro_const,
/* size of device private data */ /* size of device private data */
.sizeof_dev_private = sizeof(struct pcan_usb_pro_device), .sizeof_dev_private = sizeof(struct pcan_usb_pro_device),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment