Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora

26 files changed, 38 insertions, 49 deletions

diff --git a/configs/fedora/generic/CONFIG_SOUNDWIRE_QCOM b/configs/fedora/generic/CONFIG_SOUNDWIRE_QCOM
deleted file mode 100644
index c72e10062..000000000
--- a/configs/fedora/generic/CONFIG_SOUNDWIRE_QCOM
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SOUNDWIRE_QCOM is not set
diff --git a/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_DPHY_RX0 b/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_DPHY_RX0
index b3016607c..b13045cf4 100644
--- a/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_DPHY_RX0
+++ b/configs/fedora/generic/arm/CONFIG_PHY_ROCKCHIP_DPHY_RX0
@@ -1 +1 @@
-# CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
diff --git a/configs/fedora/generic/CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT b/configs/fedora/generic/arm/CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT
index 8f9c32859..8f9c32859 100644
--- a/configs/fedora/generic/CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT
+++ b/configs/fedora/generic/arm/CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT
diff --git a/configs/fedora/generic/arm/CONFIG_VIDEO_ROCKCHIP_ISP1 b/configs/fedora/generic/arm/CONFIG_VIDEO_ROCKCHIP_ISP1
index 91a467e56..c8db5948b 100644
--- a/configs/fedora/generic/arm/CONFIG_VIDEO_ROCKCHIP_ISP1
+++ b/configs/fedora/generic/arm/CONFIG_VIDEO_ROCKCHIP_ISP1
@@ -1 +1 @@
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+CONFIG_VIDEO_ROCKCHIP_ISP1=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_OCTEONTX2_PF b/configs/fedora/generic/arm/aarch64/CONFIG_OCTEONTX2_PF
index 4c82e8df9..69cbb9236 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_OCTEONTX2_PF
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_OCTEONTX2_PF
@@ -1 +1 @@
-# CONFIG_OCTEONTX2_PF is not set
+CONFIG_OCTEONTX2_PF=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SOUNDWIRE_QCOM b/configs/fedora/generic/arm/aarch64/CONFIG_SOUNDWIRE_QCOM
new file mode 100644
index 000000000..bfb00c97e
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SOUNDWIRE_QCOM
@@ -0,0 +1 @@
+CONFIG_SOUNDWIRE_QCOM=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_USB_MUSB_AM335X_CHILD b/configs/fedora/generic/arm/armv7/CONFIG_USB_MUSB_AM335X_CHILD
deleted file mode 100644
index e16720b6a..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_USB_MUSB_AM335X_CHILD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_USB_MUSB_AM335X_CHILD=m
diff --git a/filter-aarch64.sh b/filter-aarch64.sh
index 41dc7d19c..7c3441b9d 100644
--- a/filter-aarch64.sh
+++ b/filter-aarch64.sh
@@ -9,7 +9,7 @@
 # modifications to the overrides below.  If something should be removed across
 # all arches, remove it in the default instead of per-arch.
 
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia power ssb staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia power ssb soundwire staging tty uio uwb w1"
 
 ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
 
diff --git a/filter-aarch64.sh.fedora b/filter-aarch64.sh.fedora
index 41dc7d19c..7c3441b9d 100644
--- a/filter-aarch64.sh.fedora
+++ b/filter-aarch64.sh.fedora
@@ -9,7 +9,7 @@
 # modifications to the overrides below.  If something should be removed across
 # all arches, remove it in the default instead of per-arch.
 
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia power ssb staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn leds media memstick message mmc mtd nfc ntb pcmcia power ssb soundwire staging tty uio uwb w1"
 
 ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco dec dlink emulex icplus marvell micrel myricom neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis smsc stmicro sun tehuti ti via wiznet xircom"
 
diff --git a/filter-armv7hl.sh b/filter-armv7hl.sh
index 69183432b..566083c1d 100644
--- a/filter-armv7hl.sh
+++ b/filter-armv7hl.sh
@@ -9,7 +9,7 @@
 # modifications to the overrides below.  If something should be removed across
 # all arches, remove it in the default instead of per-arch.
 
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn media memstick message nfc ntb pcmcia ssb staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn media memstick message nfc ntb pcmcia ssb soundwire staging tty uio uwb w1"
 
 ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco dec dlink emulex icplus mellanox micrel myricom natsemi neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis sun tehuti via wiznet xircom"
 
