From f3019fed920eb56dd992c73a634d47c8182d034e Mon Sep 17 00:00:00 2001 From: hyperion70 Date: Wed, 6 Mar 2019 17:53:08 +0300 Subject: [PATCH] Upd defconfig --- arch/arm64/configs/N1_defconfig | 40 +++++++++------------ arch/arm64/configs/N1_lineage_defconfig | 21 ++++++----- drivers/misc/mediatek/lens/main/main_lens.c | 6 +++- 3 files changed, 34 insertions(+), 33 deletions(-) diff --git a/arch/arm64/configs/N1_defconfig b/arch/arm64/configs/N1_defconfig index dc801f5fc..97802d5f3 100755 --- a/arch/arm64/configs/N1_defconfig +++ b/arch/arm64/configs/N1_defconfig @@ -12,7 +12,7 @@ CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_DEV_INITRD=y CONFIG_SYSCTL_SYSCALL=y CONFIG_EMBEDDED=y -CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_DEBUG is not set CONFIG_PROFILING=y # CONFIG_BLK_DEV_BSG is not set CONFIG_MACH_MT6757=y @@ -51,8 +51,6 @@ CONFIG_XFRM_USER=y CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_MIGRATE=y CONFIG_NET_KEY=y -CONFIG_IKCONFIG_PROC=y -CONFIG_IKCONFIG=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y @@ -195,7 +193,6 @@ CONFIG_RT5081_PMU_LDO=y CONFIG_RT5081_PMU_DSV=y CONFIG_MTK_CHARGER_INTERFACE=y CONFIG_MTK_THERMAL_PA_VIA_ATCMD=y -CONFIG_CUSTOM_KERNEL_CAM_CAL_DRV="BRCB032GWZ_3 GT24c32a cat24c16" CONFIG_MTK_CAM_CAL=y CONFIG_MTK_CMDQ=y CONFIG_MTK_FLASHLIGHT=y @@ -217,7 +214,6 @@ CONFIG_LCM_HEIGHT="1920" CONFIG_LCM_WIDTH="1080" # [liliwen end] CONFIG_MTK_LENS=y -CONFIG_MTK_LENS_DUMMYLENS_SUPPORT=y # [huangxiancong start] config af ic # CONFIG_MTK_LENS_BU64748AF_SUPPORT is not set # [huangxiancong end] @@ -246,7 +242,7 @@ CONFIG_MTK_BTIF=y CONFIG_MTK_MD1_SUPPORT=12 CONFIG_MTK_MD3_SUPPORT=2 CONFIG_MTK_C2K_LTE_MODE=2 -# CONFIG_MTK_IRAT_SUPPORT is not set +CONFIG_MTK_IRAT_SUPPORT=y CONFIG_MTK_COMBO=y CONFIG_MTK_COMBO_CHIP_CONSYS_6757=y CONFIG_MTK_COMBO_BT=y @@ -260,7 +256,9 @@ CONFIG_MTK_FM_CHIP="MT6625_FM" CONFIG_MTK_ECCCI_DRIVER=y CONFIG_MTK_ECCCI_C2K=y CONFIG_MTK_ACCDET=y -# CONFIG_ACCDET_EINT_IRQ=y +# CONFIG_ACCDET_EINT_IRQ is not set +CONFIG_ACCDET_EINT=y + CONFIG_MTK_DEBUG_LATCH=y CONFIG_MTK_DEVAPC_DRIVER=y CONFIG_MTK_DFD_INTERNAL_DUMP=y @@ -349,20 +347,20 @@ CONFIG_TOUCHSCREEN_MTK=y #CONFIG_TOUCHSCREEN_MTK_GT1151=y #CONFIG_GT1151_FIRMWARE="firmware2" #CONFIG_GT1151_CONFIG="config8" -CONFIG_GTP_DRIVER_SEND_CFG=y -CONFIG_GTP_CUSTOM_CFG=y +#CONFIG_GTP_DRIVER_SEND_CFG=y +#CONFIG_GTP_CUSTOM_CFG=y # CONFIG_GTP_HOTKNOT=y -CONFIG_GTP_AUTO_UPDATE=y +#CONFIG_GTP_AUTO_UPDATE=y # CONFIG_GTP_HEADER_FW_UPDATE=y -CONFIG_GTP_CREATE_WR_NODE=y +#CONFIG_GTP_CREATE_WR_NODE=y # CONFIG_GTP_POWER_CTRL_SLEEP=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y # CONFIG_SERIO is not set # CONFIG_VT is not set CONFIG_LEGACY_PTY_COUNT=16 -CONFIG_DEVMEM=y -CONFIG_DEVKMEM=y +# CONFIG_DEVMEM is not set +# CONFIG_DEVKMEM is not set CONFIG_SERIAL_MTK_EARLY_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y @@ -537,18 +535,17 @@ CONFIG_MTK_I2C_EXTENSION=y # [hyperion70 add start] ########################################################################### -CONFIG_KALLSYMS_ALL=y -CONFIG_SLABINFO=y -CONFIG_CFG80211_DEBUGFS=y -CONFIG_MTK_NET_LOGGING=y -CONFIG_MTK_ENG_BUILD=y +CONFIG_MTK_IRAT_SUPPORT=y CONFIG_MTK_FLASHLIGHT_PWM=y CONFIG_MTK_LENS_AK7371AF_SUPPORT=y CONFIG_MTK_LENS_BU6424AF_SUPPORT=y CONFIG_MTK_LENS_BU6429AF_SUPPORT=y CONFIG_MTK_LENS_LC898212XDAF_SUPPORT=y +CONFIG_MTK_LENS_DW9714AF_SUPPORT=y CONFIG_MTK_LENS_DW9763AF_SUPPORT=y +CONFIG_MTK_LENS_DUMMYLENS_SUPPORT=y + CONFIG_CUSTOM_KERNEL_ACCELEROMETER=y CONFIG_MTK_LSM6DS3HG=y @@ -562,6 +559,7 @@ CONFIG_MTK_QMCX983_NEW=y CONFIG_MTK_WAPI_SUPPORT=y CONFIG_ACCDET_EINT=y CONFIG_MTK_MEMCFG=y +CONFIG_CUSTOM_KERNEL_CAM_CAL_DRV="BRCB032GWZ_3 GT24c32a cat24c16" CONFIG_CUSTOM_KERNEL_IMGSENSOR="imx258_mipi_raw imx258_mipi_mono s5k3p3sx_mipi_raw" CONFIG_MTK_FINGERPRINT_SUPPORT=y @@ -580,12 +578,6 @@ 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/arch/arm64/configs/N1_lineage_defconfig b/arch/arm64/configs/N1_lineage_defconfig index 35c6fb789..97802d5f3 100755 --- a/arch/arm64/configs/N1_lineage_defconfig +++ b/arch/arm64/configs/N1_lineage_defconfig @@ -193,7 +193,6 @@ CONFIG_RT5081_PMU_LDO=y CONFIG_RT5081_PMU_DSV=y CONFIG_MTK_CHARGER_INTERFACE=y CONFIG_MTK_THERMAL_PA_VIA_ATCMD=y -CONFIG_CUSTOM_KERNEL_CAM_CAL_DRV="BRCB032GWZ_3 GT24c32a cat24c16" CONFIG_MTK_CAM_CAL=y CONFIG_MTK_CMDQ=y CONFIG_MTK_FLASHLIGHT=y @@ -215,7 +214,6 @@ CONFIG_LCM_HEIGHT="1920" CONFIG_LCM_WIDTH="1080" # [liliwen end] CONFIG_MTK_LENS=y -CONFIG_MTK_LENS_DUMMYLENS_SUPPORT=y # [huangxiancong start] config af ic # CONFIG_MTK_LENS_BU64748AF_SUPPORT is not set # [huangxiancong end] @@ -244,6 +242,7 @@ CONFIG_MTK_BTIF=y CONFIG_MTK_MD1_SUPPORT=12 CONFIG_MTK_MD3_SUPPORT=2 CONFIG_MTK_C2K_LTE_MODE=2 +CONFIG_MTK_IRAT_SUPPORT=y CONFIG_MTK_COMBO=y CONFIG_MTK_COMBO_CHIP_CONSYS_6757=y CONFIG_MTK_COMBO_BT=y @@ -257,7 +256,9 @@ CONFIG_MTK_FM_CHIP="MT6625_FM" CONFIG_MTK_ECCCI_DRIVER=y CONFIG_MTK_ECCCI_C2K=y CONFIG_MTK_ACCDET=y -# CONFIG_ACCDET_EINT_IRQ=y +# CONFIG_ACCDET_EINT_IRQ is not set +CONFIG_ACCDET_EINT=y + CONFIG_MTK_DEBUG_LATCH=y CONFIG_MTK_DEVAPC_DRIVER=y CONFIG_MTK_DFD_INTERNAL_DUMP=y @@ -346,12 +347,12 @@ CONFIG_TOUCHSCREEN_MTK=y #CONFIG_TOUCHSCREEN_MTK_GT1151=y #CONFIG_GT1151_FIRMWARE="firmware2" #CONFIG_GT1151_CONFIG="config8" -CONFIG_GTP_DRIVER_SEND_CFG=y -CONFIG_GTP_CUSTOM_CFG=y +#CONFIG_GTP_DRIVER_SEND_CFG=y +#CONFIG_GTP_CUSTOM_CFG=y # CONFIG_GTP_HOTKNOT=y -CONFIG_GTP_AUTO_UPDATE=y +#CONFIG_GTP_AUTO_UPDATE=y # CONFIG_GTP_HEADER_FW_UPDATE=y -CONFIG_GTP_CREATE_WR_NODE=y +#CONFIG_GTP_CREATE_WR_NODE=y # CONFIG_GTP_POWER_CTRL_SLEEP=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y @@ -541,7 +542,10 @@ CONFIG_MTK_LENS_AK7371AF_SUPPORT=y CONFIG_MTK_LENS_BU6424AF_SUPPORT=y CONFIG_MTK_LENS_BU6429AF_SUPPORT=y CONFIG_MTK_LENS_LC898212XDAF_SUPPORT=y +CONFIG_MTK_LENS_DW9714AF_SUPPORT=y CONFIG_MTK_LENS_DW9763AF_SUPPORT=y +CONFIG_MTK_LENS_DUMMYLENS_SUPPORT=y + CONFIG_CUSTOM_KERNEL_ACCELEROMETER=y CONFIG_MTK_LSM6DS3HG=y @@ -550,11 +554,12 @@ CONFIG_MTK_STK3X1X_NEW=y CONFIG_CUSTOM_KERNEL_GYROSCOPE=y CONFIG_MTK_LSM6DS3HGY=y -# CONFIG_MTK_QMCX983_NEW=y +CONFIG_MTK_QMCX983_NEW=y CONFIG_MTK_WAPI_SUPPORT=y CONFIG_ACCDET_EINT=y CONFIG_MTK_MEMCFG=y +CONFIG_CUSTOM_KERNEL_CAM_CAL_DRV="BRCB032GWZ_3 GT24c32a cat24c16" CONFIG_CUSTOM_KERNEL_IMGSENSOR="imx258_mipi_raw imx258_mipi_mono s5k3p3sx_mipi_raw" CONFIG_MTK_FINGERPRINT_SUPPORT=y diff --git a/drivers/misc/mediatek/lens/main/main_lens.c b/drivers/misc/mediatek/lens/main/main_lens.c index b53d28383..635d6c514 100755 --- a/drivers/misc/mediatek/lens/main/main_lens.c +++ b/drivers/misc/mediatek/lens/main/main_lens.c @@ -362,7 +362,7 @@ static int AF_i2c_probe(struct i2c_client *client, const struct i2c_device_id *i { int i4RetValue = 0; - LOG_INF("Start\n"); + LOG_INF("AF_i2c_probe Start\n"); /* Kirby: add new-style driver { */ g_pstAF_I2Cclient = client; @@ -386,6 +386,8 @@ static int AF_i2c_probe(struct i2c_client *client, const struct i2c_device_id *i static int AF_probe(struct platform_device *pdev) { + LOG_INF("MAIN AF_probe Start\n"); + return i2c_add_driver(&AF_i2c_driver); } @@ -425,6 +427,8 @@ static struct platform_device g_stAF_device = { static int __init MAINAF_i2C_init(void) { + LOG_INF("MAINAF_i2C_init Start\n"); + #if I2C_CONFIG_SETTING == 1 i2c_register_board_info(LENS_I2C_BUSNUM, &kd_lens_dev, 1); #endif