diff options
-rw-r--r-- | drivers/staging/media/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/media/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/vc04_services/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/vc04_services/Makefile | 1 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/Kconfig (renamed from drivers/staging/media/platform/bcm2835/Kconfig) | 1 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/Makefile (renamed from drivers/staging/media/platform/bcm2835/Makefile) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/TODO (renamed from drivers/staging/media/platform/bcm2835/TODO) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c (renamed from drivers/staging/media/platform/bcm2835/bcm2835-camera.c) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h (renamed from drivers/staging/media/platform/bcm2835/bcm2835-camera.h) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/controls.c (renamed from drivers/staging/media/platform/bcm2835/controls.c) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/mmal-common.h (renamed from drivers/staging/media/platform/bcm2835/mmal-common.h) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/mmal-encodings.h (renamed from drivers/staging/media/platform/bcm2835/mmal-encodings.h) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/mmal-msg-common.h (renamed from drivers/staging/media/platform/bcm2835/mmal-msg-common.h) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h (renamed from drivers/staging/media/platform/bcm2835/mmal-msg-format.h) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/mmal-msg-port.h (renamed from drivers/staging/media/platform/bcm2835/mmal-msg-port.h) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h (renamed from drivers/staging/media/platform/bcm2835/mmal-msg.h) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h (renamed from drivers/staging/media/platform/bcm2835/mmal-parameters.h) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c (renamed from drivers/staging/media/platform/bcm2835/mmal-vchiq.c) | 0 | ||||
-rw-r--r-- | drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h (renamed from drivers/staging/media/platform/bcm2835/mmal-vchiq.h) | 0 |
19 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index abd0e2d..ffb8fa7 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -27,8 +27,6 @@ source "drivers/staging/media/davinci_vpfe/Kconfig" source "drivers/staging/media/omap4iss/Kconfig" -source "drivers/staging/media/platform/bcm2835/Kconfig" - source "drivers/staging/media/s5p-cec/Kconfig" # Keep LIRC at the end, as it has sub-menus diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile index dc89325..a28e82c 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -2,7 +2,6 @@ obj-$(CONFIG_I2C_BCM2048) += bcm2048/ obj-$(CONFIG_VIDEO_SAMSUNG_S5P_CEC) += s5p-cec/ obj-$(CONFIG_DVB_CXD2099) += cxd2099/ obj-$(CONFIG_LIRC_STAGING) += lirc/ -obj-$(CONFIG_VIDEO_BCM2835) += platform/bcm2835/ obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/ obj-$(CONFIG_VIDEO_OMAP4) += omap4iss/ obj-$(CONFIG_VIDEO_STI_HDMI_CEC) += st-cec/ diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig index ff44897..3b576b0 100644 --- a/drivers/staging/vc04_services/Kconfig +++ b/drivers/staging/vc04_services/Kconfig @@ -13,5 +13,7 @@ if BCM2835_VCHIQ source "drivers/staging/vc04_services/bcm2835-audio/Kconfig" +source "drivers/staging/vc04_services/bcm2835-camera/Kconfig" + endif diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile index d8058d30..e9a8e13 100644 --- a/drivers/staging/vc04_services/Makefile +++ b/drivers/staging/vc04_services/Makefile @@ -11,6 +11,7 @@ vchiq-objs := \ interface/vchiq_arm/vchiq_connected.o \ obj-$(CONFIG_SND_BCM2835) += bcm2835-audio/ +obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-camera/ ccflags-y += -DVCOS_VERIFY_BKPTS=1 -Idrivers/staging/vc04_services -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 diff --git a/drivers/staging/media/platform/bcm2835/Kconfig b/drivers/staging/vc04_services/bcm2835-camera/Kconfig index 7c5245dc..50fcb6c 100644 --- a/drivers/staging/media/platform/bcm2835/Kconfig +++ b/drivers/staging/vc04_services/bcm2835-camera/Kconfig @@ -1,5 +1,6 @@ config VIDEO_BCM2835 tristate "Broadcom BCM2835 camera driver" + depends on MEDIA_SUPPORT depends on VIDEO_V4L2 && (ARCH_BCM2835 || COMPILE_TEST) depends on BCM2835_VCHIQ depends on ARM diff --git a/drivers/staging/media/platform/bcm2835/Makefile b/drivers/staging/vc04_services/bcm2835-camera/Makefile index 8307f30..8307f30 100644 --- a/drivers/staging/media/platform/bcm2835/Makefile +++ b/drivers/staging/vc04_services/bcm2835-camera/Makefile diff --git a/drivers/staging/media/platform/bcm2835/TODO b/drivers/staging/vc04_services/bcm2835-camera/TODO index 61a5099..61a5099 100644 --- a/drivers/staging/media/platform/bcm2835/TODO +++ b/drivers/staging/vc04_services/bcm2835-camera/TODO diff --git a/drivers/staging/media/platform/bcm2835/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index c4dad30..c4dad30 100644 --- a/drivers/staging/media/platform/bcm2835/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c diff --git a/drivers/staging/media/platform/bcm2835/bcm2835-camera.h b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h index e6aeb7e..e6aeb7e 100644 --- a/drivers/staging/media/platform/bcm2835/bcm2835-camera.h +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h diff --git a/drivers/staging/media/platform/bcm2835/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c index 4d7e2a2..4d7e2a2 100644 --- a/drivers/staging/media/platform/bcm2835/controls.c +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c diff --git a/drivers/staging/media/platform/bcm2835/mmal-common.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-common.h index 840fd13..840fd13 100644 --- a/drivers/staging/media/platform/bcm2835/mmal-common.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-common.h diff --git a/drivers/staging/media/platform/bcm2835/mmal-encodings.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-encodings.h index 024d620..024d620 100644 --- a/drivers/staging/media/platform/bcm2835/mmal-encodings.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-encodings.h diff --git a/drivers/staging/media/platform/bcm2835/mmal-msg-common.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-common.h index 66e8a6e..66e8a6e 100644 --- a/drivers/staging/media/platform/bcm2835/mmal-msg-common.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-common.h diff --git a/drivers/staging/media/platform/bcm2835/mmal-msg-format.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h index 123d86e..123d86e 100644 --- a/drivers/staging/media/platform/bcm2835/mmal-msg-format.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h diff --git a/drivers/staging/media/platform/bcm2835/mmal-msg-port.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-port.h index a55c1ea..a55c1ea 100644 --- a/drivers/staging/media/platform/bcm2835/mmal-msg-port.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-port.h diff --git a/drivers/staging/media/platform/bcm2835/mmal-msg.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h index 67b1076..67b1076 100644 --- a/drivers/staging/media/platform/bcm2835/mmal-msg.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h diff --git a/drivers/staging/media/platform/bcm2835/mmal-parameters.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h index f6abb5c..f6abb5c 100644 --- a/drivers/staging/media/platform/bcm2835/mmal-parameters.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h diff --git a/drivers/staging/media/platform/bcm2835/mmal-vchiq.c b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c index fdfb6a6..fdfb6a6 100644 --- a/drivers/staging/media/platform/bcm2835/mmal-vchiq.c +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c diff --git a/drivers/staging/media/platform/bcm2835/mmal-vchiq.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h index 9d1d11e..9d1d11e 100644 --- a/drivers/staging/media/platform/bcm2835/mmal-vchiq.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h |