Merge "defconfig: mdm: Remove arch and pinctrl config changes" (dd82eed5) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/configs/mdm9640-perf_defconfig

+1 −4

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
		CONFIG_PARTITION_ADVANCED=y
		CONFIG_ARCH_MSM=y
		CONFIG_ARCH_MDM9640=y
		CONFIG_ARCH_MDMCALIFORNIUM=y
		CONFIG_PCI_MSM=y
		CONFIG_PREEMPT=y
		CONFIG_AEABI=y
		@@ -234,7 +233,7 @@ CONFIG_SOUNDWIRE=y
		CONFIG_SPI=y
		CONFIG_SPI_QUP=y
		CONFIG_SPI_SPIDEV=m
		CONFIG_PINCTRL_MDMCALIFORNIUM=y
		CONFIG_PINCTRL_MDM9640=y
		CONFIG_DEBUG_GPIO=y
		CONFIG_GPIO_SYSFS=y
		CONFIG_GPIO_QPNP_PIN=y
		@@ -257,7 +256,6 @@ CONFIG_REGULATOR_CPR=y
		CONFIG_SOUND=y
		CONFIG_SND=y
		CONFIG_SND_SOC=y
		CONFIG_SND_SOC_MDMCALIFORNIUM=y
		CONFIG_USB=y
		CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
		CONFIG_USB_XHCI_HCD=y
		@@ -324,7 +322,6 @@ CONFIG_RMNET_IPA3=y
		CONFIG_MSM_SPMI=y
		CONFIG_MSM_SPMI_PMIC_ARB=y
		CONFIG_MSM_QPNP_INT=y
		CONFIG_MSM_ADSP_LOADER=y
		CONFIG_MSM_MEMORY_DUMP_V2=y
		CONFIG_MSM_BOOT_STATS=y
		CONFIG_MSM_COMMON_LOG=y

+0 −5

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
		CONFIG_PARTITION_ADVANCED=y
		CONFIG_ARCH_MSM=y
		CONFIG_ARCH_MDM9640=y
		CONFIG_ARCH_MDMCALIFORNIUM=y
		CONFIG_PCI_MSM=y
		CONFIG_PREEMPT=y
		CONFIG_AEABI=y
		@@ -236,9 +235,7 @@ CONFIG_SPI_QUP=y
		CONFIG_SPI_SPIDEV=m
		CONFIG_PPS=y
		CONFIG_PPS_CLIENT_GPIO=y
		CONFIG_PINCTRL_MDM9607=y
		CONFIG_PINCTRL_MDM9640=y
		CONFIG_PINCTRL_MDMCALIFORNIUM=y
		CONFIG_DEBUG_GPIO=y
		CONFIG_GPIO_SYSFS=y
		CONFIG_GPIO_QPNP_PIN=y
		@@ -267,7 +264,6 @@ CONFIG_FB_MSM_QPIC_PANEL_DETECT=y
		CONFIG_SOUND=y
		CONFIG_SND=y
		CONFIG_SND_SOC=y
		CONFIG_SND_SOC_MDMCALIFORNIUM=y
		CONFIG_USB=y
		CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
		CONFIG_USB_XHCI_HCD=y
		@@ -339,7 +335,6 @@ CONFIG_RMNET_IPA3=y
		CONFIG_MSM_SPMI=y
		CONFIG_MSM_SPMI_PMIC_ARB=y
		CONFIG_MSM_QPNP_INT=y
		CONFIG_MSM_ADSP_LOADER=y
		CONFIG_MSM_MEMORY_DUMP_V2=y
		CONFIG_MSM_BOOT_STATS=y
		CONFIG_MSM_COMMON_LOG=y