summaryrefslogtreecommitdiff
path: root/drivers/fpga/intel-m10-bmc-sec-update.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-09-21 16:42:42 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-09-21 16:42:42 +0300
commitcbb9a572f94be8da041e72a51a7f9968e63d837c (patch)
tree5a8b24b65df859564d0ee23959c672b4bc59d559 /drivers/fpga/intel-m10-bmc-sec-update.c
parentceecbbddbf549fe0b7ffa3804a6e255b3360030f (diff)
parent562d0bf2cab80810fa50a1f109a6bdb61c25efc2 (diff)
downloadlinux-cbb9a572f94be8da041e72a51a7f9968e63d837c.tar.xz
Merge tag 'fpga-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next
Xu writes: FPGA Manager changes for 6.1-rc1 DFL - Matthew's change adds new device IDs supported by DFL. - Dan's change uses array_size() for memory allocation to prevent potential overflow Microchip - Conor's change adds MODULE_AUTHOR entry for microchip-spi driver - Krzysztof's change refines dt-bindings Intel m10 bmc secure update - Russ's change adds new device ID supported by the driver All patches have been reviewed on the mailing list, and have been in the last linux-next releases (as part of our for-next branch). Signed-off-by: Xu Yilun <yilun.xu@intel.com> * tag 'fpga-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga: fpga: m10bmc-sec: d5005 bmc secure update driver fpga: prevent integer overflow in dfl_feature_ioctl_set_irq() dt-bindings: fpga: microchip,mpf-spi-fpga-mgr: use spi-peripheral-props.yaml fpga: microchip-spi: add missing module author entry fpga: dfl-pci: Add IDs for Intel N6000, N6001 and C6100 cards
Diffstat (limited to 'drivers/fpga/intel-m10-bmc-sec-update.c')
-rw-r--r--drivers/fpga/intel-m10-bmc-sec-update.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/fpga/intel-m10-bmc-sec-update.c b/drivers/fpga/intel-m10-bmc-sec-update.c
index 72c677c910de..526c8cdd1474 100644
--- a/drivers/fpga/intel-m10-bmc-sec-update.c
+++ b/drivers/fpga/intel-m10-bmc-sec-update.c
@@ -605,6 +605,9 @@ static const struct platform_device_id intel_m10bmc_sec_ids[] = {
{
.name = "n3000bmc-sec-update",
},
+ {
+ .name = "d5005bmc-sec-update",
+ },
{ }
};
MODULE_DEVICE_TABLE(platform, intel_m10bmc_sec_ids);