]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
net: can: xilinx_can: Add cantype parameter in xcan_devtype_data struct
authorAppana Durga Kedareswara rao <appana.durga.rao@xilinx.com>
Mon, 18 Mar 2019 07:41:14 +0000 (13:11 +0530)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 18 Mar 2019 14:57:32 +0000 (15:57 +0100)
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>
Acked-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
drivers/net/can/xilinx_can.c

index 22569eff39468acaa9ace1b6f2fb18622d104cdf..b45ece963e04336f6fce05234272722be248ec4a 100644 (file)
@@ -157,7 +157,15 @@ enum xcan_reg {
 #define XCAN_FLAG_RX_FIFO_MULTI        0x0010
 #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 {
+       enum xcan_ip_type cantype;
        unsigned int flags;
        const struct can_bittiming_const *bittiming_const;
        const char *bus_clk_name;
@@ -1428,6 +1436,7 @@ static const struct dev_pm_ops xcan_dev_pm_ops = {
 };
 
 static const struct xcan_devtype_data xcan_zynq_data = {
+       .cantype = XZYNQ_CANPS,
        .flags = XCAN_FLAG_TXFEMP,
        .bittiming_const = &xcan_bittiming_const,
        .btr_ts2_shift = XCAN_BTR_TS2_SHIFT,
@@ -1436,6 +1445,7 @@ static const struct xcan_devtype_data xcan_zynq_data = {
 };
 
 static const struct xcan_devtype_data xcan_axi_data = {
+       .cantype = XAXI_CAN,
        .flags = XCAN_FLAG_TXFEMP,
        .bittiming_const = &xcan_bittiming_const,
        .btr_ts2_shift = XCAN_BTR_TS2_SHIFT,
@@ -1444,6 +1454,7 @@ static const struct xcan_devtype_data xcan_axi_data = {
 };
 
 static const struct xcan_devtype_data xcan_canfd_data = {
+       .cantype = XAXI_CANFD,
        .flags = XCAN_FLAG_EXT_FILTERS |
                 XCAN_FLAG_RXMNF |
                 XCAN_FLAG_TX_MAILBOXES |
@@ -1455,6 +1466,7 @@ static const struct xcan_devtype_data xcan_canfd_data = {
 };
 
 static const struct xcan_devtype_data xcan_canfd2_data = {
+       .cantype = XAXI_CANFD_2_0,
        .flags = XCAN_FLAG_EXT_FILTERS |
                 XCAN_FLAG_RXMNF |
                 XCAN_FLAG_TX_MAILBOXES |