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

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

Merge "defconfig: mdm: Enable options needed for mdm9x50 CCARD boards"

parents 68c9d68d 4e5df1a2

arch/arm/configs/mdm-perf_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ CONFIG_VFP=y 
CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_AUTOSLEEP=y

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_DISABLE_NET_SKB_FRAG_CACHE=y
@@ -144,6 +146,7 @@ CONFIG_BRIDGE_EBT_ARPREPLY=y 
CONFIG_BRIDGE_EBT_DNAT=y

CONFIG_BRIDGE_EBT_SNAT=y

CONFIG_BRIDGE=y

CONFIG_VLAN_8021Q=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_PRIO=y

CONFIG_RMNET_DATA=y
@@ -238,6 +241,7 @@ CONFIG_SOUNDWIRE=y 
CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

CONFIG_PTP_1588_CLOCK=y

CONFIG_PINCTRL_MDMCALIFORNIUM=y

CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y
@@ -316,6 +320,7 @@ CONFIG_UIO=y 
CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_MSM_BUS_SCALING=y
@@ -330,6 +335,7 @@ CONFIG_IPA3=y 
CONFIG_GSI=y

CONFIG_RMNET_IPA=y

CONFIG_RMNET_IPA3=y

CONFIG_GPIO_USB_DETECT=y

# CONFIG_MSM_11AD is not set

CONFIG_MSM_SPMI=y

CONFIG_MSM_SPMI_PMIC_ARB=y
@@ -365,6 +371,9 @@ CONFIG_TRACER_PKT=y 
CONFIG_MSM_BAM_DMUX=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_DEVFREQ_SPDM=y

CONFIG_IIO=y

CONFIG_IIO_ST_ACCEL_3AXIS=y

CONFIG_IIO_ST_GYRO_3AXIS=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_CORESIGHT=y

arch/arm/configs/mdm_defconfig

+9 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ CONFIG_VFP=y 
CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_AUTOSLEEP=y

CONFIG_PM_WAKELOCKS=y

CONFIG_PM_WAKELOCKS_LIMIT=0

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_DISABLE_NET_SKB_FRAG_CACHE=y
@@ -144,6 +146,7 @@ CONFIG_BRIDGE_EBT_ARPREPLY=y 
CONFIG_BRIDGE_EBT_DNAT=y

CONFIG_BRIDGE_EBT_SNAT=y

CONFIG_BRIDGE=y

CONFIG_VLAN_8021Q=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_PRIO=y

CONFIG_RMNET_DATA=y
@@ -239,6 +242,7 @@ CONFIG_SOUNDWIRE=y 
CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

CONFIG_PTP_1588_CLOCK=y

CONFIG_PINCTRL_MDM9607=y

CONFIG_PINCTRL_MDM9640=y

CONFIG_PINCTRL_MDMCALIFORNIUM=y
@@ -327,6 +331,7 @@ CONFIG_UIO=y 
CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y

CONFIG_ANDROID=y

CONFIG_ANDROID_BINDER_IPC=y

CONFIG_SYNC=y

CONFIG_SW_SYNC=y

CONFIG_ION=y
@@ -344,6 +349,7 @@ CONFIG_GSI=y 
CONFIG_RMNET_IPA=y

CONFIG_RMNET_IPA3=y

CONFIG_IPA_UT=y

CONFIG_GPIO_USB_DETECT=y

# CONFIG_MSM_11AD is not set

CONFIG_MSM_SPMI=y

CONFIG_MSM_SPMI_PMIC_ARB=y
@@ -379,6 +385,9 @@ CONFIG_TRACER_PKT=y 
CONFIG_MSM_BAM_DMUX=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_DEVFREQ_SPDM=y

CONFIG_IIO=y

CONFIG_IIO_ST_ACCEL_3AXIS=y

CONFIG_IIO_ST_GYRO_3AXIS=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_CORESIGHT=y

drivers/iio/imu/bmi160/Makefile

+2 −2
Original line number Diff line number Diff line 
#

#Makefile for BMI160 IIO Driver

#

obj-y   += bmi160_i2c.o bmi160_core.o bmi160.o 

obj-y   += bmi160_ring.o

obj-${CONFIG_SENSORS_BMI160_IIO}   += bmi160_i2c.o bmi160_core.o bmi160.o

obj-${CONFIG_SENSORS_BMI160_IIO_RING}   += bmi160_ring.o



EXTRA_CFLAGS += -DBMI160_ENABLE_INT1