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

Commit 94de358e authored Oct 06, 2016 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Oct 06, 2016

Merge "defconfig: msm8909: Enable QPNP configs"

parents 5a203878 f547c99f

arch/arm/configs/msm8909-perf_defconfig

+4 −0

Original line number	Diff line number	Diff line
		@@ -271,11 +271,13 @@ CONFIG_SPI_QUP=y
		CONFIG_SPI_SPIDEV=m
		CONFIG_PINCTRL_MSM8909=y
		CONFIG_GPIO_SYSFS=y
		CONFIG_GPIO_QPNP_PIN=y
		CONFIG_POWER_SUPPLY=y
		CONFIG_SMB135X_CHARGER=y
		CONFIG_SMB1360_CHARGER_FG=y
		CONFIG_SMB358_CHARGER=y
		CONFIG_BATTERY_BCL=y
		CONFIG_QPNP_VM_BMS=y
		CONFIG_QPNP_LINEAR_CHARGER=y
		CONFIG_POWER_RESET=y
		CONFIG_POWER_RESET_MSM=y
		@@ -384,10 +386,12 @@ CONFIG_ION=y
		CONFIG_ION_MSM=y
		CONFIG_MSM_BUS_SCALING=y
		CONFIG_BUS_TOPOLOGY_ADHOC=y
		CONFIG_QPNP_POWER_ON=y
		CONFIG_QPNP_REVID=y
		CONFIG_SPS=y
		CONFIG_USB_BAM=y
		CONFIG_SPS_SUPPORT_NDP_BAM=y
		CONFIG_QPNP_VIBRATOR=y
		CONFIG_MSM_SPMI=y
		CONFIG_MSM_SPMI_PMIC_ARB=y
		CONFIG_MSM_QPNP_INT=y

arch/arm/configs/msm8909_defconfig

+4 −0

Original line number	Diff line number	Diff line
		@@ -282,11 +282,13 @@ CONFIG_SPI_SPIDEV=m
		CONFIG_PINCTRL_MSM8909=y
		CONFIG_DEBUG_GPIO=y
		CONFIG_GPIO_SYSFS=y
		CONFIG_GPIO_QPNP_PIN=y
		CONFIG_POWER_SUPPLY=y
		CONFIG_SMB135X_CHARGER=y
		CONFIG_SMB1360_CHARGER_FG=y
		CONFIG_SMB358_CHARGER=y
		CONFIG_BATTERY_BCL=y
		CONFIG_QPNP_VM_BMS=y
		CONFIG_QPNP_LINEAR_CHARGER=y
		CONFIG_POWER_RESET=y
		CONFIG_POWER_RESET_MSM=y
		@@ -397,10 +399,12 @@ CONFIG_ION=y
		CONFIG_ION_MSM=y
		CONFIG_MSM_BUS_SCALING=y
		CONFIG_BUS_TOPOLOGY_ADHOC=y
		CONFIG_QPNP_POWER_ON=y
		CONFIG_QPNP_REVID=y
		CONFIG_SPS=y
		CONFIG_USB_BAM=y
		CONFIG_SPS_SUPPORT_NDP_BAM=y
		CONFIG_QPNP_VIBRATOR=y
		CONFIG_MSM_SPMI=y
		CONFIG_MSM_SPMI_PMIC_ARB=y
		CONFIG_MSM_QPNP_INT=y