diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-03 23:06:28 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-03 23:06:28 +0200 |
commit | 675c6a984e300e78faa7bb46613000a172e744e5 (patch) | |
tree | d25b9eab67e56c99def6a8ffde3d073be39683a6 /kernel-armv7hl-fedora.config | |
parent | 16f5fa6eeeaf1543fe106ee66d5b06d06b5474e7 (diff) | |
parent | 2703d9b16cc4a0cf8b5c25c8af390663092f455b (diff) | |
download | kernel-675c6a984e300e78faa7bb46613000a172e744e5.tar.gz kernel-675c6a984e300e78faa7bb46613000a172e744e5.tar.xz kernel-675c6a984e300e78faa7bb46613000a172e744e5.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc0.git5.1.vanilla.knurd.1.fc33kernel-5.7.0-0.rc0.git5.1.vanilla.knurd.1.fc32kernel-5.7.0-0.rc0.git5.1.vanilla.knurd.1.fc31kernel-5.7.0-0.rc0.git5.1.vanilla.knurd.1.fc30
Diffstat (limited to 'kernel-armv7hl-fedora.config')
-rw-r--r-- | kernel-armv7hl-fedora.config | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 0e89f555c..37ceb47b3 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -4507,6 +4507,7 @@ CONFIG_OMAP_IOMMU=y CONFIG_OMAP_MBOX_KFIFO_SIZE=256 CONFIG_OMAP_OCP2SCP=m CONFIG_OMAP_REMOTEPROC=m +CONFIG_OMAP_REMOTEPROC_WATCHDOG=y CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_USB2=m CONFIG_OMAP_WATCHDOG=m @@ -4769,7 +4770,12 @@ CONFIG_PINCTRL_DOVE=y # CONFIG_PINCTRL_EQUILIBRIUM is not set # CONFIG_PINCTRL_GEMINILAKE is not set CONFIG_PINCTRL_IMX6SL=y +CONFIG_PINCTRL_IMX8MM=y +CONFIG_PINCTRL_IMX8MN=y +# CONFIG_PINCTRL_IMX8MP is not set +CONFIG_PINCTRL_IMX8MQ=y # CONFIG_PINCTRL_IPQ4019 is not set +# CONFIG_PINCTRL_IPQ6018 is not set # CONFIG_PINCTRL_IPQ8064 is not set # CONFIG_PINCTRL_IPQ8074 is not set # CONFIG_PINCTRL_MCP23S08 is not set @@ -6024,6 +6030,7 @@ CONFIG_SND_AZT3328=m CONFIG_SND_BCD2000=m CONFIG_SND_BCM2835=m CONFIG_SND_BCM2835_SOC_I2S=m +# CONFIG_SND_BCM63XX_I2S_WHISTLER is not set CONFIG_SND_BEBOB=m CONFIG_SND_BT87X=m # CONFIG_SND_BT87X_OVERCLOCK is not set @@ -6117,6 +6124,7 @@ CONFIG_SND=m CONFIG_SND_MAESTRO3_INPUT=y CONFIG_SND_MAESTRO3=m CONFIG_SND_MAX_CARDS=32 +CONFIG_SND_MESON_AIU=m # CONFIG_SND_MESON_AXG_FRDDR is not set # CONFIG_SND_MESON_AXG_PDM is not set # CONFIG_SND_MESON_AXG_SOUND_CARD is not set @@ -6125,7 +6133,9 @@ CONFIG_SND_MAX_CARDS=32 # CONFIG_SND_MESON_AXG_TDMIN is not set # CONFIG_SND_MESON_AXG_TDMOUT is not set # CONFIG_SND_MESON_AXG_TODDR is not set +CONFIG_SND_MESON_G12A_TOACODEC=m CONFIG_SND_MESON_G12A_TOHDMITX=m +CONFIG_SND_MESON_GX_SOUND_CARD=m CONFIG_SND_MIA=m CONFIG_SND_MIXART=m CONFIG_SND_MIXER_OSS=m @@ -6259,6 +6269,7 @@ CONFIG_SND_SOC_MAX98373=m # CONFIG_SND_SOC_MAX9860 is not set CONFIG_SND_SOC_MAX9867=m CONFIG_SND_SOC_MAX98927=m +CONFIG_SND_SOC_MESON_T9015=m # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m # CONFIG_SND_SOC_MT6351 is not set @@ -6307,6 +6318,7 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m # CONFIG_SND_SOC_RT5616 is not set CONFIG_SND_SOC_RT5631=m CONFIG_SND_SOC_RT5660=m +CONFIG_SND_SOC_RT5682_SDW=m # CONFIG_SND_SOC_RT700_SDW is not set # CONFIG_SND_SOC_RT711_SDW is not set # CONFIG_SND_SOC_RT715_SDW is not set @@ -6320,6 +6332,7 @@ CONFIG_SND_SOC_SMDK_WM8994_PCM=m CONFIG_SND_SOC_SNOW=m CONFIG_SND_SOC_SOF_ACPI=m # CONFIG_SND_SOC_SOF_DEBUG is not set +# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set @@ -6367,6 +6380,7 @@ CONFIG_SND_SOC_TEGRA_WM9712=m # CONFIG_SND_SOC_TFA9879 is not set CONFIG_SND_SOC_TI_EDMA_PCM=m CONFIG_SND_SOC_TI_SDMA_PCM=m +CONFIG_SND_SOC_TLV320ADCX140=m CONFIG_SND_SOC_TLV320AIC23_I2C=m CONFIG_SND_SOC_TLV320AIC23=m CONFIG_SND_SOC_TLV320AIC23_SPI=m |