Add NFC files

Zaheer-P · Feb 4, 2019 · df0515d · df0515d
1 parent 3cbcb9e
commit df0515d
Show file tree

Hide file tree

Showing 9 changed files with 1,257 additions and 11 deletions.
diff --git a/arch/arm64/configs/N1_defconfig b/arch/arm64/configs/N1_defconfig
@@ -576,9 +576,13 @@ CONFIG_GTP_DRIVER_SEND_CFG=y
 CONFIG_GTP_CUSTOM_CFG=y
 CONFIG_GTP_CREATE_WR_NODE=y
 
+CONFIG_MTK_NFC_SUPPORT=y
+
 CONFIG_DEBUG_KMEMLEAK=y
 CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=3200
 CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 
 CONFIG_MTK_RCU_MONITOR=y
+
+CONFIG_LOG_BUF_SHIFT=21
 # [hyperion70 add end]
diff --git a/drivers/input/fingerprint/Makefile b/drivers/input/fingerprint/Makefile
@@ -3,5 +3,5 @@
 #
 
 obj-$(CONFIG_GOODIX_FINGERPRINT) += goodix/
-obj-$(CONFIG_FPC_FINGERPRINT) += fpc/
+obj-$(CONFIG_GX556_FINGERPRINT) += gx556/
 
diff --git a/drivers/input/fingerprint/gx556/Kconfig b/drivers/input/fingerprint/gx556/Kconfig
@@ -1,7 +1,4 @@
 config FINGERPRINT_GT556
-	bool "gf5216(goodix fingerprint sensor)  for dewav"
+	bool "gt556(goodix fingerprint sensor)  for dewav"
 	default n
-	help
-	It support different type sensor
-	in this platform. If this option
-	is set, it will support fingerprint gf3208 silead sensor .
+
diff --git a/drivers/input/fingerprint/gx556/Makefile b/drivers/input/fingerprint/gx556/Makefile
@@ -1,6 +1,7 @@
 #include $(srctree)/drivers/misc/mediatek/Makefile.custom
 # Makefile for the fingerprint device.
 ccflags-y += -I$(srctree)/drivers/spi/mediatek/$(MTK_PLATFORM)
+ccflags-y += -I$(srctree)/drivers/misc/mediatek/include
 ccflags-y += -I$(srctree)/drivers/misc/mediatek/include/mt-plat
 ccflags-y += -I$(srctree)/drivers/misc/mediatek/include/mt-plat/$(MTK_PLATFORM)/include
 subdir-ccflags-y += -Werror

diff --git a/drivers/input/fingerprint/gx556/gf_spi.h b/drivers/input/fingerprint/gx556/gf_spi.h
@@ -5,8 +5,8 @@
 #include <linux/notifier.h>
 #include <linux/pm.h>
 
-
-#include "../../../../spi/mediatek/mt6757/mtk_spi.h"
+#include "mtk_spi.h"
+//#include "../../../../spi/mediatek/mt6757/mtk_spi.h"
 
 /**********************************************************/
 /**********************GF ops****************************/

diff --git a/drivers/misc/mediatek/nfc/mt6757/Makefile b/drivers/misc/mediatek/nfc/mt6757/Makefile
@@ -1,3 +1,8 @@
 
-obj-$(CONFIG_MTK_NFC_SUPPORT)   += mt6605.o
-ccflags-$(CONFIG_MTK_NFC_SUPPORT) +=  -DDEBUG
+ifeq ($(TARGET_BUILD_VARIANT),user)
+ccflags-y += -D_MTK_USER_
+endif
+
+#obj-$(CONFIG_MTK_NFC_SUPPORT)   += mt6605.o
+#ccflags-$(CONFIG_MTK_NFC_SUPPORT) +=  -DDEBUG
+obj-y += pn544.o