From 346a46787c5a166abe820f21bbc217c9f01a19ec Mon Sep 17 00:00:00 2001 From: Khageswararao Rao B Date: Wed, 27 Mar 2024 22:22:41 +0530 Subject: [PATCH 1/2] Nfc driver: Configure clk request gpio Configured NFC clk request gpio as input gpio. Change-Id: I4fe970e109706e1c11cf38684a5fe2d0faa3088f Signed-off-by: Khageswararao Rao B --- nfc/common.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nfc/common.c b/nfc/common.c index b3f08038a6..c78d6d3a6c 100644 --- a/nfc/common.c +++ b/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) { From 2d62c2bdfd82e5c57cab6984d9376c898986ff68 Mon Sep 17 00:00:00 2001 From: Khageswararao Rao B Date: Wed, 10 Apr 2024 17:04:29 +0530 Subject: [PATCH 2/2] nfc driver: Enable NFC driver for volcano Enabled NFC driver to support volcano target. Change-Id: I4cc44d737fdb344df3d881c747785bd2461cfeef Signed-off-by: Khageswararao Rao B --- BUILD.bazel | 3 +++ nfc_kernel_dlkm_vendor_board.mk | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 786eaababc..8079cdcf6c 100644 --- a/BUILD.bazel +++ b/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") diff --git a/nfc_kernel_dlkm_vendor_board.mk b/nfc_kernel_dlkm_vendor_board.mk index d50b91b595..548400b0ef 100644 --- a/nfc_kernel_dlkm_vendor_board.mk +++ b/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