diff --git a/filter-armv7hl.sh.fedora b/filter-armv7hl.sh.fedora
index 69183432b..566083c1d 100644
--- a/filter-armv7hl.sh.fedora
+++ b/filter-armv7hl.sh.fedora
@@ -9,7 +9,7 @@
 # modifications to the overrides below.  If something should be removed across
 # all arches, remove it in the default instead of per-arch.
 
-driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn media memstick message nfc ntb pcmcia ssb staging tty uio uwb w1"
+driverdirs="atm auxdisplay bcma bluetooth firewire fmc fpga infiniband isdn media memstick message nfc ntb pcmcia ssb soundwire staging tty uio uwb w1"
 
 ethdrvs="3com adaptec alteon altera amd atheros broadcom cadence chelsio cisco dec dlink emulex icplus mellanox micrel myricom natsemi neterion nvidia oki-semi packetengines qlogic rdc renesas sfc silan sis sun tehuti via wiznet xircom"
 
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index a2e0ebdd3..ed5b77334 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -4397,7 +4397,7 @@ CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OCTEONTX2_AF=m
-# CONFIG_OCTEONTX2_PF is not set
+CONFIG_OCTEONTX2_PF=m
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_EARLY_FLATTREE=y
@@ -4634,7 +4634,7 @@ CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
-# CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
@@ -4921,6 +4921,7 @@ CONFIG_QCOM_RMTFS_MEM=m
 CONFIG_QCOM_RPMHPD=y
 CONFIG_QCOM_RPMH=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SMD_RPM=m
 CONFIG_QCOM_SMEM=m
 CONFIG_QCOM_SMP2P=m
@@ -6275,7 +6276,7 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 # CONFIG_SOUNDWIRE_INTEL is not set
-# CONFIG_SOUNDWIRE_QCOM is not set
+CONFIG_SOUNDWIRE_QCOM=m
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -7307,7 +7308,7 @@ CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+CONFIG_VIDEO_ROCKCHIP_ISP1=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134_ALSA=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 1486bb7f1..ad35c999d 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -4377,7 +4377,7 @@ CONFIG_OCFS2_FS_O2CB=m
 # CONFIG_OCFS2_FS_STATS is not set
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OCTEONTX2_AF=m
-# CONFIG_OCTEONTX2_PF is not set
+CONFIG_OCTEONTX2_PF=m
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_DYNAMIC=y
 CONFIG_OF_EARLY_FLATTREE=y
@@ -4614,7 +4614,7 @@ CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
-# CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
@@ -4900,6 +4900,7 @@ CONFIG_QCOM_RMTFS_MEM=m
 CONFIG_QCOM_RPMHPD=y
 CONFIG_QCOM_RPMH=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SMD_RPM=m
 CONFIG_QCOM_SMEM=m
 CONFIG_QCOM_SMP2P=m
@@ -6253,7 +6254,7 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 # CONFIG_SOUNDWIRE_INTEL is not set
-# CONFIG_SOUNDWIRE_QCOM is not set
+CONFIG_SOUNDWIRE_QCOM=m
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -7285,7 +7286,7 @@ CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_QCOM_CAMSS=m
 CONFIG_VIDEO_QCOM_VENUS=m
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+CONFIG_VIDEO_ROCKCHIP_ISP1=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134_ALSA=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 175651fdd..f2a084adb 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -4720,7 +4720,7 @@ CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
-# CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
@@ -5002,6 +5002,7 @@ CONFIG_QCOM_PM=y
 CONFIG_QCOM_QFPROM=m
 CONFIG_QCOM_RMTFS_MEM=m
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SMD_RPM=m
 # CONFIG_QCOM_SMEM is not set
 CONFIG_QCOM_SMP2P=m
@@ -6470,7 +6471,6 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 # CONFIG_SOUNDWIRE_INTEL is not set
-# CONFIG_SOUNDWIRE_QCOM is not set
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPEAKUP is not set
@@ -7267,7 +7267,6 @@ CONFIG_USB_MICROTEK=m
 # CONFIG_USB_MIDI_GADGET is not set
 CONFIG_USB_MON=y
 CONFIG_USB_MR800=m
