From 27989fc132fe3bec2b4887db9cd90ee22f1323da Mon Sep 17 00:00:00 2001 From: Devendar Date: Tue, 27 Jun 2023 10:29:01 +0530 Subject: [PATCH] blair: Disable secure peripheral framework for NFC Disabled secure peripheral feature on NFC for Strait target. Change-Id: I47b8d52d79a33f9189ba0d4c579b7085b697f293 Signed-off-by: Devendar --- include/uapi/linux/nfc/sn_uapi.h | 1 + nfc/ese_cold_reset.h | 2 +- nfc_kernel_dlkm_vendor_board.mk | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/include/uapi/linux/nfc/sn_uapi.h b/include/uapi/linux/nfc/sn_uapi.h index f89812e8b6..cc87bc449e 100644 --- a/include/uapi/linux/nfc/sn_uapi.h +++ b/include/uapi/linux/nfc/sn_uapi.h @@ -35,5 +35,6 @@ #define NFC_SET_RESET_READ_PENDING _IOW(NFC_MAGIC, 0x04, uint32_t) #define NFC_GET_GPIO_STATUS _IOR(NFC_MAGIC, 0x05, uint32_t) #define NFC_SECURE_ZONE _IOW(NFC_MAGIC, 0x0A, uint32_t) +#define ESE_COLD_RESET _IOWR(NFCC_MAGIC, 0x08, struct ese_ioctl_arg) #endif diff --git a/nfc/ese_cold_reset.h b/nfc/ese_cold_reset.h index 77e03b9ef3..4d3b811a70 100644 --- a/nfc/ese_cold_reset.h +++ b/nfc/ese_cold_reset.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef __ESE_COLD_RESET_H @@ -22,7 +23,6 @@ #define COLD_RESET_OID 0x1E #define COLD_RESET_PROT_OID 0x1F -#define ESE_COLD_RESET _IOWR(NFCC_MAGIC, 0x08, struct ese_ioctl_arg) enum ese_ioctl_arg_type { ESE_ARG_TYPE_COLD_RESET = 0, diff --git a/nfc_kernel_dlkm_vendor_board.mk b/nfc_kernel_dlkm_vendor_board.mk index 503d543e9f..59b4ff169a 100644 --- a/nfc_kernel_dlkm_vendor_board.mk +++ b/nfc_kernel_dlkm_vendor_board.mk @@ -3,3 +3,6 @@ ifeq ($(call is-board-platform-in-list, pineapple blair),true) BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/nxp-nci.ko endif +ifeq ($(call is-board-platform-in-list, blair),true) +TARGET_ENABLE_PERIPHERAL_CONTROL := false +endif