Commit 24929339 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-defconfig-5.11' of... 

Merge tag 'imx-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig

i.MX defconfig update for 5.11:

- A couple of patches that enable various i.MX audio drivers for i.MX8M.
- Enable more drivers that are useful on Librem 5 hardware.

* tag 'imx-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: Enable more Librem 5 hardware
  arm64: defconfig: Enable ASRC and EASRC
  arm64: defconfig: Enable additional sound drivers on i.MX8M Mini

Link: https://lore.kernel.org/r/20201202142717.9262-6-shawnguo@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1fe9c253 eecc662f

arch/arm64/configs/defconfig

+18 −0
Original line number Diff line number Diff line
@@ -243,6 +243,8 @@ CONFIG_HISILICON_LPC=y 
CONFIG_SIMPLE_PM_BUS=y

CONFIG_FSL_MC_BUS=y

CONFIG_TEGRA_ACONNECT=m

CONFIG_GNSS=m

CONFIG_GNSS_MTK_SERIAL=m

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y
@@ -384,6 +386,7 @@ CONFIG_KEYBOARD_IMX_SC_KEY=m 
CONFIG_KEYBOARD_CROS_EC=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=m

CONFIG_TOUCHSCREEN_EDT_FT5X06=m

CONFIG_INPUT_MISC=y

CONFIG_INPUT_PM8941_PWRKEY=y

CONFIG_INPUT_PM8XXX_VIBRATOR=m
@@ -529,6 +532,8 @@ CONFIG_SYSCON_REBOOT_MODE=y 
CONFIG_BATTERY_SBS=m

CONFIG_BATTERY_BQ27XXX=y

CONFIG_SENSORS_ARM_SCMI=y

CONFIG_BATTERY_MAX17042=m

CONFIG_CHARGER_BQ25980=m

CONFIG_SENSORS_ARM_SCPI=y

CONFIG_SENSORS_LM90=m

CONFIG_SENSORS_PWM_FAN=m
@@ -603,6 +608,7 @@ CONFIG_REGULATOR_QCOM_SMD_RPM=y 
CONFIG_REGULATOR_QCOM_SPMI=y

CONFIG_REGULATOR_RK808=y

CONFIG_REGULATOR_S2MPS11=y

CONFIG_REGULATOR_TPS65132=m

CONFIG_REGULATOR_VCTRL=m

CONFIG_RC_CORE=m

CONFIG_RC_DECODERS=y
@@ -663,6 +669,7 @@ CONFIG_DRM_MSM=m 
CONFIG_DRM_TEGRA=m

CONFIG_DRM_PANEL_LVDS=m

CONFIG_DRM_PANEL_SIMPLE=m

CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m

CONFIG_DRM_PANEL_RAYDIUM_RM67191=m

CONFIG_DRM_PANEL_SITRONIX_ST7703=m

CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m
@@ -677,6 +684,7 @@ CONFIG_DRM_I2C_ADV7511=m 
CONFIG_DRM_I2C_ADV7511_AUDIO=y

CONFIG_DRM_DW_HDMI_AHB_AUDIO=m

CONFIG_DRM_DW_HDMI_CEC=m

CONFIG_DRM_IMX_DCSS=m

CONFIG_DRM_VC4=m

CONFIG_DRM_ETNAVIV=m

CONFIG_DRM_HISI_HIBMC=m
@@ -702,6 +710,12 @@ CONFIG_SND_HDA_CODEC_HDMI=m 
CONFIG_SND_SOC=y

CONFIG_SND_BCM2835_SOC_I2S=m

CONFIG_SND_SOC_FSL_SAI=m

CONFIG_SND_SOC_FSL_ASRC=m

CONFIG_SND_SOC_FSL_MICFIL=m

CONFIG_SND_SOC_FSL_EASRC=m

CONFIG_SND_IMX_SOC=m

CONFIG_SND_SOC_IMX_SPDIF=m

CONFIG_SND_SOC_IMX_AUDMIX=m

CONFIG_SND_MESON_AXG_SOUND_CARD=m

CONFIG_SND_MESON_GX_SOUND_CARD=m

CONFIG_SND_SOC_QCOM=m
@@ -780,6 +794,7 @@ CONFIG_TYPEC=m 
CONFIG_TYPEC_TCPM=m

CONFIG_TYPEC_FUSB302=m

CONFIG_TYPEC_HD3SS3220=m

CONFIG_TYPEC_TPS6598X=m

CONFIG_MMC=y

CONFIG_MMC_BLOCK_MINORS=32

CONFIG_MMC_ARMMMCI=y
@@ -809,6 +824,7 @@ CONFIG_MMC_SDHCI_AM654=y 
CONFIG_MMC_OWL=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_LM3692X=m

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_PWM=y

CONFIG_LEDS_SYSCON=y
@@ -985,8 +1001,10 @@ CONFIG_QCOM_SPMI_ADC5=m 
CONFIG_ROCKCHIP_SARADC=m

CONFIG_IIO_CROS_EC_SENSORS_CORE=m

CONFIG_IIO_CROS_EC_SENSORS=m

CONFIG_IIO_ST_LSM6DSX=m

CONFIG_IIO_CROS_EC_LIGHT_PROX=m

CONFIG_SENSORS_ISL29018=m

CONFIG_VCNL4000=m

CONFIG_IIO_CROS_EC_BARO=m

CONFIG_MPL3115=m

CONFIG_PWM=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE