The bcm2835-audio driver is part of v04_services, so it makes
sense for it to be located under vc04_services to make
configuration clearer.
Signed-off-by: Michael Zoran <mzoran@xxxxxxxxxxxx>
---
drivers/staging/Kconfig | 2 --
drivers/staging/Makefile | 1 -
drivers/staging/vc04_services/Kconfig | 9 ++++++++-
drivers/staging/vc04_services/Makefile | 2 ++
drivers/staging/{ => vc04_services}/bcm2835-audio/Kconfig | 0
drivers/staging/{ => vc04_services}/bcm2835-audio/Makefile | 0
drivers/staging/{ => vc04_services}/bcm2835-audio/TODO | 0
drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-ctl.c | 0
drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-pcm.c | 0
.../staging/{ => vc04_services}/bcm2835-audio/bcm2835-vchiq.c | 0
drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835.c | 0
drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835.h | 0
.../{ => vc04_services}/bcm2835-audio/vc_vchi_audioserv_defs.h | 0
13 files changed, 10 insertions(+), 4 deletions(-)
rename drivers/staging/{ => vc04_services}/bcm2835-audio/Kconfig (100%)
rename drivers/staging/{ => vc04_services}/bcm2835-audio/Makefile (100%)
rename drivers/staging/{ => vc04_services}/bcm2835-audio/TODO (100%)
rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-ctl.c (100%)
rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-pcm.c (100%)
rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-vchiq.c (100%)
rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835.c (100%)
rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835.h (100%)
rename drivers/staging/{ => vc04_services}/bcm2835-audio/vc_vchi_audioserv_defs.h (100%)
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 4c360f8071a8..8cec648e639d 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -102,6 +102,4 @@ source "drivers/staging/greybus/Kconfig"
source "drivers/staging/vc04_services/Kconfig"
-source "drivers/staging/bcm2835-audio/Kconfig"
-
endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 29cec5aa2945..3671dc59579e 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -40,5 +40,4 @@ obj-$(CONFIG_MOST) += most/
obj-$(CONFIG_KS7010) += ks7010/
obj-$(CONFIG_GREYBUS) += greybus/
obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
-obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/
diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
index e61e4ca064a8..ff44897d30d2 100644
--- a/drivers/staging/vc04_services/Kconfig
+++ b/drivers/staging/vc04_services/Kconfig
@@ -1,4 +1,4 @@
-config BCM2835_VCHIQ
+menuconfig BCM2835_VCHIQ
tristate "Videocore VCHIQ"
depends on HAS_DMA
depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
@@ -8,3 +8,10 @@ config BCM2835_VCHIQ
BCM2835 family of products.
Defaults to Y when the Broadcom Videocore services
are included in the build, N otherwise.
+
+if BCM2835_VCHIQ
+
+source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"
+
+endif
+
diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
index 1a9e742ee40d..d8058d30550f 100644
--- a/drivers/staging/vc04_services/Makefile
+++ b/drivers/staging/vc04_services/Makefile
@@ -10,5 +10,7 @@ vchiq-objs := \
interface/vchiq_arm/vchiq_util.o \
interface/vchiq_arm/vchiq_connected.o \
+obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/
+
ccflags-y += -DVCOS_VERIFY_BKPTS=1 -Idrivers/staging/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000
diff --git a/drivers/staging/bcm2835-audio/Kconfig b/drivers/staging/vc04_services/bcm2835-audio/Kconfig
similarity index 100%
rename from drivers/staging/bcm2835-audio/Kconfig
rename to drivers/staging/vc04_services/bcm2835-audio/Kconfig
diff --git a/drivers/staging/bcm2835-audio/Makefile b/drivers/staging/vc04_services/bcm2835-audio/Makefile
similarity index 100%
rename from drivers/staging/bcm2835-audio/Makefile
rename to drivers/staging/vc04_services/bcm2835-audio/Makefile
diff --git a/drivers/staging/bcm2835-audio/TODO b/drivers/staging/vc04_services/bcm2835-audio/TODO
similarity index 100%
rename from drivers/staging/bcm2835-audio/TODO
rename to drivers/staging/vc04_services/bcm2835-audio/TODO
diff --git a/drivers/staging/bcm2835-audio/bcm2835-ctl.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
similarity index 100%
rename from drivers/staging/bcm2835-audio/bcm2835-ctl.c
rename to drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c
diff --git a/drivers/staging/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
similarity index 100%
rename from drivers/staging/bcm2835-audio/bcm2835-pcm.c
rename to drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
diff --git a/drivers/staging/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
similarity index 100%
rename from drivers/staging/bcm2835-audio/bcm2835-vchiq.c
rename to drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
diff --git a/drivers/staging/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
similarity index 100%
rename from drivers/staging/bcm2835-audio/bcm2835.c
rename to drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
diff --git a/drivers/staging/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
similarity index 100%
rename from drivers/staging/bcm2835-audio/bcm2835.h
rename to drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
diff --git a/drivers/staging/bcm2835-audio/vc_vchi_audioserv_defs.h b/drivers/staging/vc04_services/bcm2835-audio/vc_vchi_audioserv_defs.h
similarity index 100%
rename from drivers/staging/bcm2835-audio/vc_vchi_audioserv_defs.h
rename to drivers/staging/vc04_services/bcm2835-audio/vc_vchi_audioserv_defs.h
--
2.11.0
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
