bcm2835: Change BCM2708_VCHIQ to BCM2835_VCHIQ

RPI3 has been working without BCM2708_VCHIQ since a commit 60acf832db94
("staging: vc04_services: use bcm2835 consequently") from 4.10.y was
merged. I change all BCM2708_VCHIQ to BCM2835_VCHIQ.

Change-Id: Id1c469a489d54afbe863f46962d3459afb4481f4
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>

diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
index 032164919350db25c586c36f0e05d3e4891fb835..f83cf0c279d9d2ddb1257504d578dc34a53325ca 100644 (file)
--- a/drivers/char/broadcom/Kconfig
+++ b/drivers/char/broadcom/Kconfig
@@ -11,7 +11,7 @@ if BRCM_CHAR_DRIVERS
 
 config BCM_VC_CMA
        bool "Videocore CMA"
-       depends on CMA && BCM2708_VCHIQ
+       depends on CMA && BCM2835_VCHIQ
        default n
         help
           Helper for videocore CMA access.
@@ -32,7 +32,7 @@ endif
 
 config BCM_VC_SM
        bool "VMCS Shared Memory"
-       depends on BCM2708_VCHIQ
+       depends on BCM2835_VCHIQ
        select BCM2708_VCMEM
        default n
        help

diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig
index 58d5f9600d726cb20e6d04c54c58c53ac3a586d2..e2f992c7710e9e6df9ea57387e1c3dd64400abdd 100644 (file)
--- a/drivers/media/platform/bcm2835/Kconfig
+++ b/drivers/media/platform/bcm2835/Kconfig
@@ -13,7 +13,7 @@ if VIDEO_BCM2835
 
 config VIDEO_BCM2835_MMAL
        tristate "Broadcom BM2835 MMAL camera interface driver"
-       depends on BCM2708_VCHIQ
+       depends on BCM2835_VCHIQ
        select VIDEOBUF2_VMALLOC
        ---help---
          This is a V4L2 driver for the Broadcom BCM2835 MMAL camera host interface

diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index 944dee37a43015b0762d7d234bc860bea8f6514b..b427dfe35ad0427db74776dfcb43b7573d9e6e7d 100644 (file)
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -34,7 +34,7 @@ config SND_PXA2XX_AC97
 
 config SND_BCM2835
        tristate "BCM2835 ALSA driver"
-       depends on ARCH_BCM2835 && BCM2708_VCHIQ && SND
+       depends on ARCH_BCM2835 && BCM2835_VCHIQ && SND
        select SND_PCM
        help
          Say Y or M if you want to support BCM2835 Alsa pcm card driver