From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
kernel@pengutronix.de, Christer Beskow <chbe@kvaser.com>,
Jimmy Assarsson <extja@kvaser.com>,
Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [net-next 23/25] can: kvaser_usb: kvaser_usb_hydra: Add support for new device variant
Date: Fri, 20 Nov 2020 14:33:16 +0100 [thread overview]
Message-ID: <20201120133318.3428231-24-mkl@pengutronix.de> (raw)
In-Reply-To: <20201120133318.3428231-1-mkl@pengutronix.de>
From: Christer Beskow <chbe@kvaser.com>
Add support for a new variant of devices using the hydra platform, based on
NXP i.MX RT (flexcan).
Signed-off-by: Christer Beskow <chbe@kvaser.com>
Signed-off-by: Jimmy Assarsson <extja@kvaser.com>
Link: https://lore.kernel.org/r/20201115163027.16851-5-jimmyassarsson@gmail.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
.../net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
index 107b205b77ab..480bd2ecb296 100644
--- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
+++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
@@ -34,6 +34,7 @@
/* Forward declarations */
static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_kcan;
static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_flexc;
+static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_rt;
#define KVASER_USB_HYDRA_BULK_EP_IN_ADDR 0x82
#define KVASER_USB_HYDRA_BULK_EP_OUT_ADDR 0x02
@@ -135,6 +136,7 @@ struct kvaser_cmd_sw_detail_req {
#define KVASER_USB_HYDRA_SW_FLAG_CANFD BIT(10)
#define KVASER_USB_HYDRA_SW_FLAG_NONISO BIT(11)
#define KVASER_USB_HYDRA_SW_FLAG_EXT_CAP BIT(12)
+#define KVASER_USB_HYDRA_SW_FLAG_CAN_FREQ_80M BIT(13)
struct kvaser_cmd_sw_detail_res {
__le32 sw_flags;
__le32 sw_version;
@@ -383,6 +385,30 @@ static const struct can_bittiming_const kvaser_usb_hydra_flexc_bittiming_c = {
.brp_inc = 1,
};
+static const struct can_bittiming_const kvaser_usb_hydra_rt_bittiming_c = {
+ .name = "kvaser_usb_rt",
+ .tseg1_min = 2,
+ .tseg1_max = 96,
+ .tseg2_min = 2,
+ .tseg2_max = 32,
+ .sjw_max = 32,
+ .brp_min = 1,
+ .brp_max = 1024,
+ .brp_inc = 1,
+};
+
+static const struct can_bittiming_const kvaser_usb_hydra_rtd_bittiming_c = {
+ .name = "kvaser_usb_rt",
+ .tseg1_min = 2,
+ .tseg1_max = 39,
+ .tseg2_min = 2,
+ .tseg2_max = 8,
+ .sjw_max = 8,
+ .brp_min = 1,
+ .brp_max = 1024,
+ .brp_inc = 1,
+};
+
#define KVASER_USB_HYDRA_TRANSID_BITS 12
#define KVASER_USB_HYDRA_TRANSID_MASK \
GENMASK(KVASER_USB_HYDRA_TRANSID_BITS - 1, 0)
@@ -1727,6 +1753,8 @@ static int kvaser_usb_hydra_get_software_details(struct kvaser_usb *dev)
if (flags & KVASER_USB_HYDRA_SW_FLAG_FREQ_80M)
dev->cfg = &kvaser_usb_hydra_dev_cfg_kcan;
+ else if (flags & KVASER_USB_HYDRA_SW_FLAG_CAN_FREQ_80M)
+ dev->cfg = &kvaser_usb_hydra_dev_cfg_rt;
else
dev->cfg = &kvaser_usb_hydra_dev_cfg_flexc;
@@ -2026,3 +2054,12 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_flexc = {
.timestamp_freq = 1,
.bittiming_const = &kvaser_usb_hydra_flexc_bittiming_c,
};
+
+static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_rt = {
+ .clock = {
+ .freq = 80000000,
+ },
+ .timestamp_freq = 24,
+ .bittiming_const = &kvaser_usb_hydra_rt_bittiming_c,
+ .data_bittiming_const = &kvaser_usb_hydra_rtd_bittiming_c,
+};
--
2.29.2
next prev parent reply other threads:[~2020-11-20 13:34 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 13:32 pull-request: can-next 2020-11-20 Marc Kleine-Budde
2020-11-20 13:32 ` [net-next 01/25] can: j1939: add tables for the CAN identifier and its fields Marc Kleine-Budde
2020-11-20 13:32 ` [net-next 02/25] can: add optional DLC element to Classical CAN frame structure Marc Kleine-Budde
2020-11-20 13:32 ` [net-next 03/25] can: rename get_can_dlc() macro with can_cc_dlc2len() Marc Kleine-Budde
2020-11-20 13:32 ` [net-next 04/25] can: remove obsolete get_canfd_dlc() macro Marc Kleine-Budde
2020-11-20 13:32 ` [net-next 05/25] can: replace can_dlc as variable/element for payload length Marc Kleine-Budde
2020-11-20 13:32 ` [net-next 06/25] can: rename CAN FD related can_len2dlc and can_dlc2len helpers Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 07/25] can: update documentation for DLC usage in Classical CAN Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 08/25] can: drivers: introduce helpers to access Classical CAN DLC values Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 09/25] can: drivers: add len8_dlc support for various CAN adapters Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 10/25] can: drivers: add len8_dlc support for esd_usb2 CAN adapter Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 11/25] can: gw: support modification of Classical CAN DLCs Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 12/25] dt-bindings: can: fsl,flexcan: add uint32 reference to clock-frequency property Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 13/25] dt-bindings: can: fsl,flexcan: fix fsl,clk-source property Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 14/25] dt-bindings: firmware: add IMX_SC_R_CAN(x) macro for CAN Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 15/25] can: flexcan: rename macro FLEXCAN_QUIRK_SETUP_STOP_MODE -> FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 16/25] can: flexcan: factor out enabling and disabling of interrupts into separate function Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 17/25] can: flexcan: move enabling/disabling of interrupts from flexcan_chip_{start,stop}() to callers Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 18/25] can: flexcan: flexcan_rx_offload_setup(): factor out mailbox and rx-offload setup into separate function Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 19/25] can: flexcan: flexcan_open(): completely initialize controller before requesting IRQ Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 20/25] can: flexcan: flexcan_close(): change order if commands to properly shut down the controller Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 21/25] can: kvaser_usb: Add USB_{LEAF,HYDRA}_PRODUCT_ID_END defines Marc Kleine-Budde
2020-11-20 13:33 ` [net-next 22/25] can: kvaser_usb: Add new Kvaser Leaf v2 devices Marc Kleine-Budde
2020-11-20 13:33 ` Marc Kleine-Budde [this message]
2020-11-20 13:33 ` [net-next 24/25] can: kvaser_usb: Add new Kvaser hydra devices Marc Kleine-Budde
2020-11-20 13:44 ` [PATCH 25/25] can: mcp251xfd: remove useless code in mcp251xfd_chip_softreset Marc Kleine-Budde
2020-11-21 23:09 ` pull-request: can-next 2020-11-20 Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201120133318.3428231-24-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=chbe@kvaser.com \
--cc=davem@davemloft.net \
--cc=extja@kvaser.com \
--cc=kernel@pengutronix.de \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).