projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b21ba31)
qla2xxx: Add support to load firmware from file for ISP 26XX/27XX.
authorSawan Chandak <sawan.chandak@qlogic.com>
Thu, 9 Apr 2015 18:59:59 +0000 (14:59 -0400)
committerJames Bottomley <JBottomley@Odin.com>
Fri, 10 Apr 2015 15:41:50 +0000 (08:41 -0700)
Signed-off-by: Sawan Chandak <sawan.chandak@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
drivers/scsi/qla2xxx/Kconfig patch | blob | blame | history
drivers/scsi/qla2xxx/qla_os.c patch | blob | blame | history

diff --git a/drivers/scsi/qla2xxx/Kconfig b/drivers/scsi/qla2xxx/Kconfig
index 113e6c9826a1a96e17a6a36f0f7e8a0b6438ca7e..33f60c92e20e91ade58dbcb3537a1276a9d03ff4 100644 (file)
--- a/drivers/scsi/qla2xxx/Kconfig
+++ b/drivers/scsi/qla2xxx/Kconfig
@@ -18,6 +18,9 @@ config SCSI_QLA_FC
        2322, 6322        ql2322_fw.bin
        24xx, 54xx        ql2400_fw.bin
        25xx              ql2500_fw.bin
+       2031              ql2600_fw.bin
+       8031              ql8300_fw.bin
+       27xx              ql2700_fw.bin
 
        Upon request, the driver caches the firmware image until
        the driver is unloaded.
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index cce1cbc1a9276f4492d6efa16996313c00daabd6..e4851f863d20ebfe825ce7ea4cb7668b3ee552ba 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -5834,3 +5834,6 @@ MODULE_FIRMWARE(FW_FILE_ISP2300);
 MODULE_FIRMWARE(FW_FILE_ISP2322);
 MODULE_FIRMWARE(FW_FILE_ISP24XX);
 MODULE_FIRMWARE(FW_FILE_ISP25XX);
+MODULE_FIRMWARE(FW_FILE_ISP2031);
+MODULE_FIRMWARE(FW_FILE_ISP8031);
+MODULE_FIRMWARE(FW_FILE_ISP27XX);