3 files changed, 34 insertions, 2 deletions
diff --git a/drivers/platform/Kconfig b/drivers/platform/Kconfig
index d208ab5546c8..e7b128d150be 100644
--- a/drivers/platform/Kconfig
+++ b/drivers/platform/Kconfig
@@ -9,3 +9,7 @@ source "drivers/platform/goldfish/Kconfig"
 source "drivers/platform/chrome/Kconfig"
 
 source "drivers/platform/msm/Kconfig"
+
+if ARCH_QCOM
+source "drivers/platform/zuk/Kconfig"
+endif
diff --git a/drivers/platform/msm/usb_bam.c b/drivers/platform/msm/usb_bam.c
index b1d9211e09df..0ef9d78924fa 100644
--- a/drivers/platform/msm/usb_bam.c
+++ b/drivers/platform/msm/usb_bam.c
@@ -1268,7 +1268,7 @@ static inline int all_pipes_suspended(enum usb_ctrl cur_bam)
 	return info[cur_bam].pipes_suspended == ctx->pipes_enabled_per_bam;
 }
 
-static void usb_bam_finish_suspend(enum usb_ctrl cur_bam)
+static void usb_bam_finish_suspend(int cur_bam)
 {
 	int ret, bam2bam;
 	u32 cons_empty, idx, dst_idx;
@@ -1395,7 +1395,7 @@ no_lpm:
 
 void usb_bam_finish_suspend_(struct work_struct *w)
 {
-	enum usb_ctrl cur_bam;
+	int cur_bam;
 	struct usb_bam_ipa_handshake_info *info_ptr;
 
 	info_ptr = container_of(w, struct usb_bam_ipa_handshake_info,
diff --git a/drivers/platform/zuk/Kconfig b/drivers/platform/zuk/Kconfig
new file mode 100644
index 000000000000..6d0b8a169562
--- /dev/null
+++ b/drivers/platform/zuk/Kconfig
@@ -0,0 +1,28 @@
+# Zuk configuration options
+
+config MACH_ZUK
+	bool "ZUK device"
+	depends on ARCH_QCOM
+	help
+	  Support for Zuk products
+
+config MACH_ZUK_MSM8996
+	bool "ZUK MSM8996"
+	depends on MACH_ZUK
+	help
+	  Support for MSM8996 Zuk variants
+
+menu "Zuk board selection"
+
+	config MACH_ZUK_Z2_PLUS
+		bool "ZUK_Z2_Plus_board"
+		depends on MACH_ZUK_MSM8996
+		help
+		  Support for Zuk Z2 Plus variant
+
+	config MACH_ZUK_Z2_ROW
+		bool "ZUK_Z2_ROW_board"
+		depends on MACH_ZUK_MSM8996
+		help
+		  Support for Zuk Z2_ROW variant
+endmenu