Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc1.13.vanilla.1.fc35kernel-5.13.0-0.rc1.13.vanilla.1.fc34kernel-5.13.0-0.rc1.13.vanilla.1.fc33kernel-5.13.0-0.rc1.13.vanilla.1.fc32

1 files changed, 20 insertions, 8 deletions

diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 1b292cf7f..37aa3e1b1 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -30,7 +30,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@@ -1129,6 +1128,7 @@ CONFIG_CMA_SIZE_MBYTES=64
 CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_MIN is not set
 # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SYSFS is not set
 CONFIG_CMA=y
 CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_EXTEND is not set
@@ -2818,7 +2818,7 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
+CONFIG_IIO_SCMI=m
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@@ -2973,6 +2973,7 @@ CONFIG_INPUT_GPIO_VIBRA=m
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 # CONFIG_INPUT_IMS_PCU is not set
 CONFIG_INPUT_IQS269A=m
+# CONFIG_INPUT_IQS626A is not set
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_KEYBOARD=y
@@ -3024,6 +3025,7 @@ CONFIG_INTEGRITY_TRUSTED_KEYRING=y
 CONFIG_INTEGRITY=y
 # CONFIG_INTEL_IDMA64 is not set
 CONFIG_INTEL_IDXD=m
+# CONFIG_INTEL_IDXD_PERFMON is not set
 # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set
 # CONFIG_INTEL_LDMA is not set
 # CONFIG_INTEL_MEI_VIRTIO is not set
@@ -3035,6 +3037,7 @@ CONFIG_INTEL_IDXD=m
 CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
 # CONFIG_INTEL_SOC_PMIC is not set
 CONFIG_INTEL_STRATIX10_SERVICE=m
+# CONFIG_INTEL_TCC_COOLING is not set
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_UNCORE_FREQ_CONTROL=m
 # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
@@ -3981,6 +3984,7 @@ CONFIG_MFD_WM8994=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 CONFIG_MICREL_KS8995MA=m
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@@ -4119,6 +4123,7 @@ CONFIG_MMC=y
 CONFIG_MMP_PDMA=y
 CONFIG_MMP_TDMA=y
 CONFIG_MMU=y
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@@ -5495,7 +5500,7 @@ CONFIG_PWM_IMX_TPM=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_OMAP_DMTIMER=m
 CONFIG_PWM_PCA9685=m
-# CONFIG_PWM_RASPBERRYPI_POE is not set
+CONFIG_PWM_RASPBERRYPI_POE=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m
 CONFIG_PWM_STI=m
@@ -6856,7 +6861,7 @@ CONFIG_SND_SOC_FSL_EASRC=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_FSL_MQS=m
-# CONFIG_SND_SOC_FSL_RPMSG is not set
+CONFIG_SND_SOC_FSL_RPMSG=m
 CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_SSI=m
@@ -6870,13 +6875,15 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_ICS43432=m
 # CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_IMX_AUDIO_RPMSG=m
 CONFIG_SND_SOC_IMX_AUDMIX=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_HDMI=m
 CONFIG_SND_SOC_IMX_PCM_DMA=m
 CONFIG_SND_SOC_IMX_PCM_FIQ=m
-# CONFIG_SND_SOC_IMX_RPMSG is not set
+CONFIG_SND_SOC_IMX_PCM_RPMSG=m
+CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@@ -6904,7 +6911,6 @@ CONFIG_SND_SOC_MAX98373_I2C=m
 CONFIG_SND_SOC_MAX98373=m
 CONFIG_SND_SOC_MAX98373_SDW=m
 CONFIG_SND_SOC_MAX98390=m
-CONFIG_SND_SOC_MAX9839=m
 # CONFIG_SND_SOC_MAX98504 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 CONFIG_SND_SOC_MAX9867=m
@@ -7675,7 +7681,9 @@ CONFIG_TOUCHSCREEN_GOODIX=m
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
 # CONFIG_TOUCHSCREEN_HIDEEP is not set
+# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set
 CONFIG_TOUCHSCREEN_ILI210X=m
+# CONFIG_TOUCHSCREEN_ILITEK is not set
 CONFIG_TOUCHSCREEN_IMX6UL_TSC=m
 # CONFIG_TOUCHSCREEN_INEXIO is not set
 CONFIG_TOUCHSCREEN_IQS5XX=m
@@ -7685,6 +7693,7 @@ CONFIG_TOUCHSCREEN_MCS5000=m
 # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_MMS114=m
+# CONFIG_TOUCHSCREEN_MSG2638 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_PENMOUNT is not set
 CONFIG_TOUCHSCREEN_PIXCIR=m
@@ -8276,6 +8285,7 @@ CONFIG_VCNL3020=m
 CONFIG_VCNL4035=m
 CONFIG_VDPA=m
 CONFIG_VDPA_MENU=y
+# CONFIG_VDPA_SIM_BLOCK is not set
 CONFIG_VDPA_SIM=m
 CONFIG_VDPA_SIM_NET=m
 # CONFIG_VDSO is not set
@@ -8551,6 +8561,7 @@ CONFIG_VLAN_8021Q_MVRP=y
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMXNET3 is not set
 CONFIG_VORTEX=m
+# CONFIG_VP_VDPA is not set
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
 CONFIG_VSOCKETS=m
@@ -8661,7 +8672,8 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_WQ_WATCHDOG=y
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -8699,7 +8711,7 @@ CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
+CONFIG_XILINX_INTC=y
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set