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

Commit b204cda8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: resovle audio can't work and optimize perf config"

parents bc645e59 04c05da8

arch/arm/configs/spyro-perf_defconfig

+3 −4
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ CONFIG_RCU_NOCB_CPU=y 
CONFIG_RCU_NOCB_CPU_ALL=y

CONFIG_LOG_BUF_SHIFT=15

CONFIG_LOG_CPU_MAX_BUF_SHIFT=13

CONFIG_CGROUP_FREEZER=y

CONFIG_CPUSETS=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_SCHEDTUNE=y
@@ -165,7 +164,6 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y 
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y

CONFIG_NETFILTER_XT_MATCH_POLICY=y

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

CONFIG_NETFILTER_XT_MATCH_QTAGUID=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

CONFIG_NETFILTER_XT_MATCH_SOCKET=y
@@ -245,6 +243,8 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 
CONFIG_HDCP_QSEECOM=y

CONFIG_QSEECOM=y

CONFIG_UID_SYS_STATS=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y
@@ -327,7 +327,6 @@ CONFIG_SPI_QUP=y 
CONFIG_SPI_SPIDEV=y

CONFIG_SLIMBUS_MSM_NGD=y

CONFIG_SPMI=y

CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSM8917=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
@@ -444,6 +443,7 @@ CONFIG_USB_EHCI_HCD=y 
CONFIG_USB_EHCI_MSM=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_ACM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_SERIAL=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_NOP_USB_XCEIV=y
@@ -567,7 +567,6 @@ CONFIG_PWM=y 
CONFIG_PWM_QPNP=y

CONFIG_PWM_QTI_LPG=y

CONFIG_QTI_MPM=y

CONFIG_PHY_QCOM_UFS=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ANDROID_BINDER_IPC_32BIT=y

arch/arm/configs/spyro_defconfig

+8 −0
Original line number Diff line number Diff line
@@ -249,6 +249,8 @@ CONFIG_BLK_DEV_RAM_SIZE=8192 
CONFIG_HDCP_QSEECOM=y

CONFIG_QSEECOM=y

CONFIG_UID_SYS_STATS=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=y
@@ -341,6 +343,7 @@ CONFIG_GPIO_QPNP_PIN=y 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_FG=y

CONFIG_SMB135X_CHARGER=y
@@ -372,7 +375,10 @@ CONFIG_REGULATOR=y 
CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_PROXY_CONSUMER=y

CONFIG_REGULATOR_CPR=y

CONFIG_REGULATOR_CPR4_APSS=y

CONFIG_REGULATOR_CPRH_KBSS=y

CONFIG_REGULATOR_MEM_ACC=y

CONFIG_REGULATOR_MSM_GFX_LDO=y

CONFIG_REGULATOR_QPNP_LABIBB=y

CONFIG_REGULATOR_QPNP_LCDB=y

CONFIG_REGULATOR_QPNP=y
@@ -445,6 +451,7 @@ CONFIG_USB_EHCI_HCD=y 
CONFIG_USB_EHCI_MSM=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_ACM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_SERIAL=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_NOP_USB_XCEIV=y
@@ -552,6 +559,7 @@ CONFIG_MSM_SYSMON_COMM=y 
CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_SSR_GENERIC=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_ICNSS=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_AVTIMER=y