-CONFIG_USB_MUSB_AM335X_CHILD=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
@@ -7578,7 +7577,7 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_QCOM_VENUS=m
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+CONFIG_VIDEO_ROCKCHIP_ISP1=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
 CONFIG_VIDEO_S5P_FIMC=m
 CONFIG_VIDEO_S5P_MIPI_CSIS=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 6994229d8..87d41c31c 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -4701,7 +4701,7 @@ CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_USB_HSIC=m
 CONFIG_PHY_QCOM_USB_HS=m
-# CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
@@ -4982,6 +4982,7 @@ CONFIG_QCOM_PM=y
 CONFIG_QCOM_QFPROM=m
 CONFIG_QCOM_RMTFS_MEM=m
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SMD_RPM=m
 # CONFIG_QCOM_SMEM is not set
 CONFIG_QCOM_SMP2P=m
@@ -6449,7 +6450,6 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 # CONFIG_SOUNDWIRE_INTEL is not set
-# CONFIG_SOUNDWIRE_QCOM is not set
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPEAKUP is not set
@@ -7246,7 +7246,6 @@ CONFIG_USB_MICROTEK=m
 # CONFIG_USB_MIDI_GADGET is not set
 CONFIG_USB_MON=y
 CONFIG_USB_MR800=m
-CONFIG_USB_MUSB_AM335X_CHILD=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
@@ -7557,7 +7556,7 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_QCOM_VENUS=m
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+CONFIG_VIDEO_ROCKCHIP_ISP1=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
 CONFIG_VIDEO_S5P_FIMC=m
 CONFIG_VIDEO_S5P_MIPI_CSIS=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 7c77997a5..771b321f4 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -4602,7 +4602,7 @@ CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_QCOM_UFS=m
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
-# CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
@@ -4856,6 +4856,7 @@ CONFIG_QCOM_PDC=y
 CONFIG_QCOM_PM8XXX_XOADC=m
 CONFIG_QCOM_RMTFS_MEM=m
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SOCINFO=m
 CONFIG_QCOM_SPMI_ADC5=m
 CONFIG_QCS_GCC_404=m
@@ -6231,7 +6232,6 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 # CONFIG_SOUNDWIRE_INTEL is not set
-# CONFIG_SOUNDWIRE_QCOM is not set
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPEAKUP is not set
@@ -7006,7 +7006,6 @@ CONFIG_USB_MICROTEK=m
 # CONFIG_USB_MIDI_GADGET is not set
 CONFIG_USB_MON=y
 CONFIG_USB_MR800=m
-CONFIG_USB_MUSB_AM335X_CHILD=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
@@ -7308,7 +7307,7 @@ CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+CONFIG_VIDEO_ROCKCHIP_ISP1=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
 CONFIG_VIDEO_S5P_FIMC=m
 CONFIG_VIDEO_S5P_MIPI_CSIS=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 5c23cf6cf..ff29be1bc 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -4583,7 +4583,7 @@ CONFIG_PHY_QCOM_UFS_14NM=m
 CONFIG_PHY_QCOM_UFS=m
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
-# CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set
+CONFIG_PHY_ROCKCHIP_DPHY_RX0=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
@@ -4836,6 +4836,7 @@ CONFIG_QCOM_PDC=y
 CONFIG_QCOM_PM8XXX_XOADC=m
 CONFIG_QCOM_RMTFS_MEM=m
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
+CONFIG_QCOM_SCM=y
 CONFIG_QCOM_SOCINFO=m
 CONFIG_QCOM_SPMI_ADC5=m
 CONFIG_QCS_GCC_404=m
@@ -6210,7 +6211,6 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 # CONFIG_SOUNDWIRE_INTEL is not set
-# CONFIG_SOUNDWIRE_QCOM is not set
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPEAKUP is not set
@@ -6985,7 +6985,6 @@ CONFIG_USB_MICROTEK=m
 # CONFIG_USB_MIDI_GADGET is not set
 CONFIG_USB_MON=y
 CONFIG_USB_MR800=m
