diff options
| author | Gerhard Uttenthaler <uttenthaler@ems-wuensche.com> | 2023-01-20 12:26:13 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2023-02-02 17:33:47 +0100 |
| commit | 79ca81e700f4c171e21aeaf1a1d29dfcdb961d75 (patch) | |
| tree | 6395e8bb014807ea8d9d8599ab41455160bbcf50 /drivers/net/can | |
| parent | bb89159ce33101abeabd0d67309cf6bdd7691aaa (diff) | |
| download | linux-stable-79ca81e700f4c171e21aeaf1a1d29dfcdb961d75.tar.gz linux-stable-79ca81e700f4c171e21aeaf1a1d29dfcdb961d75.tar.bz2 linux-stable-79ca81e700f4c171e21aeaf1a1d29dfcdb961d75.zip | |
can: ems_pci: Initialize CAN controller base addresses
Add CAN controller base registers
Signed-off-by: Gerhard Uttenthaler <uttenthaler@ems-wuensche.com>
Link: https://lore.kernel.org/all/20230120112616.6071-6-uttenthaler@ems-wuensche.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/sja1000/ems_pci.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c index 0d6289fda447..d1e8758d8043 100644 --- a/drivers/net/can/sja1000/ems_pci.c +++ b/drivers/net/can/sja1000/ems_pci.c @@ -342,20 +342,25 @@ static int ems_pci_add_card(struct pci_dev *pdev, priv->irq_flags = IRQF_SHARED; dev->irq = pdev->irq; - priv->reg_base = card->base_addr + EMS_PCI_CAN_BASE_OFFSET - + (i * EMS_PCI_CAN_CTRL_SIZE); + if (card->version == 1) { priv->read_reg = ems_pci_v1_read_reg; priv->write_reg = ems_pci_v1_write_reg; priv->post_irq = ems_pci_v1_post_irq; + priv->reg_base = card->base_addr + EMS_PCI_V1_CAN_BASE_OFFSET + + (i * EMS_PCI_V1_CAN_CTRL_SIZE); } else if (card->version == 2) { priv->read_reg = ems_pci_v2_read_reg; priv->write_reg = ems_pci_v2_write_reg; priv->post_irq = ems_pci_v2_post_irq; + priv->reg_base = card->base_addr + EMS_PCI_V2_CAN_BASE_OFFSET + + (i * EMS_PCI_V2_CAN_CTRL_SIZE); } else { priv->read_reg = ems_pci_v3_read_reg; priv->write_reg = ems_pci_v3_write_reg; priv->post_irq = ems_pci_v3_post_irq; + priv->reg_base = card->base_addr + EMS_PCI_V3_CAN_BASE_OFFSET + + (i * EMS_PCI_V3_CAN_CTRL_SIZE); } /* Check if channel is present */ |