diff options
author | Matthias Fuchs <matthias.fuchs@esd.eu> | 2012-10-29 05:54:47 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-11-15 11:26:00 -0500 |
commit | a5f8f0e1a57025287697df78ce5e6b7d6b2b07b0 (patch) | |
tree | 1ef764763b961a9ac271a442df67c85ccbe096fd /drivers/net/can/usb | |
parent | e4bc6c06569a90512169d98a11b3eb2ec18da4ae (diff) |
can: usb: esd_usb2: Add support for listen-only mode
Add listen-only mode for esd_usb2 driver.
Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/usb')
-rw-r--r-- | drivers/net/can/usb/esd_usb2.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c index bd36e5517173..f4317c0efed4 100644 --- a/drivers/net/can/usb/esd_usb2.c +++ b/drivers/net/can/usb/esd_usb2.c | |||
@@ -891,6 +891,9 @@ static int esd_usb2_set_bittiming(struct net_device *netdev) | |||
891 | u32 canbtr; | 891 | u32 canbtr; |
892 | 892 | ||
893 | canbtr = ESD_USB2_UBR; | 893 | canbtr = ESD_USB2_UBR; |
894 | if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY) | ||
895 | canbtr |= ESD_USB2_LOM; | ||
896 | |||
894 | canbtr |= (bt->brp - 1) & (ESD_USB2_BRP_MAX - 1); | 897 | canbtr |= (bt->brp - 1) & (ESD_USB2_BRP_MAX - 1); |
895 | canbtr |= ((bt->sjw - 1) & (ESD_USB2_SJW_MAX - 1)) | 898 | canbtr |= ((bt->sjw - 1) & (ESD_USB2_SJW_MAX - 1)) |
896 | << ESD_USB2_SJW_SHIFT; | 899 | << ESD_USB2_SJW_SHIFT; |
@@ -971,6 +974,7 @@ static int esd_usb2_probe_one_net(struct usb_interface *intf, int index) | |||
971 | priv->index = index; | 974 | priv->index = index; |
972 | 975 | ||
973 | priv->can.state = CAN_STATE_STOPPED; | 976 | priv->can.state = CAN_STATE_STOPPED; |
977 | priv->can.ctrlmode_supported = CAN_CTRLMODE_LISTENONLY; | ||
974 | priv->can.clock.freq = ESD_USB2_CAN_CLOCK; | 978 | priv->can.clock.freq = ESD_USB2_CAN_CLOCK; |
975 | priv->can.bittiming_const = &esd_usb2_bittiming_const; | 979 | priv->can.bittiming_const = &esd_usb2_bittiming_const; |
976 | priv->can.do_set_bittiming = esd_usb2_set_bittiming; | 980 | priv->can.do_set_bittiming = esd_usb2_set_bittiming; |