-CONFIG_USB_MUSB_AM335X_CHILD=m
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
@@ -7287,7 +7286,7 @@ CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
-# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set
+CONFIG_VIDEO_ROCKCHIP_ISP1=m
 CONFIG_VIDEO_ROCKCHIP_RGA=m
 CONFIG_VIDEO_S5P_FIMC=m
 CONFIG_VIDEO_S5P_MIPI_CSIS=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 53aa41ed7..c6899eb13 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -4445,7 +4445,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -5688,7 +5687,6 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE_INTEL=m
-# CONFIG_SOUNDWIRE_QCOM is not set
 CONFIG_SOUNDWIRE=y
 CONFIG_SP5100_TCO=m
 CONFIG_SPARSE_IRQ=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 4152397e5..14176ec04 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -4425,7 +4425,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -5667,7 +5666,6 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE_INTEL=m
-# CONFIG_SOUNDWIRE_QCOM is not set
 CONFIG_SOUNDWIRE=y
 CONFIG_SP5100_TCO=m
 CONFIG_SPARSE_IRQ=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index f463bf647..03be79632 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -4138,7 +4138,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -5297,7 +5296,6 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 # CONFIG_SOUNDWIRE_INTEL is not set
-# CONFIG_SOUNDWIRE_QCOM is not set
 CONFIG_SOUNDWIRE=y
 CONFIG_SPAPR_TCE_IOMMU=y
 CONFIG_SPARSE_IRQ=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 4bebf1171..a6a3c82c3 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -4116,7 +4116,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -5274,7 +5273,6 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 # CONFIG_SOUNDWIRE_INTEL is not set
-# CONFIG_SOUNDWIRE_QCOM is not set
 CONFIG_SOUNDWIRE=y
 CONFIG_SPAPR_TCE_IOMMU=y
 CONFIG_SPARSE_IRQ=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index c7293c70f..e217008c8 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -4065,7 +4065,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QDIO=m
 CONFIG_QEDE=m
@@ -5236,7 +5235,6 @@ CONFIG_SONY_FF=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 # CONFIG_SOUNDWIRE_INTEL is not set
-# CONFIG_SOUNDWIRE_QCOM is not set
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPEAKUP is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 0f8857157..95cad0802 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -4043,7 +4043,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QDIO=m
 CONFIG_QEDE=m
@@ -5213,7 +5212,6 @@ CONFIG_SONY_FF=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 # CONFIG_SOUNDWIRE_INTEL is not set
-# CONFIG_SOUNDWIRE_QCOM is not set
 CONFIG_SOUNDWIRE=y
 CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPEAKUP is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index ae36512bb..061b483ee 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -4486,7 +4486,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -5740,7 +5739,6 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE_INTEL=m
-# CONFIG_SOUNDWIRE_QCOM is not set
 CONFIG_SOUNDWIRE=y
 CONFIG_SP5100_TCO=m
 CONFIG_SPARSE_IRQ=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index e5a981dd6..d65a8dbac 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -4466,7 +4466,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_EMAC is not set
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
-# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -5719,7 +5718,6 @@ CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 CONFIG_SOUNDWIRE_CADENCE=m
 CONFIG_SOUNDWIRE_INTEL=m
-# CONFIG_SOUNDWIRE_QCOM is not set
 CONFIG_SOUNDWIRE=y
 CONFIG_SP5100_TCO=m
 CONFIG_SPARSE_IRQ=y
diff --git a/kernel.spec b/kernel.spec
index 4a35267a2..f6a448ff3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -4,6 +4,8 @@
 # this should go away soon
 %define _legacy_common_support 1
 
+%define pe_signing_token OpenSC Card (Fedora Signer)
+
 # At the time of this writing (2019-03), RHEL8 packages use w2.xzdio
 # compression for rpms (xz, level 2).
 # Kernel has several large (hundreds of mbytes) rpms, they take ~5 mins
@@ -2917,6 +2919,12 @@ fi
 #
 #
 %changelog
+* Mon Feb 17 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc2.git0.1
+- Linux v5.6-rc2
+
+* Mon Feb 17 2020 Jeremy Cline <jcline@redhat.com>
+- Disable debugging options.
+
 * Fri Feb 14 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc1.git3.1
 - Linux v5.6-rc1-44-gb19e8c684703