Commit b18ee53a authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835: Break MMAL support out from camera 



The BCM2835 camera host is currently the only component that uses the
VCHIQ MMAL interface. This will soon change with the upporting of
BCM2835 ISP, which make use of the same interface.

Break VCHIQ MMAL interface support out from camera host directory to
make it possible for the ISP driver to use it as well.

The only modification to the existing mmal code is the introduction of
EXPORT_SYMBOL() for symbols required by bcm2835-camera and the addition
of the module author and licenses.

Signed-off-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200623164235.29566-2-nsaenzjulienne@suse.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9666e8f8

drivers/staging/vc04_services/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -23,5 +23,7 @@ source "drivers/staging/vc04_services/bcm2835-audio/Kconfig" 


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



source "drivers/staging/vc04_services/vchiq-mmal/Kconfig"



endif

drivers/staging/vc04_services/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ vchiq-objs := \ 


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

obj-$(CONFIG_VIDEO_BCM2835)		+= bcm2835-camera/

obj-$(CONFIG_BCM2835_VCHIQ_MMAL)	+= vchiq-mmal/



ccflags-y += -D__VCCOREVER__=0x04000000

drivers/staging/vc04_services/bcm2835-camera/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config VIDEO_BCM2835 
	depends on MEDIA_SUPPORT

	depends on VIDEO_V4L2 && (ARCH_BCM2835 || COMPILE_TEST)

	select BCM2835_VCHIQ

	select BCM2835_VCHIQ_MMAL

	select VIDEOBUF2_VMALLOC

	select BTREE

	help

drivers/staging/vc04_services/bcm2835-camera/Makefile

+2 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

bcm2835-v4l2-$(CONFIG_VIDEO_BCM2835) := \

	bcm2835-camera.o \

	controls.o \

	mmal-vchiq.o

	controls.o



obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o



ccflags-y += \

	-I $(srctree)/$(src)/.. \

	-I $(srctree)/$(src)/../vchiq-mmal/ \

	-D__VCCOREVER__=0x04000000

drivers/staging/vc04_services/vchiq-mmal/Kconfig

0 → 100644
+7 −0
Original line number Diff line number Diff line 
config BCM2835_VCHIQ_MMAL

	tristate "BCM2835 MMAL VCHIQ service"

	depends on (ARCH_BCM2835 || COMPILE_TEST)

	help

	  Enables the MMAL API over VCHIQ interface as used for the

	  majority of the multimedia services on VideoCore.

	  Defaults to Y when the Broadcomd BCM2835 camera host is selected.

CRA Git | Maintained and supported by SUSTech CRA and CCSE