Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

can: xilinx_can: Add cantype parameter in xcan_devtype_data struct

Browse Source 
To differentiate between different CAN IP's this patch adds
cantype enum variable in the xcan_devtype_data structure

Signed-off-by: Appana Durga Kedareswara rao <appana.durga.rao@xilinx.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
This commit is contained in:
Appana Durga Kedareswara rao 2019-03-18 17:02:43 +05:30 committed by Marc Kleine-Budde
parent 3281b380ec
commit 8dce7ea41a
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/can/xilinx_can.c
View File

@ -149,7 +149,15 @@ enum xcan_reg {
#define XCAN_FLAG_RX_FIFO_MULTI 0x0010 #define XCAN_FLAG_RX_FIFO_MULTI 0x0010
#define XCAN_FLAG_CANFD_2 0x0020 #define XCAN_FLAG_CANFD_2 0x0020
enum xcan_ip_type {
XAXI_CAN = 0,
XZYNQ_CANPS,
XAXI_CANFD,
XAXI_CANFD_2_0,
};
struct xcan_devtype_data { struct xcan_devtype_data {
enum xcan_ip_type cantype;
unsigned int flags; unsigned int flags;
const struct can_bittiming_const *bittiming_const; const struct can_bittiming_const *bittiming_const;
const char *bus_clk_name; const char *bus_clk_name;
@ -1426,6 +1434,7 @@ static const struct dev_pm_ops xcan_dev_pm_ops = {
}; };
static const struct xcan_devtype_data xcan_zynq_data = { static const struct xcan_devtype_data xcan_zynq_data = {
.cantype = XZYNQ_CANPS,
.flags = XCAN_FLAG_TXFEMP, .flags = XCAN_FLAG_TXFEMP,
.bittiming_const = &xcan_bittiming_const, .bittiming_const = &xcan_bittiming_const,
.btr_ts2_shift = XCAN_BTR_TS2_SHIFT, .btr_ts2_shift = XCAN_BTR_TS2_SHIFT,
@ -1434,6 +1443,7 @@ static const struct xcan_devtype_data xcan_zynq_data = {
}; };
static const struct xcan_devtype_data xcan_axi_data = { static const struct xcan_devtype_data xcan_axi_data = {
.cantype = XAXI_CAN,
.flags = XCAN_FLAG_TXFEMP, .flags = XCAN_FLAG_TXFEMP,
.bittiming_const = &xcan_bittiming_const, .bittiming_const = &xcan_bittiming_const,
.btr_ts2_shift = XCAN_BTR_TS2_SHIFT, .btr_ts2_shift = XCAN_BTR_TS2_SHIFT,
@ -1442,6 +1452,7 @@ static const struct xcan_devtype_data xcan_axi_data = {
}; };
static const struct xcan_devtype_data xcan_canfd_data = { static const struct xcan_devtype_data xcan_canfd_data = {
.cantype = XAXI_CANFD,
.flags = XCAN_FLAG_EXT_FILTERS | .flags = XCAN_FLAG_EXT_FILTERS |
XCAN_FLAG_RXMNF | XCAN_FLAG_RXMNF |
XCAN_FLAG_TX_MAILBOXES | XCAN_FLAG_TX_MAILBOXES |
@ -1453,6 +1464,7 @@ static const struct xcan_devtype_data xcan_canfd_data = {
}; };
static const struct xcan_devtype_data xcan_canfd2_data = { static const struct xcan_devtype_data xcan_canfd2_data = {
.cantype = XAXI_CANFD_2_0,
.flags = XCAN_FLAG_EXT_FILTERS | .flags = XCAN_FLAG_EXT_FILTERS |
XCAN_FLAG_RXMNF | XCAN_FLAG_RXMNF |
XCAN_FLAG_TX_MAILBOXES | XCAN_FLAG_TX_MAILBOXES |