diff --git a/configs/fedora/generic/CONFIG_BCM2835_VCHIQ b/configs/fedora/generic/CONFIG_BCM2835_VCHIQ
deleted file mode 100644
index 0f1da7edd..000000000
--- a/configs/fedora/generic/CONFIG_BCM2835_VCHIQ
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BCM2835_VCHIQ is not set
diff --git a/configs/fedora/generic/arm/CONFIG_BCM_VIDEOCORE b/configs/fedora/generic/arm/CONFIG_BCM_VIDEOCORE
index 6897b418e..b89056344 100644
--- a/configs/fedora/generic/arm/CONFIG_BCM_VIDEOCORE
+++ b/configs/fedora/generic/arm/CONFIG_BCM_VIDEOCORE
@@ -1 +1 @@
-# CONFIG_BCM_VIDEOCORE is not set
+CONFIG_BCM_VIDEOCORE=m
diff --git a/configs/fedora/generic/arm/CONFIG_SND_BCM2835 b/configs/fedora/generic/arm/CONFIG_SND_BCM2835
new file mode 100644
index 000000000..9f45a6176
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_SND_BCM2835
@@ -0,0 +1 @@
+CONFIG_SND_BCM2835=m
diff --git a/configs/fedora/generic/arm/CONFIG_VIDEO_BCM2835 b/configs/fedora/generic/arm/CONFIG_VIDEO_BCM2835
index 192fdf645..725991a20 100644
--- a/configs/fedora/generic/arm/CONFIG_VIDEO_BCM2835
+++ b/configs/fedora/generic/arm/CONFIG_VIDEO_BCM2835
@@ -1 +1 @@
-# CONFIG_VIDEO_BCM2835 is not set
+CONFIG_VIDEO_BCM2835=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 1fe71a731..ce7cdcde8 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -566,7 +566,7 @@ CONFIG_BCMGENET=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_BCM_PDC_MBOX is not set
 CONFIG_BCM_SBA_RAID=m
-# CONFIG_BCM_VIDEOCORE is not set
+CONFIG_BCM_VIDEOCORE=m
 CONFIG_BE2ISCSI=m
 CONFIG_BE2NET_BE2=y
 CONFIG_BE2NET_BE3=y
@@ -5564,6 +5564,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
 CONFIG_SND_BCD2000=m
+CONFIG_SND_BCM2835=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
@@ -6863,7 +6864,7 @@ CONFIG_VIA_VELOCITY=m
 CONFIG_VIDEO_AU0828=m
 # CONFIG_VIDEO_AU0828_RC is not set
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_BCM2835 is not set
+CONFIG_VIDEO_BCM2835=m
 CONFIG_VIDEO_BT848=m
 # CONFIG_VIDEO_CADENCE is not set
 CONFIG_VIDEO_CAFE_CCIC=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 6fa6fe8e0..993d73320 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -566,7 +566,7 @@ CONFIG_BCMGENET=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_BCM_PDC_MBOX is not set
 CONFIG_BCM_SBA_RAID=m
-# CONFIG_BCM_VIDEOCORE is not set
+CONFIG_BCM_VIDEOCORE=m
 CONFIG_BE2ISCSI=m
 CONFIG_BE2NET_BE2=y
 CONFIG_BE2NET_BE3=y
@@ -5541,6 +5541,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
 CONFIG_SND_BCD2000=m
+CONFIG_SND_BCM2835=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
@@ -6839,7 +6840,7 @@ CONFIG_VIA_VELOCITY=m
 CONFIG_VIDEO_AU0828=m
 # CONFIG_VIDEO_AU0828_RC is not set
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_BCM2835 is not set
+CONFIG_VIDEO_BCM2835=m
 CONFIG_VIDEO_BT848=m
 # CONFIG_VIDEO_CADENCE is not set
 CONFIG_VIDEO_CAFE_CCIC=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 09b607aad..56c225ba3 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -600,7 +600,7 @@ CONFIG_BCMA=m
 CONFIG_BCMGENET=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 CONFIG_BCM_SBA_RAID=m
