Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 051420a9 authored by Michael Zoran's avatar Michael Zoran Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-audio: Move driver under vc04_services 



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: default avatarMichael Zoran <mzoran@crowfest.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4529d891

drivers/staging/Kconfig

+0 −2
Original line number Original line Diff line number Diff line
@@ -102,6 +102,4 @@ source "drivers/staging/greybus/Kconfig" 




source "drivers/staging/vc04_services/Kconfig"

source "drivers/staging/vc04_services/Kconfig"





source "drivers/staging/bcm2835-audio/Kconfig"



endif # STAGING
 
endif # STAGING

drivers/staging/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -40,5 +40,4 @@ obj-$(CONFIG_MOST) += most/ 
obj-$(CONFIG_KS7010)		+= ks7010/

obj-$(CONFIG_KS7010)		+= ks7010/

obj-$(CONFIG_GREYBUS)		+= greybus/

obj-$(CONFIG_GREYBUS)		+= greybus/

obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/

obj-$(CONFIG_BCM2835_VCHIQ)	+= vc04_services/

obj-$(CONFIG_SND_BCM2835)	+= bcm2835-audio/

drivers/staging/vc04_services/Kconfig

+8 −1
Original line number Original line Diff line number Diff line 
config BCM2835_VCHIQ

menuconfig BCM2835_VCHIQ

	tristate "Videocore VCHIQ"

	tristate "Videocore VCHIQ"

	depends on HAS_DMA

	depends on HAS_DMA

	depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)

	depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
@@ -8,3 +8,10 @@ config BCM2835_VCHIQ 
		BCM2835 family of products.

		BCM2835 family of products.

		Defaults to Y when the Broadcom Videocore services

		Defaults to Y when the Broadcom Videocore services

		are included in the build, N otherwise.

		are included in the build, N otherwise.



if BCM2835_VCHIQ



source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"



endif

drivers/staging/vc04_services/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -10,5 +10,7 @@ vchiq-objs := \ 
   interface/vchiq_arm/vchiq_util.o \

   interface/vchiq_arm/vchiq_util.o \

   interface/vchiq_arm/vchiq_connected.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

ccflags-y += -DVCOS_VERIFY_BKPTS=1 -Idrivers/staging/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000