evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] marvell-cam: Move cafe-ccic into its own directory

Browse source 
This driver will soon become a family of drivers, so let's give it its own
place to live.  This move requires putting ov7670.h into include/media, but
there are no code changes.

Cc: Daniel Drake <dsd@laptop.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jonathan Corbet 2011-06-11 17:46:42 +00:00 • committed by Mauro Carvalho Chehab
parent bd7319dc32
commit f8fc729870
8 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/media/video/Kconfig
View file

@ -707,6 +707,8 @@ source "drivers/media/video/cx18/Kconfig"
source "drivers/media/video/saa7164/Kconfig" source "drivers/media/video/saa7164/Kconfig"
source "drivers/media/video/marvell-ccic/Kconfig"
config VIDEO_M32R_AR config VIDEO_M32R_AR
tristate "AR devices" tristate "AR devices"
depends on M32R && VIDEO_V4L2 depends on M32R && VIDEO_V4L2
@ -726,15 +728,6 @@ config VIDEO_M32R_AR_M64278
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called arv. module will be called arv.
config VIDEO_CAFE_CCIC
tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
depends on PCI && I2C && VIDEO_V4L2
select VIDEO_OV7670
---help---
This is a video4linux2 driver for the Marvell 88ALP01 integrated
CMOS camera controller. This is the controller found on first-
generation OLPC systems.
config VIDEO_SR030PC30 config VIDEO_SR030PC30
tristate "SR030PC30 VGA camera sensor support" tristate "SR030PC30 VGA camera sensor support"
depends on I2C && VIDEO_V4L2 depends on I2C && VIDEO_V4L2

2
drivers/media/video/Makefile
View file

@ -127,7 +127,7 @@ obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o obj-$(CONFIG_VIDEO_CX2341X) += cx2341x.o
obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o obj-$(CONFIG_VIDEO_CAFE_CCIC) += marvell-ccic/
obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o obj-$(CONFIG_VIDEO_VIA_CAMERA) += via-camera.o

9
drivers/media/video/marvell-ccic/Kconfig Normal file
View file

@ -0,0 +1,9 @@
config VIDEO_CAFE_CCIC
tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support"
depends on PCI && I2C && VIDEO_V4L2
select VIDEO_OV7670
---help---
This is a video4linux2 driver for the Marvell 88ALP01 integrated
CMOS camera controller. This is the controller found on first-
generation OLPC systems.

1
drivers/media/video/marvell-ccic/Makefile Normal file
View file

@ -0,0 +1 @@
obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o

0
drivers/media/video/cafe_ccic-regs.h → drivers/media/video/marvell-ccic/cafe_ccic-regs.h
View file

2
drivers/media/video/cafe_ccic.c → drivers/media/video/marvell-ccic/cafe_ccic.c
View file

@ -36,6 +36,7 @@
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h> #include <media/v4l2-ioctl.h>
#include <media/v4l2-chip-ident.h> #include <media/v4l2-chip-ident.h>
#include <media/ov7670.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/list.h> #include <linux/list.h>
@ -47,7 +48,6 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include "ov7670.h"
#include "cafe_ccic-regs.h" #include "cafe_ccic-regs.h"
#define CAFE_VERSION 0x000002 #define CAFE_VERSION 0x000002

3
drivers/media/video/ov7670.c
View file

@ -19,8 +19,7 @@
#include <media/v4l2-device.h> #include <media/v4l2-device.h>
#include <media/v4l2-chip-ident.h> #include <media/v4l2-chip-ident.h>
#include <media/v4l2-mediabus.h> #include <media/v4l2-mediabus.h>
#include <media/ov7670.h>
#include "ov7670.h"
MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>"); MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>");
MODULE_DESCRIPTION("A low-level driver for OmniVision ov7670 sensors"); MODULE_DESCRIPTION("A low-level driver for OmniVision ov7670 sensors");

0
drivers/media/video/ov7670.h → include/media/ov7670.h
View file