Merge 2d62c2bdfd82e5c57cab6984d9376c898986ff68 on remote branch

Change-Id: I0b7bc60183b37d5745dabca5c716f9cb22b3cf0c

BUILD.bazel

@@ -9,3 +9,6 @@ define_modules("blair", "gki")
 
 define_modules("pitti", "consolidate")
 define_modules("pitti", "gki")
+
+define_modules("volcano", "consolidate")
+define_modules("volcano", "gki")

nfc/common.c

@@ -497,6 +497,12 @@ int nfc_post_init(struct nfc_dev *nfc_dev)
 			__func__, nfc_gpio->dwl_req);
 	}
 
+	ret = configure_gpio(nfc_gpio->clkreq, GPIO_INPUT);
+	if (ret) {
+		pr_err("NxpDrv: %s: unable to request nfc clkreq gpio [%d]\n",
+			__func__, nfc_gpio->clkreq);
+	}
+
 	/* Read clkreq GPIO number from device tree*/
 	ret = of_property_read_u32_index(nfc_dev->i2c_dev.client->dev.of_node,
 						DTS_CLKREQ_GPIO_STR, 1, &clkreq_gpio);
@@ -505,6 +511,7 @@ int nfc_post_init(struct nfc_dev *nfc_dev)
 				 __func__, ret);
 		return ret;
 	}
+
 	/* configure clkreq GPIO as wakeup capable */
 	ret = msm_gpio_mpm_wake_set(clkreq_gpio, true);
 	if (ret < 0) {

nfc_kernel_dlkm_vendor_board.mk

@@ -12,11 +12,11 @@ endif
 
 ########## Build kernel module based on local DLKM flag status ##########
 ifeq ($(NFC_DLKM_ENABLED), true)
-ifeq ($(call is-board-platform-in-list, pineapple blair pitti),true)
+ifeq ($(call is-board-platform-in-list, pineapple blair pitti volcano),true)
   BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nxp-nci.ko
 endif
 endif
 
-ifeq ($(call is-board-platform-in-list, blair pitti),true)
+ifeq ($(call is-board-platform-in-list, blair pitti volcano),true)
 TARGET_ENABLE_PERIPHERAL_CONTROL := false
 endif