From 212afb97efe15b5b1b596a746fb6042e6f9b36a9 Mon Sep 17 00:00:00 2001 From: Michael Zoran Date: Mon, 27 Feb 2017 15:35:13 -0800 Subject: [PATCH] staging: bcm2835-camera: Move driver under vc04_services The bcm2835-camera 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/Kconfig | 2 -- drivers/staging/media/Makefile | 1 - drivers/staging/vc04_services/Kconfig | 2 ++ drivers/staging/vc04_services/Makefile | 1 + .../platform/bcm2835 => vc04_services/bcm2835-camera}/Kconfig | 1 + .../platform/bcm2835 => vc04_services/bcm2835-camera}/Makefile | 0 .../platform/bcm2835 => vc04_services/bcm2835-camera}/TODO | 0 .../bcm2835 => vc04_services/bcm2835-camera}/bcm2835-camera.c | 0 .../bcm2835 => vc04_services/bcm2835-camera}/bcm2835-camera.h | 0 .../bcm2835 => vc04_services/bcm2835-camera}/controls.c | 0 .../bcm2835 => vc04_services/bcm2835-camera}/mmal-common.h | 0 .../bcm2835 => vc04_services/bcm2835-camera}/mmal-encodings.h | 0 .../bcm2835 => vc04_services/bcm2835-camera}/mmal-msg-common.h | 0 .../bcm2835 => vc04_services/bcm2835-camera}/mmal-msg-format.h | 0 .../bcm2835 => vc04_services/bcm2835-camera}/mmal-msg-port.h | 0 .../bcm2835 => vc04_services/bcm2835-camera}/mmal-msg.h | 0 .../bcm2835 => vc04_services/bcm2835-camera}/mmal-parameters.h | 0 .../bcm2835 => vc04_services/bcm2835-camera}/mmal-vchiq.c | 0 .../bcm2835 => vc04_services/bcm2835-camera}/mmal-vchiq.h | 0 19 files changed, 4 insertions(+), 3 deletions(-) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/Kconfig (93%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/Makefile (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/TODO (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/bcm2835-camera.c (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/bcm2835-camera.h (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/controls.c (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-common.h (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-encodings.h (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-msg-common.h (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-msg-format.h (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-msg-port.h (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-msg.h (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-parameters.h (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-vchiq.c (100%) rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-vchiq.h (100%) diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index abd0e2d57c20..ffb8fa72c3da 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 dc89325c463d..a28e82cf6447 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 ff44897d30d2..3b576b0b49ae 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 d8058d30550f..e9a8e1343cbb 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 similarity index 93% rename from drivers/staging/media/platform/bcm2835/Kconfig rename to drivers/staging/vc04_services/bcm2835-camera/Kconfig index 7c5245dc3225..50fcb6cfb13a 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/Makefile rename to drivers/staging/vc04_services/bcm2835-camera/Makefile diff --git a/drivers/staging/media/platform/bcm2835/TODO b/drivers/staging/vc04_services/bcm2835-camera/TODO similarity index 100% rename from drivers/staging/media/platform/bcm2835/TODO rename to 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/bcm2835-camera.c rename to 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/bcm2835-camera.h rename to 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/controls.c rename to 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/mmal-common.h rename to 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/mmal-encodings.h rename to 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/mmal-msg-common.h rename to 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/mmal-msg-format.h rename to 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/mmal-msg-port.h rename to 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/mmal-msg.h rename to 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/mmal-parameters.h rename to 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/mmal-vchiq.c rename to 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 similarity index 100% rename from drivers/staging/media/platform/bcm2835/mmal-vchiq.h rename to drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h -- 2.39.2