-# CONFIG_BCM_VIDEOCORE is not set
+CONFIG_BCM_VIDEOCORE=m
 CONFIG_BE2ISCSI=m
 CONFIG_BE2NET_BE2=y
 CONFIG_BE2NET_BE3=y
@@ -5906,6 +5906,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
 CONFIG_SND_BCD2000=m
+CONFIG_SND_BCM2835=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
@@ -7341,7 +7342,7 @@ CONFIG_VIDEO_AM437X_VPFE=m
 CONFIG_VIDEO_AU0828=m
 # CONFIG_VIDEO_AU0828_RC is not set
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_BCM2835 is not set
+CONFIG_VIDEO_BCM2835=m
 CONFIG_VIDEO_BT848=m
 # CONFIG_VIDEO_CADENCE is not set
 CONFIG_VIDEO_CAFE_CCIC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 3e9d515a8..5effc0140 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -575,7 +575,7 @@ CONFIG_BCMA=m
 CONFIG_BCMGENET=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 CONFIG_BCM_SBA_RAID=m
-# CONFIG_BCM_VIDEOCORE is not set
+CONFIG_BCM_VIDEOCORE=m
 CONFIG_BE2ISCSI=m
 CONFIG_BE2NET_BE2=y
 CONFIG_BE2NET_BE3=y
@@ -5581,6 +5581,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
 CONFIG_SND_BCD2000=m
+CONFIG_SND_BCM2835=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
@@ -6907,7 +6908,7 @@ CONFIG_VIA_VELOCITY=m
 CONFIG_VIDEO_AU0828=m
 # CONFIG_VIDEO_AU0828_RC is not set
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_BCM2835 is not set
+CONFIG_VIDEO_BCM2835=m
 CONFIG_VIDEO_BT848=m
 # CONFIG_VIDEO_CADENCE is not set
 CONFIG_VIDEO_CAFE_CCIC=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 78538b8f1..1dc8d001c 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -574,7 +574,7 @@ CONFIG_BCMA=m
 CONFIG_BCMGENET=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 CONFIG_BCM_SBA_RAID=m
-# CONFIG_BCM_VIDEOCORE is not set
+CONFIG_BCM_VIDEOCORE=m
 CONFIG_BE2ISCSI=m
 CONFIG_BE2NET_BE2=y
 CONFIG_BE2NET_BE3=y
@@ -5558,6 +5558,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
 CONFIG_SND_BCD2000=m
+CONFIG_SND_BCM2835=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
@@ -6883,7 +6884,7 @@ CONFIG_VIA_VELOCITY=m
 CONFIG_VIDEO_AU0828=m
 # CONFIG_VIDEO_AU0828_RC is not set
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_BCM2835 is not set
+CONFIG_VIDEO_BCM2835=m
 CONFIG_VIDEO_BT848=m
 # CONFIG_VIDEO_CADENCE is not set
 CONFIG_VIDEO_CAFE_CCIC=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index e412fde9c..4bc011f67 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -599,7 +599,7 @@ CONFIG_BCMA=m
 CONFIG_BCMGENET=m
 # CONFIG_BCM_KONA_USB2_PHY is not set
 CONFIG_BCM_SBA_RAID=m
-# CONFIG_BCM_VIDEOCORE is not set
+CONFIG_BCM_VIDEOCORE=m
 CONFIG_BE2ISCSI=m
 CONFIG_BE2NET_BE2=y
 CONFIG_BE2NET_BE3=y
@@ -5883,6 +5883,7 @@ CONFIG_SND_AUDIO_GRAPH_CARD=m
 # CONFIG_SND_AW2 is not set
 CONFIG_SND_AZT3328=m
 CONFIG_SND_BCD2000=m
+CONFIG_SND_BCM2835=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_BEBOB=m
 CONFIG_SND_BT87X=m
@@ -7317,7 +7318,7 @@ CONFIG_VIDEO_AM437X_VPFE=m
 CONFIG_VIDEO_AU0828=m
 # CONFIG_VIDEO_AU0828_RC is not set
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_BCM2835 is not set
+CONFIG_VIDEO_BCM2835=m
 CONFIG_VIDEO_BT848=m
 # CONFIG_VIDEO_CADENCE is not set
 CONFIG_VIDEO_CAFE_CCIC=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index f8cdff312..0604e47ff 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -441,7 +441,6 @@ CONFIG_BAYCOM_SER_HDX=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
