diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2024-03-21 12:59:04 +0100 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2024-03-21 12:59:04 +0100 |
| commit | f411e25005928a6fd3e390a01059e1dabf3aec2b (patch) | |
| tree | b5f1b8a55448e0c2c506d9cff8297aaa62acc925 | |
| parent | e4137851d4863a9bdc6aabc613bcb46c06d91e64 (diff) | |
| parent | af1752ecdc9c665b72fbe2cef9035a6cba34b473 (diff) | |
| download | linux-f411e25005928a6fd3e390a01059e1dabf3aec2b.tar.gz | |
Merge tag 'linux-can-fixes-for-6.9-20240319' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2024-03-20
this is a pull request of 1 patch for net/master.
Martin Jocić contributes a fix for the kvaser_pciefd driver, so that
up to 8 channels on the Xilinx-based adapters can be used. This issue
has been introduced in net-next for v6.9.
linux-can-fixes-for-6.9-20240319
* tag 'linux-can-fixes-for-6.9-20240319' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
can: kvaser_pciefd: Add additional Xilinx interrupts
====================
Link: https://lore.kernel.org/r/20240320112144.582741-1-mkl@pengutronix.de
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
| -rw-r--r-- | drivers/net/can/kvaser_pciefd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/kvaser_pciefd.c b/drivers/net/can/kvaser_pciefd.c index f81b598147b306..7b5028b67cd5cb 100644 --- a/drivers/net/can/kvaser_pciefd.c +++ b/drivers/net/can/kvaser_pciefd.c @@ -370,8 +370,8 @@ static const struct kvaser_pciefd_irq_mask kvaser_pciefd_sf2_irq_mask = { static const struct kvaser_pciefd_irq_mask kvaser_pciefd_xilinx_irq_mask = { .kcan_rx0 = BIT(4), - .kcan_tx = { BIT(16), BIT(17), BIT(18), BIT(19) }, - .all = GENMASK(19, 16) | BIT(4), + .kcan_tx = { BIT(16), BIT(17), BIT(18), BIT(19), BIT(20), BIT(21), BIT(22), BIT(23) }, + .all = GENMASK(23, 16) | BIT(4), }; static const struct kvaser_pciefd_dev_ops kvaser_pciefd_altera_dev_ops = { |