[PATCH v1 1/1] misc: bcm-vk: add kconfig for supporting viper chip

[Desmond Yan <desmond.yan@broadcom.com>]

[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]

Add kconfig for enabling bcm-vk driver to support the viper chip.
Default is off and only explicitly configured that the viper chip
would be discovered by the driver and loaded for usage.

Tested-by: Desmond Yan <desmond.yan@broadcom.com>
Signed-off-by: Desmond Yan <desmond.yan@broadcom.com>
---
 drivers/misc/bcm-vk/Kconfig      | 10 ++++++++++
 drivers/misc/bcm-vk/bcm_vk_dev.c |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/drivers/misc/bcm-vk/Kconfig b/drivers/misc/bcm-vk/Kconfig
index 68a972772b99..43910a378163 100644
--- a/drivers/misc/bcm-vk/Kconfig
+++ b/drivers/misc/bcm-vk/Kconfig
@@ -16,6 +16,16 @@ config BCM_VK
 
 	  If unsure, say N.
 
+config BCM_VK_VIPER
+	bool "VK driver for VIPER"
+	depends on BCM_VK
+	help
+	  Turn on to enable using the vk driver for the viper variant.
+	  Used for development environments where viper uses VK driver
+	  and VK firmware rather than an alternate firmware and driver.
+
+	  If unsure, say N.
+
 config BCM_VK_TTY
 	bool "Enable tty ports on a Broadcom VK Accelerator device"
 	depends on TTY
diff --git a/drivers/misc/bcm-vk/bcm_vk_dev.c b/drivers/misc/bcm-vk/bcm_vk_dev.c
index ad639ee85b2a..41dbfa4fa4a5 100644
--- a/drivers/misc/bcm-vk/bcm_vk_dev.c
+++ b/drivers/misc/bcm-vk/bcm_vk_dev.c
@@ -1633,7 +1633,9 @@ static void bcm_vk_shutdown(struct pci_dev *pdev)
 
 static const struct pci_device_id bcm_vk_ids[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_VALKYRIE), },
+#if defined(CONFIG_BCM_VK_VIPER)
 	{ PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_VIPER), },
+#endif
 	{ }
 };
 MODULE_DEVICE_TABLE(pci, bcm_vk_ids);
-- 
2.17.1


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4206 bytes --]