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

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

Merge "ASoC: Remove audio drivers from kernel"

parents f4d2bc58 d626c6a5

arch/arm/configs/sdxpoorwills-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ CONFIG_SERIO_LIBPS2=y 
CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_SOUNDWIRE=y

CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

arch/arm/configs/sdxpoorwills_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ CONFIG_SERIAL_MSM_CONSOLE=y 
CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_SOUNDWIRE=y

CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

arch/arm64/configs/sdm670-perf_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -290,7 +290,6 @@ CONFIG_MSM_ADSPRPC=y 
CONFIG_MSM_RDBG=m

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_QCOM_GENI=y

CONFIG_SOUNDWIRE=y

CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_QCOM_GENI=y
@@ -328,7 +327,6 @@ CONFIG_QTI_AOP_REG_COOLING_DEVICE=y 
CONFIG_QTI_QMI_COOLING_DEVICE=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_WCD9XXX_CODEC_CORE=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_CPRH_KBSS=y

CONFIG_REGULATOR_QPNP_LABIBB=y
@@ -366,6 +364,7 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_LINUX_VGA16 is not set

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_USB_AUDIO_QMI=y

CONFIG_SND_SOC=y

arch/arm64/configs/sdm670_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -295,7 +295,6 @@ CONFIG_HW_RANDOM_MSM_LEGACY=y 
CONFIG_MSM_ADSPRPC=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_QCOM_GENI=y

CONFIG_SOUNDWIRE=y

CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_QCOM_GENI=y
@@ -365,10 +364,10 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_LINUX_VGA16 is not set

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_USB_AUDIO_QMI=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_SDM845=y

CONFIG_UHID=y

CONFIG_HID_APPLE=y

CONFIG_HID_MICROSOFT=y
@@ -506,10 +505,8 @@ CONFIG_MSM_PIL_MSS_QDSP6V5=y 
CONFIG_ICNSS=y

CONFIG_ICNSS_DEBUG=y

CONFIG_QCOM_COMMAND_DB=y

CONFIG_MSM_ADSP_LOADER=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_CDSP_LOADER=y

CONFIG_MSM_AVTIMER=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_PM=y

CONFIG_MSM_QBT1000=y

arch/arm64/configs/sdm845-perf_defconfig

+1 −6
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ CONFIG_MSM_ADSPRPC=y 
CONFIG_MSM_RDBG=m

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_QCOM_GENI=y

CONFIG_SOUNDWIRE=y

CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_QCOM_GENI=y
@@ -340,7 +339,6 @@ CONFIG_QTI_QMI_COOLING_DEVICE=y 
CONFIG_REGULATOR_COOLING_DEVICE=y

CONFIG_MFD_I2C_PMIC=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_WCD9XXX_CODEC_CORE=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_PROXY_CONSUMER=y

CONFIG_REGULATOR_CPRH_KBSS=y
@@ -378,11 +376,10 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_LINUX_VGA16 is not set

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_DYNAMIC_MINORS=y

CONFIG_SND_USB_AUDIO=y

CONFIG_SND_USB_AUDIO_QMI=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_MACHINE_SDM845=y

CONFIG_SND_SOC_SDM845=y

CONFIG_UHID=y

CONFIG_HID_APPLE=y

CONFIG_HID_ELECOM=y
@@ -521,10 +518,8 @@ CONFIG_MSM_PIL_SSR_GENERIC=y 
CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_ICNSS=y

CONFIG_QCOM_COMMAND_DB=y

CONFIG_MSM_ADSP_LOADER=y

CONFIG_MSM_PERFORMANCE=y

CONFIG_MSM_CDSP_LOADER=y

CONFIG_MSM_AVTIMER=y

CONFIG_QCOM_SMCINVOKE=y

CONFIG_MSM_EVENT_TIMER=y

CONFIG_MSM_PM=y