Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abde0222 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: sdm660: Enable CONFIG_HID_NINTENDO for sdm660"

parents 0f10e803 de64739e

arch/arm64/configs/vendor/sdm660-perf_defconfig

+8 −5
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ CONFIG_RCU_FAST_NO_HZ=y 
CONFIG_RCU_NOCB_CPU=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKHEADERS=y

CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y
@@ -41,6 +41,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
# CONFIG_FHANDLE is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_BPF_SYSCALL=y

CONFIG_BPF_JIT_ALWAYS_ON=y

CONFIG_EMBEDDED=y

# CONFIG_SLUB_DEBUG is not set

# CONFIG_COMPAT_BRK is not set
@@ -67,7 +68,6 @@ CONFIG_ARM64_SW_TTBR0_PAN=y 
# CONFIG_ARM64_VHE is not set

CONFIG_RANDOMIZE_BASE=y

CONFIG_COMPAT=y

CONFIG_PM_AUTOSLEEP=y

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set
@@ -95,7 +95,6 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS=16 
CONFIG_PANIC_ON_REFCOUNT_ERROR=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_FORCE=y
@@ -265,6 +264,7 @@ CONFIG_NET_ACT_SKBEDIT=y 
CONFIG_DNS_RESOLVER=y

CONFIG_QRTR=y

CONFIG_QRTR_SMD=y

CONFIG_BPF_JIT=y

CONFIG_SOCKEV_NLMCAST=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y
@@ -277,6 +277,7 @@ CONFIG_RFKILL=y 
CONFIG_NFC_NQ=y

CONFIG_FW_LOADER_USER_HELPER=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

# CONFIG_FW_CACHE is not set

CONFIG_REGMAP_WCD_IRQ=y

CONFIG_DMA_CMA=y

CONFIG_MTD=m
@@ -318,6 +319,7 @@ CONFIG_NETDEVICES=y 
CONFIG_BONDING=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_VETH=y

CONFIG_SKY2=y

CONFIG_RMNET=y

CONFIG_SMSC911X=y
@@ -343,6 +345,7 @@ CONFIG_INPUT_KEYRESET=y 
CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX is not set

# CONFIG_TOUCHSCREEN_SYNAPTICS_TCM is not set
@@ -457,9 +460,9 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_NINTENDO=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_SONY=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y
@@ -632,6 +635,7 @@ CONFIG_QCOM_L2_COUNTERS=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ANDROID_BINDERFS=y

CONFIG_QCOM_QFPROM=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SLIMBUS_MSM_NGD=y
@@ -674,7 +678,6 @@ CONFIG_SECURITY_SELINUX=y 
CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_DEV_QCE=y

arch/arm64/configs/vendor/sdm660_defconfig

+8 −5
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ CONFIG_RCU_FAST_NO_HZ=y 
CONFIG_RCU_NOCB_CPU=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKHEADERS=y

CONFIG_LOG_CPU_MAX_BUF_SHIFT=17

CONFIG_MEMCG=y

CONFIG_MEMCG_SWAP=y

CONFIG_BLK_CGROUP=y

CONFIG_DEBUG_BLK_CGROUP=y

CONFIG_RT_GROUP_SCHED=y

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y
@@ -42,6 +42,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y 
# CONFIG_FHANDLE is not set

CONFIG_KALLSYMS_ALL=y

CONFIG_BPF_SYSCALL=y

CONFIG_BPF_JIT_ALWAYS_ON=y

CONFIG_EMBEDDED=y

# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB_FREELIST_RANDOM=y
@@ -67,7 +68,6 @@ CONFIG_ARM64_SW_TTBR0_PAN=y 
# CONFIG_ARM64_VHE is not set

CONFIG_RANDOMIZE_BASE=y

CONFIG_COMPAT=y

CONFIG_PM_AUTOSLEEP=y

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

# CONFIG_PM_WAKELOCKS_GC is not set
@@ -97,7 +97,6 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS=16 
CONFIG_PANIC_ON_REFCOUNT_ERROR=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

CONFIG_MODULE_SIG=y

CONFIG_MODULE_SIG_FORCE=y
@@ -272,6 +271,7 @@ CONFIG_NET_ACT_SKBEDIT=y 
CONFIG_DNS_RESOLVER=y

CONFIG_QRTR=y

CONFIG_QRTR_SMD=y

CONFIG_BPF_JIT=y

CONFIG_SOCKEV_NLMCAST=y

CONFIG_BT=y

CONFIG_MSM_BT_POWER=y
@@ -285,6 +285,7 @@ CONFIG_RFKILL=y 
CONFIG_NFC_NQ=y

CONFIG_FW_LOADER_USER_HELPER=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

# CONFIG_FW_CACHE is not set

CONFIG_REGMAP_WCD_IRQ=y

CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y

CONFIG_DMA_CMA=y
@@ -328,6 +329,7 @@ CONFIG_NETDEVICES=y 
CONFIG_BONDING=y

CONFIG_DUMMY=y

CONFIG_TUN=y

CONFIG_VETH=y

CONFIG_RMNET=y

CONFIG_PPP=y

CONFIG_PPP_BSDCOMP=y
@@ -351,6 +353,7 @@ CONFIG_INPUT_KEYRESET=y 
CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_TOUCHSCREEN_SYNAPTICS_DSX is not set

# CONFIG_TOUCHSCREEN_SYNAPTICS_TCM is not set
@@ -486,9 +489,9 @@ CONFIG_HID_ELECOM=y 
CONFIG_HID_MAGICMOUSE=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_NINTENDO=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_SONY=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y
@@ -671,6 +674,7 @@ CONFIG_QCOM_L2_COUNTERS=y 
CONFIG_RAS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ANDROID_BINDERFS=y

CONFIG_QCOM_QFPROM=y

CONFIG_NVMEM_SPMI_SDAM=y

CONFIG_SLIMBUS_MSM_NGD=y
@@ -715,7 +719,6 @@ CONFIG_SECURITY_SELINUX=y 
CONFIG_SECURITY_SMACK=y

CONFIG_CRYPTO_GCM=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_MD4=y

CONFIG_CRYPTO_TWOFISH=y

CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_CRYPTO_DEV_QCE=y