-# CONFIG_BCM2835_VCHIQ is not set
 CONFIG_BCM63XX_PHY=m
 # CONFIG_BCM7038_WDT is not set
 CONFIG_BCM7XXX_PHY=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index caea5f79c..3835fb189 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -444,7 +444,6 @@ CONFIG_BAYCOM_SER_HDX=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
-# CONFIG_BCM2835_VCHIQ is not set
 CONFIG_BCM63XX_PHY=m
 # CONFIG_BCM7038_WDT is not set
 CONFIG_BCM7XXX_PHY=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 1771f0c47..916f0d8c9 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -444,7 +444,6 @@ CONFIG_BAYCOM_SER_HDX=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
-# CONFIG_BCM2835_VCHIQ is not set
 CONFIG_BCM63XX_PHY=m
 # CONFIG_BCM7038_WDT is not set
 CONFIG_BCM7XXX_PHY=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 65c071fed..986b2661c 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -441,7 +441,6 @@ CONFIG_BAYCOM_SER_HDX=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
-# CONFIG_BCM2835_VCHIQ is not set
 CONFIG_BCM63XX_PHY=m
 # CONFIG_BCM7038_WDT is not set
 CONFIG_BCM7XXX_PHY=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index bfb58aeb7..ac988cd41 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -382,7 +382,6 @@ CONFIG_BAYCOM_SER_HDX=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
-# CONFIG_BCM2835_VCHIQ is not set
 CONFIG_BCM63XX_PHY=m
 # CONFIG_BCM7038_WDT is not set
 CONFIG_BCM7XXX_PHY=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index b3cf0a903..497fd5756 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -379,7 +379,6 @@ CONFIG_BAYCOM_SER_HDX=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
-# CONFIG_BCM2835_VCHIQ is not set
 CONFIG_BCM63XX_PHY=m
 # CONFIG_BCM7038_WDT is not set
 CONFIG_BCM7XXX_PHY=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index a50f9e8a9..91685ce1c 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -385,7 +385,6 @@ CONFIG_BAYCOM_SER_HDX=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
-# CONFIG_BCM2835_VCHIQ is not set
 CONFIG_BCM63XX_PHY=m
 # CONFIG_BCM7038_WDT is not set
 CONFIG_BCM7XXX_PHY=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index ac7b431f2..31081eb2c 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -382,7 +382,6 @@ CONFIG_BAYCOM_SER_HDX=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
-# CONFIG_BCM2835_VCHIQ is not set
 CONFIG_BCM63XX_PHY=m
 # CONFIG_BCM7038_WDT is not set
 CONFIG_BCM7XXX_PHY=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 5d00ce9a5..e6208f69a 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -450,7 +450,6 @@ CONFIG_BAYCOM_SER_HDX=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
-# CONFIG_BCM2835_VCHIQ is not set
 CONFIG_BCM63XX_PHY=m
 # CONFIG_BCM7038_WDT is not set
 CONFIG_BCM7XXX_PHY=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 496e098fb..b0da0a5ca 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -447,7 +447,6 @@ CONFIG_BAYCOM_SER_HDX=m
 # CONFIG_BCACHE_CLOSURES_DEBUG is not set
 # CONFIG_BCACHE_DEBUG is not set
 CONFIG_BCACHE=m
-# CONFIG_BCM2835_VCHIQ is not set
 CONFIG_BCM63XX_PHY=m
 # CONFIG_BCM7038_WDT is not set
 CONFIG_BCM7XXX_PHY=m
diff --git a/kernel.spec b/kernel.spec
index b8dcf898a..3263484b0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1863,6 +1863,9 @@ fi
 #
 #
 %changelog
+* Mon Sep  3 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable bcm283x VCHIQ, camera and analog audio drivers
+
 * Mon Sep 03 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc2.git0.1
 - Linux v4.19-rc2