diff options
Diffstat (limited to 'drivers/media/video/marvell-ccic')
| -rw-r--r-- | drivers/media/video/marvell-ccic/Kconfig | 23 | ||||
| -rw-r--r-- | drivers/media/video/marvell-ccic/Makefile | 6 | ||||
| -rw-r--r-- | drivers/media/video/marvell-ccic/cafe-driver.c | 654 | ||||
| -rw-r--r-- | drivers/media/video/marvell-ccic/mcam-core.c | 1878 | ||||
| -rw-r--r-- | drivers/media/video/marvell-ccic/mcam-core.h | 322 | ||||
| -rw-r--r-- | drivers/media/video/marvell-ccic/mmp-driver.c | 380 |
6 files changed, 0 insertions, 3263 deletions
diff --git a/drivers/media/video/marvell-ccic/Kconfig b/drivers/media/video/marvell-ccic/Kconfig deleted file mode 100644 index bf739e3b3398..000000000000 --- a/drivers/media/video/marvell-ccic/Kconfig +++ /dev/null @@ -1,23 +0,0 @@ -config VIDEO_CAFE_CCIC - tristate "Marvell 88ALP01 (Cafe) CMOS Camera Controller support" - depends on PCI && I2C && VIDEO_V4L2 - select VIDEO_OV7670 - select VIDEOBUF2_VMALLOC - select VIDEOBUF2_DMA_CONTIG - ---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_MMP_CAMERA - tristate "Marvell Armada 610 integrated camera controller support" - depends on ARCH_MMP && I2C && VIDEO_V4L2 - select VIDEO_OV7670 - select I2C_GPIO - select VIDEOBUF2_DMA_SG - ---help--- - This is a Video4Linux2 driver for the integrated camera - controller found on Marvell Armada 610 application - processors (and likely beyond). This is the controller found - in OLPC XO 1.75 systems. - diff --git a/drivers/media/video/marvell-ccic/Makefile b/drivers/media/video/marvell-ccic/Makefile deleted file mode 100644 index 05a792c579a2..000000000000 --- a/drivers/media/video/marvell-ccic/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -obj-$(CONFIG_VIDEO_CAFE_CCIC) += cafe_ccic.o -cafe_ccic-y := cafe-driver.o mcam-core.o - -obj-$(CONFIG_VIDEO_MMP_CAMERA) += mmp_camera.o -mmp_camera-y := mmp-driver.o mcam-core.o - diff --git a/drivers/media/video/marvell-ccic/cafe-driver.c b/drivers/media/video/marvell-ccic/cafe-driver.c deleted file mode 100644 index d030f9beae88..000000000000 --- a/drivers/media/video/marvell-ccic/cafe-driver.c +++ /dev/null @@ -1,654 +0,0 @@ -/* - * A driver for the CMOS camera controller in the Marvell 88ALP01 "cafe" - * multifunction chip. Currently works with the Omnivision OV7670 - * sensor. - * - * The data sheet for this device can be found at: - * http://www.marvell.com/products/pc_connectivity/88alp01/ - * - * Copyright 2006-11 One Laptop Per Child Association, Inc. - * Copyright 2006-11 Jonathan Corbet <corbet@lwn.net> - * - * Written by Jonathan Corbet, corbet@lwn.net. - * - * v4l2_device/v4l2_subdev conversion by: - * Copyright (C) 2009 Hans Verkuil <hverkuil@xs4all.nl> - * - * This file may be distributed under the terms of the GNU General - * Public License, version 2. - */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/init.h> -#include <linux/pci.h> -#include <linux/i2c.h> -#include <linux/interrupt.h> -#include <linux/spinlock.h> -#include <linux/slab.h> -#include <linux/videodev2.h> -#include <media/v4l2-device.h> -#include <media/v4l2-chip-ident.h> -#include <linux/device.h> -#include <linux/wait.h> -#include <linux/delay.h> -#include <linux/io.h> - -#include "mcam-core.h" - -#define CAFE_VERSION 0x000002 - - -/* - * Parameters. - */ -MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>"); -MODULE_DESCRIPTION("Marvell 88ALP01 CMOS Camera Controller driver"); -MODULE_LICENSE("GPL"); -MODULE_SUPPORTED_DEVICE("Video"); - - - - -struct cafe_camera { - int registered; /* Fully initialized? */ - struct mcam_camera mcam; - struct pci_dev *pdev; - wait_queue_head_t smbus_wait; /* Waiting on i2c events */ -}; - -/* - * Most of the camera controller registers are defined in mcam-core.h, - * but the Cafe platform has some additional registers of its own; - * they are described here. - */ - -/* - * "General purpose register" has a couple of GPIOs used for sensor - * power and reset on OLPC XO 1.0 systems. - */ -#define REG_GPR 0xb4 -#define GPR_C1EN 0x00000020 /* Pad 1 (power down) enable */ -#define GPR_C0EN 0x00000010 /* Pad 0 (reset) enable */ -#define GPR_C1 0x00000002 /* Control 1 value */ -/* - * Control 0 is wired to reset on OLPC machines. For ov7x sensors, - * it is active low. - */ -#define GPR_C0 0x00000001 /* Control 0 value */ - -/* - * These registers control the SMBUS module for communicating - * with the sensor. - */ -#define REG_TWSIC0 0xb8 /* TWSI (smbus) control 0 */ -#define TWSIC0_EN 0x00000001 /* TWSI enable */ -#define TWSIC0_MODE 0x00000002 /* 1 = 16-bit, 0 = 8-bit */ -#define TWSIC0_SID 0x000003fc /* Slave ID */ -/* - * Subtle trickery: the slave ID field starts with bit 2. But the - * Linux i2c stack wants to treat the bottommost bit as a separate - * read/write bit, which is why slave ID's are usually presented - * >>1. For consistency with that behavior, we shift over three - * bits instead of two. - */ -#define TWSIC0_SID_SHIFT 3 -#define TWSIC0_CLKDIV 0x0007fc00 /* Clock divider */ -#define TWSIC0_MASKACK 0x00400000 /* Mask ack from sensor */ -#define TWSIC0_OVMAGIC 0x00800000 /* Make it work on OV sensors */ - -#define REG_TWSIC1 0xbc /* TWSI control 1 */ -#define TWSIC1_DATA 0x0000ffff /* Data to/from camchip */ -#define TWSIC1_ADDR 0x00ff0000 /* Address (register) */ -#define TWSIC1_ADDR_SHIFT 16 -#define TWSIC1_READ 0x01000000 /* Set for read op */ -#define TWSIC1_WSTAT 0x02000000 /* Write status */ -#define TWSIC1_RVALID 0x04000000 /* Read data valid */ -#define TWSIC1_ERROR 0x08000000 /* Something screwed up */ - -/* - * Here's the weird global control registers - */ -#define REG_GL_CSR 0x3004 /* Control/status register */ -#define GCSR_SRS 0x00000001 /* SW Reset set */ -#define GCSR_SRC 0x00000002 /* SW Reset clear */ -#define GCSR_MRS 0x00000004 /* Master reset set */ -#define GCSR_MRC 0x00000008 /* HW Reset clear */ -#define GCSR_CCIC_EN 0x00004000 /* CCIC Clock enable */ -#define REG_GL_IMASK 0x300c /* Interrupt mask register */ -#define GIMSK_CCIC_EN 0x00000004 /* CCIC Interrupt enable */ - -#define REG_GL_FCR 0x3038 /* GPIO functional control register */ -#define GFCR_GPIO_ON 0x08 /* Camera GPIO enabled */ -#define REG_GL_GPIOR 0x315c /* GPIO register */ -#define GGPIO_OUT 0x80000 /* GPIO output */ -#define GGPIO_VAL 0x00008 /* Output pin value */ - -#define REG_LEN (REG_GL_IMASK + 4) - - -/* - * Debugging and related. - */ -#define cam_err(cam, fmt, arg...) \ - dev_err(&(cam)->pdev->dev, fmt, ##arg); -#define cam_warn(cam, fmt, arg...) \ - dev_warn(&(cam)->pdev->dev, fmt, ##arg); - -/* -------------------------------------------------------------------- */ -/* - * The I2C/SMBUS interface to the camera itself starts here. The - * controller handles SMBUS itself, presenting a relatively simple register - * interface; all we have to do is to tell it where to route the data. - */ -#define CAFE_SMBUS_TIMEOUT (HZ) /* generous */ - -static inline struct cafe_camera *to_cam(struct v4l2_device *dev) -{ - struct mcam_camera *m = container_of(dev, struct mcam_camera, v4l2_dev); - return container_of(m, struct cafe_camera, mcam); -} - - -static int cafe_smbus_write_done(struct mcam_camera *mcam) -{ - unsigned long flags; - int c1; - - /* - * We must delay after the interrupt, or the controller gets confused - * and never does give us good status. Fortunately, we don't do this - * often. - */ - udelay(20); - spin_lock_irqsave(&mcam->dev_lock, flags); - c1 = mcam_reg_read(mcam, REG_TWSIC1); - spin_unlock_irqrestore(&mcam->dev_lock, flags); - return (c1 & (TWSIC1_WSTAT|TWSIC1_ERROR)) != TWSIC1_WSTAT; -} - -static int cafe_smbus_write_data(struct cafe_camera *cam, - u16 addr, u8 command, u8 value) -{ - unsigned int rval; - unsigned long flags; - struct mcam_camera *mcam = &cam->mcam; - - spin_lock_irqsave(&mcam->dev_lock, flags); - rval = TWSIC0_EN | ((addr << TWSIC0_SID_SHIFT) & TWSIC0_SID); - rval |= TWSIC0_OVMAGIC; /* Make OV sensors work */ - /* - * Marvell sez set clkdiv to all 1's for now. - */ - rval |= TWSIC0_CLKDIV; - mcam_reg_write(mcam, REG_TWSIC0, rval); - (void) mcam_reg_read(mcam, REG_TWSIC1); /* force write */ - rval = value | ((command << TWSIC1_ADDR_SHIFT) & TWSIC1_ADDR); - mcam_reg_write(mcam, REG_TWSIC1, rval); - spin_unlock_irqrestore(&mcam->dev_lock, flags); - - /* Unfortunately, reading TWSIC1 too soon after sending a command - * causes the device to die. - * Use a busy-wait because we often send a large quantity of small - * commands at-once; using msleep() would cause a lot of context - * switches which take longer than 2ms, resulting in a noticeable - * boot-time and capture-start delays. - */ - mdelay(2); - - /* - * Another sad fact is that sometimes, commands silently complete but - * cafe_smbus_write_done() never becomes aware of this. - * This happens at random and appears to possible occur with any - * command. - * We don't understand why this is. We work around this issue - * with the timeout in the wait below, assuming that all commands - * complete within the timeout. - */ - wait_event_timeout(cam->smbus_wait, cafe_smbus_write_done(mcam), - CAFE_SMBUS_TIMEOUT); - - spin_lock_irqsave(&mcam->dev_lock, flags); - rval = mcam_reg_read(mcam, REG_TWSIC1); - spin_unlock_irqrestore(&mcam->dev_lock, flags); - - if (rval & TWSIC1_WSTAT) { - cam_err(cam, "SMBUS write (%02x/%02x/%02x) timed out\n", addr, - command, value); - return -EIO; - } - if (rval & TWSIC1_ERROR) { - cam_err(cam, "SMBUS write (%02x/%02x/%02x) error\n", addr, - command, value); - return -EIO; - } - return 0; -} - - - -static int cafe_smbus_read_done(struct mcam_camera *mcam) -{ - unsigned long flags; - int c1; - - /* - * We must delay after the interrupt, or the controller gets confused - * and never does give us good status. Fortunately, we don't do this - * often. - */ - udelay(20); - spin_lock_irqsave(&mcam->dev_lock, flags); - c1 = mcam_reg_read(mcam, REG_TWSIC1); - spin_unlock_irqrestore(&mcam->dev_lock, flags); - return c1 & (TWSIC1_RVALID|TWSIC1_ERROR); -} - - - -static int cafe_smbus_read_data(struct cafe_camera *cam, - u16 addr, u8 command, u8 *value) -{ - unsigned int rval; - unsigned long flags; - struct mcam_camera *mcam = &cam->mcam; - - spin_lock_irqsave(&mcam->dev_lock, flags); - rval = TWSIC0_EN | ((addr << TWSIC0_SID_SHIFT) & TWSIC0_SID); - rval |= TWSIC0_OVMAGIC; /* Make OV sensors work */ - /* - * Marvel sez set clkdiv to all 1's for now. - */ - rval |= TWSIC0_CLKDIV; - mcam_reg_write(mcam, REG_TWSIC0, rval); - (void) mcam_reg_read(mcam, REG_TWSIC1); /* force write */ - rval = TWSIC1_READ | ((command << TWSIC1_ADDR_SHIFT) & TWSIC1_ADDR); - mcam_reg_write(mcam, REG_TWSIC1, rval); - spin_unlock_irqrestore(&mcam->dev_lock, flags); - - wait_event_timeout(cam->smbus_wait, - cafe_smbus_read_done(mcam), CAFE_SMBUS_TIMEOUT); - spin_lock_irqsave(&mcam->dev_lock, flags); - rval = mcam_reg_read(mcam, REG_TWSIC1); - spin_unlock_irqrestore(&mcam->dev_lock, flags); - - if (rval & TWSIC1_ERROR) { - cam_err(cam, "SMBUS read (%02x/%02x) error\n", addr, command); - return -EIO; - } - if (!(rval & TWSIC1_RVALID)) { - cam_err(cam, "SMBUS read (%02x/%02x) timed out\n", addr, - command); - return -EIO; - } - *value = rval & 0xff; - return 0; -} - -/* - * Perform a transfer over SMBUS. This thing is called under - * the i2c bus lock, so we shouldn't race with ourselves... - */ -static int cafe_smbus_xfer(struct i2c_adapter *adapter, u16 addr, - unsigned short flags, char rw, u8 command, - int size, union i2c_smbus_data *data) -{ - struct cafe_camera *cam = i2c_get_adapdata(adapter); - int ret = -EINVAL; - - /* - * This interface would appear to only do byte data ops. OK - * it can do word too, but the cam chip has no use for that. - */ - if (size != I2C_SMBUS_BYTE_DATA) { - cam_err(cam, "funky xfer size %d\n", size); - return -EINVAL; - } - - if (rw == I2C_SMBUS_WRITE) - ret = cafe_smbus_write_data(cam, addr, command, data->byte); - else if (rw == I2C_SMBUS_READ) - ret = cafe_smbus_read_data(cam, addr, command, &data->byte); - return ret; -} - - -static void cafe_smbus_enable_irq(struct cafe_camera *cam) -{ - unsigned long flags; - - spin_lock_irqsave(&cam->mcam.dev_lock, flags); - mcam_reg_set_bit(&cam->mcam, REG_IRQMASK, TWSIIRQS); - spin_unlock_irqrestore(&cam->mcam.dev_lock, flags); -} - -static u32 cafe_smbus_func(struct i2c_adapter *adapter) -{ - return I2C_FUNC_SMBUS_READ_BYTE_DATA | - I2C_FUNC_SMBUS_WRITE_BYTE_DATA; -} - -static struct i2c_algorithm cafe_smbus_algo = { - .smbus_xfer = cafe_smbus_xfer, - .functionality = cafe_smbus_func -}; - -static int cafe_smbus_setup(struct cafe_camera *cam) -{ - struct i2c_adapter *adap; - int ret; - - adap = kzalloc(sizeof(*adap), GFP_KERNEL); - if (adap == NULL) - return -ENOMEM; - cam->mcam.i2c_adapter = adap; - cafe_smbus_enable_irq(cam); - adap->owner = THIS_MODULE; - adap->algo = &cafe_smbus_algo; - strcpy(adap->name, "cafe_ccic"); - adap->dev.parent = &cam->pdev->dev; - i2c_set_adapdata(adap, cam); - ret = i2c_add_adapter(adap); - if (ret) - printk(KERN_ERR "Unable to register cafe i2c adapter\n"); - return ret; -} - -static void cafe_smbus_shutdown(struct cafe_camera *cam) -{ - i2c_del_adapter(cam->mcam.i2c_adapter); - kfree(cam->mcam.i2c_adapter); -} - - -/* - * Controller-level stuff - */ - -static void cafe_ctlr_init(struct mcam_camera *mcam) -{ - unsigned long flags; - - spin_lock_irqsave(&mcam->dev_lock, flags); - /* - * Added magic to bring up the hardware on the B-Test board - */ - mcam_reg_write(mcam, 0x3038, 0x8); - mcam_reg_write(mcam, 0x315c, 0x80008); - /* - * Go through the dance needed to wake the device up. - * Note that these registers are global and shared - * with the NAND and SD devices. Interaction between the - * three still needs to be examined. - */ - mcam_reg_write(mcam, REG_GL_CSR, GCSR_SRS|GCSR_MRS); /* Needed? */ - mcam_reg_write(mcam, REG_GL_CSR, GCSR_SRC|GCSR_MRC); - mcam_reg_write(mcam, REG_GL_CSR, GCSR_SRC|GCSR_MRS); - /* - * Here we must wait a bit for the controller to come around. - */ - spin_unlock_irqrestore(&mcam->dev_lock, flags); - msleep(5); - spin_lock_irqsave(&mcam->dev_lock, flags); - - mcam_reg_write(mcam, REG_GL_CSR, GCSR_CCIC_EN|GCSR_SRC|GCSR_MRC); - mcam_reg_set_bit(mcam, REG_GL_IMASK, GIMSK_CCIC_EN); - /* - * Mask all interrupts. - */ - mcam_reg_write(mcam, REG_IRQMASK, 0); - spin_unlock_irqrestore(&mcam->dev_lock, flags); -} - - -static void cafe_ctlr_power_up(struct mcam_camera *mcam) -{ - /* - * Part one of the sensor dance: turn the global - * GPIO signal on. - */ - mcam_reg_write(mcam, REG_GL_FCR, GFCR_GPIO_ON); - mcam_reg_write(mcam, REG_GL_GPIOR, GGPIO_OUT|GGPIO_VAL); - /* - * Put the sensor into operational mode (assumes OLPC-style - * wiring). Control 0 is reset - set to 1 to operate. - * Control 1 is power down, set to 0 to operate. - */ - mcam_reg_write(mcam, REG_GPR, GPR_C1EN|GPR_C0EN); /* pwr up, reset */ - mcam_reg_write(mcam, REG_GPR, GPR_C1EN|GPR_C0EN|GPR_C0); -} - -static void cafe_ctlr_power_down(struct mcam_camera *mcam) -{ - mcam_reg_write(mcam, REG_GPR, GPR_C1EN|GPR_C0EN|GPR_C1); - mcam_reg_write(mcam, REG_GL_FCR, GFCR_GPIO_ON); - mcam_reg_write(mcam, REG_GL_GPIOR, GGPIO_OUT); -} - - - -/* - * The platform interrupt handler. - */ -static irqreturn_t cafe_irq(int irq, void *data) -{ - struct cafe_camera *cam = data; - struct mcam_camera *mcam = &cam->mcam; - unsigned int irqs, handled; - - spin_lock(&mcam->dev_lock); - irqs = mcam_reg_read(mcam, REG_IRQSTAT); - handled = cam->registered && mccic_irq(mcam, irqs); - if (irqs & TWSIIRQS) { - mcam_reg_write(mcam, REG_IRQSTAT, TWSIIRQS); - wake_up(&cam->smbus_wait); - handled = 1; - } - spin_unlock(&mcam->dev_lock); - return IRQ_RETVAL(handled); -} - - -/* -------------------------------------------------------------------------- */ -/* - * PCI interface stuff. - */ - -static int cafe_pci_probe(struct pci_dev *pdev, - const struct pci_device_id *id) -{ - int ret; - struct cafe_camera *cam; - struct mcam_camera *mcam; - - /* - * Start putting together one of our big camera structures. - */ - ret = -ENOMEM; - cam = kzalloc(sizeof(struct cafe_camera), GFP_KERNEL); - if (cam == NULL) - goto out; - cam->pdev = pdev; - mcam = &cam->mcam; - mcam->chip_id = V4L2_IDENT_CAFE; - spin_lock_init(&mcam->dev_lock); - init_waitqueue_head(&cam->smbus_wait); - mcam->plat_power_up = cafe_ctlr_power_up; - mcam->plat_power_down = cafe_ctlr_power_down; - mcam->dev = &pdev->dev; - /* - * Set the clock speed for the XO 1; I don't believe this - * driver has ever run anywhere else. - */ - mcam->clock_speed = 45; - mcam->use_smbus = 1; - /* - * Vmalloc mode for buffers is traditional with this driver. - * We *might* be able to run DMA_contig, especially on a system - * with CMA in it. - */ - mcam->buffer_mode = B_vmalloc; - /* - * Get set up on the PCI bus. - */ - ret = pci_enable_device(pdev); - if (ret) - goto out_free; - pci_set_master(pdev); - - ret = -EIO; - mcam->regs = pci_iomap(pdev, 0, 0); - if (!mcam->regs) { - printk(KERN_ERR "Unable to ioremap cafe-ccic regs\n"); - goto out_disable; - } - ret = request_irq(pdev->irq, cafe_irq, IRQF_SHARED, "cafe-ccic", cam); - if (ret) - goto out_iounmap; - - /* - * Initialize the controller and leave it powered up. It will - * stay that way until the sensor driver shows up. - */ - cafe_ctlr_init(mcam); - cafe_ctlr_power_up(mcam); - /* - * Set up I2C/SMBUS communications. We have to drop the mutex here - * because the sensor could attach in this call chain, leading to - * unsightly deadlocks. - */ - ret = cafe_smbus_setup(cam); - if (ret) - goto out_pdown; - - ret = mccic_register(mcam); - if (ret == 0) { - cam->registered = 1; - return 0; - } - - cafe_smbus_shutdown(cam); -out_pdown: - cafe_ctlr_power_down(mcam); - free_irq(pdev->irq, cam); -out_iounmap: - pci_iounmap(pdev, mcam->regs); -out_disable: - pci_disable_device(pdev); -out_free: - kfree(cam); -out: - return ret; -} - - -/* - * Shut down an initialized device - */ -static void cafe_shutdown(struct cafe_camera *cam) -{ - mccic_shutdown(&cam->mcam); - cafe_smbus_shutdown(cam); - free_irq(cam->pdev->irq, cam); - pci_iounmap(cam->pdev, cam->mcam.regs); -} - - -static void cafe_pci_remove(struct pci_dev *pdev) -{ - struct v4l2_device *v4l2_dev = dev_get_drvdata(&pdev->dev); - struct cafe_camera *cam = to_cam(v4l2_dev); - - if (cam == NULL) { - printk(KERN_WARNING "pci_remove on unknown pdev %p\n", pdev); - return; - } - cafe_shutdown(cam); - kfree(cam); -} - - -#ifdef CONFIG_PM -/* - * Basic power management. - */ -static int cafe_pci_suspend(struct pci_dev *pdev, pm_message_t state) -{ - struct v4l2_device *v4l2_dev = dev_get_drvdata(&pdev->dev); - struct cafe_camera *cam = to_cam(v4l2_dev); - int ret; - - ret = pci_save_state(pdev); - if (ret) - return ret; - mccic_suspend(&cam->mcam); - pci_disable_device(pdev); - return 0; -} - - -static int cafe_pci_resume(struct pci_dev *pdev) -{ - struct v4l2_device *v4l2_dev = dev_get_drvdata(&pdev->dev); - struct cafe_camera *cam = to_cam(v4l2_dev); - int ret = 0; - - pci_restore_state(pdev); - ret = pci_enable_device(pdev); - - if (ret) { - cam_warn(cam, "Unable to re-enable device on resume!\n"); - return ret; - } - cafe_ctlr_init(&cam->mcam); - return mccic_resume(&cam->mcam); -} - -#endif /* CONFIG_PM */ - -static struct pci_device_id cafe_ids[] = { - { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, - PCI_DEVICE_ID_MARVELL_88ALP01_CCIC) }, - { 0, } -}; - -MODULE_DEVICE_TABLE(pci, cafe_ids); - -static struct pci_driver cafe_pci_driver = { - .name = "cafe1000-ccic", - .id_table = cafe_ids, - .probe = cafe_pci_probe, - .remove = cafe_pci_remove, -#ifdef CONFIG_PM - .suspend = cafe_pci_suspend, - .resume = cafe_pci_resume, -#endif -}; - - - - -static int __init cafe_init(void) -{ - int ret; - - printk(KERN_NOTICE "Marvell M88ALP01 'CAFE' Camera Controller version %d\n", - CAFE_VERSION); - ret = pci_register_driver(&cafe_pci_driver); - if (ret) { - printk(KERN_ERR "Unable to register cafe_ccic driver\n"); - goto out; - } - ret = 0; - -out: - return ret; -} - - -static void __exit cafe_exit(void) -{ - pci_unregister_driver(&cafe_pci_driver); -} - -module_init(cafe_init); -module_exit(cafe_exit); diff --git a/drivers/media/video/marvell-ccic/mcam-core.c b/drivers/media/video/marvell-ccic/mcam-core.c deleted file mode 100644 index ce2b7b4788d6..000000000000 --- a/drivers/media/video/marvell-ccic/mcam-core.c +++ /dev/null @@ -1,1878 +0,0 @@ -/* - * The Marvell camera core. This device appears in a number of settings, - * so it needs platform-specific support outside of the core. - * - * Copyright 2011 Jonathan Corbet corbet@lwn.net - */ -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/fs.h> -#include <linux/mm.h> -#include <linux/i2c.h> -#include <linux/interrupt.h> -#include <linux/spinlock.h> -#include <linux/slab.h> -#include <linux/device.h> -#include <linux/wait.h> -#include <linux/list.h> -#include <linux/dma-mapping.h> -#include <linux/delay.h> -#include <linux/vmalloc.h> -#include <linux/io.h> -#include <linux/videodev2.h> -#include <media/v4l2-device.h> -#include <media/v4l2-ioctl.h> -#include <media/v4l2-chip-ident.h> -#include <media/ov7670.h> -#include <media/videobuf2-vmalloc.h> -#include <media/videobuf2-dma-contig.h> -#include <media/videobuf2-dma-sg.h> - -#include "mcam-core.h" - -/* - * Basic frame stats - to be deleted shortly - */ -static int frames; -static int singles; -static int delivered; - -#ifdef MCAM_MODE_VMALLOC -/* - * Internal DMA buffer management. Since the controller cannot do S/G I/O, - * we must have physically contiguous buffers to bring frames into. - * These parameters control how many buffers we use, whether we - * allocate them at load time (better chance of success, but nails down - * memory) or when somebody tries to use the camera (riskier), and, - * for load-time allocation, how big they should be. - * - * The controller can cycle through three buffers. We could use - * more by flipping pointers around, but it probably makes little - * sense. - */ - -static bool alloc_bufs_at_read; -module_param(alloc_bufs_at_read, bool, 0444); -MODULE_PARM_DESC(alloc_bufs_at_read, - "Non-zero value causes DMA buffers to be allocated when the " - "video capture device is read, rather than at module load " - "time. This saves memory, but decreases the chances of " - "successfully getting those buffers. This parameter is " - "only used in the vmalloc buffer mode"); - -static int n_dma_bufs = 3; -module_param(n_dma_bufs, uint, 0644); -MODULE_PARM_DESC(n_dma_bufs, - "The number of DMA buffers to allocate. Can be either two " - "(saves memory, makes timing tighter) or three."); - -static int dma_buf_size = VGA_WIDTH * VGA_HEIGHT * 2; /* Worst case */ -module_param(dma_buf_size, uint, 0444); -MODULE_PARM_DESC(dma_buf_size, - "The size of the allocated DMA buffers. If actual operating " - "parameters require larger buffers, an attempt to reallocate " - "will be made."); -#else /* MCAM_MODE_VMALLOC */ -static const bool alloc_bufs_at_read = 0; -static const int n_dma_bufs = 3; /* Used by S/G_PARM */ -#endif /* MCAM_MODE_VMALLOC */ - -static bool flip; -module_param(flip, bool, 0444); -MODULE_PARM_DESC(flip, - "If set, the sensor will be instructed to flip the image " - "vertically."); - -static int buffer_mode = -1; -module_param(buffer_mode, int, 0444); -MODULE_PARM_DESC(buffer_mode, - "Set the buffer mode to be used; default is to go with what " - "the platform driver asks for. Set to 0 for vmalloc, 1 for " - "DMA contiguous."); - -/* - * Status flags. Always manipulated with bit operations. - */ -#define CF_BUF0_VALID 0 /* Buffers valid - first three */ -#define CF_BUF1_VALID 1 -#define CF_BUF2_VALID 2 -#define CF_DMA_ACTIVE 3 /* A frame is incoming */ -#define CF_CONFIG_NEEDED 4 /* Must configure hardware */ -#define CF_SINGLE_BUFFER 5 /* Running with a single buffer */ -#define CF_SG_RESTART 6 /* SG restart needed */ - -#define sensor_call(cam, o, f, args...) \ - v4l2_subdev_call(cam->sensor, o, f, ##args) - -static struct mcam_format_struct { - __u8 *desc; - __u32 pixelformat; - int bpp; /* Bytes per pixel */ - enum v4l2_mbus_pixelcode mbus_code; -} mcam_formats[] = { - { - .desc = "YUYV 4:2:2", - .pixelformat = V4L2_PIX_FMT_YUYV, - .mbus_code = V4L2_MBUS_FMT_YUYV8_2X8, - .bpp = 2, - }, - { - .desc = "RGB 444", - .pixelformat = V4L2_PIX_FMT_RGB444, - .mbus_code = V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE, - .bpp = 2, - }, - { - .desc = "RGB 565", - .pixelformat = V4L2_PIX_FMT_RGB565, - .mbus_code = V4L2_MBUS_FMT_RGB565_2X8_LE, - .bpp = 2, - }, - { - .desc = "Raw RGB Bayer", - .pixelformat = V4L2_PIX_FMT_SBGGR8, - .mbus_code = V4L2_MBUS_FMT_SBGGR8_1X8, - .bpp = 1 - }, -}; -#define N_MCAM_FMTS ARRAY_SIZE(mcam_formats) - -static struct mcam_format_struct *mcam_find_format(u32 pixelformat) -{ - unsigned i; - - for (i = 0; i < N_MCAM_FMTS; i++) - if (mcam_formats[i].pixelformat == pixelformat) - return mcam_formats + i; - /* Not found? Then return the first format. */ - return mcam_formats; -} - -/* - * The default format we use until somebody says otherwise. - */ -static const struct v4l2_pix_format mcam_def_pix_format = { - .width = VGA_WIDTH, - .height = VGA_HEIGHT, - .pixelformat = V4L2_PIX_FMT_YUYV, - .field = V4L2_FIELD_NONE, - .bytesperline = VGA_WIDTH*2, - .sizeimage = VGA_WIDTH*VGA_HEIGHT*2, -}; - -static const enum v4l2_mbus_pixelcode mcam_def_mbus_code = - V4L2_MBUS_FMT_YUYV8_2X8; - - -/* - * The two-word DMA descriptor format used by the Armada 610 and like. There - * Is a three-word format as well (set C1_DESC_3WORD) where the third - * word is a pointer to the next descriptor, but we don't use it. Two-word - * descriptors have to be contiguous in memory. - */ -struct mcam_dma_desc { - u32 dma_addr; - u32 segment_len; -}; - -/* - * Our buffer type for working with videobuf2. Note that the vb2 - * developers have decreed that struct vb2_buffer must be at the - * beginning of this structure. - */ -struct mcam_vb_buffer { - struct vb2_buffer vb_buf; - struct list_head queue; - struct mcam_dma_desc *dma_desc; /* Descriptor virtual address */ - dma_addr_t dma_desc_pa; /* Descriptor physical address */ - int dma_desc_nent; /* Number of mapped descriptors */ -}; - -static inline struct mcam_vb_buffer *vb_to_mvb(struct vb2_buffer *vb) -{ - return container_of(vb, struct mcam_vb_buffer, vb_buf); -} - -/* - * Hand a completed buffer back to user space. - */ -static void mcam_buffer_done(struct mcam_camera *cam, int frame, - struct vb2_buffer *vbuf) -{ - vbuf->v4l2_buf.bytesused = cam->pix_format.sizeimage; - vbuf->v4l2_buf.sequence = cam->buf_seq[frame]; - vb2_set_plane_payload(vbuf, 0, cam->pix_format.sizeimage); - vb2_buffer_done(vbuf, VB2_BUF_STATE_DONE); -} - - - -/* - * Debugging and related. - */ -#define cam_err(cam, fmt, arg...) \ - dev_err((cam)->dev, fmt, ##arg); -#define cam_warn(cam, fmt, arg...) \ - dev_warn((cam)->dev, fmt, ##arg); -#define cam_dbg(cam, fmt, arg...) \ - dev_dbg((cam)->dev, fmt, ##arg); - - -/* - * Flag manipulation helpers - */ -static void mcam_reset_buffers(struct mcam_camera *cam) -{ - int i; - - cam->next_buf = -1; - for (i = 0; i < cam->nbufs; i++) - clear_bit(i, &cam->flags); -} - -static inline int mcam_needs_config(struct mcam_camera *cam) -{ - return test_bit(CF_CONFIG_NEEDED, &cam->flags); -} - -static void mcam_set_config_needed(struct mcam_camera *cam, int needed) -{ - if (needed) - set_bit(CF_CONFIG_NEEDED, &cam->flags); - else - clear_bit(CF_CONFIG_NEEDED, &cam->flags); -} - -/* ------------------------------------------------------------------- */ -/* - * Make the controller start grabbing images. Everything must - * be set up before doing this. - */ -static void mcam_ctlr_start(struct mcam_camera *cam) -{ - /* set_bit performs a read, so no other barrier should be - needed here */ - mcam_reg_set_bit(cam, REG_CTRL0, C0_ENABLE); -} - -static void mcam_ctlr_stop(struct mcam_camera *cam) -{ - mcam_reg_clear_bit(cam, REG_CTRL0, C0_ENABLE); -} - -/* ------------------------------------------------------------------- */ - -#ifdef MCAM_MODE_VMALLOC -/* - * Code specific to the vmalloc buffer mode. - */ - -/* - * Allocate in-kernel DMA buffers for vmalloc mode. - */ -static int mcam_alloc_dma_bufs(struct mcam_camera *cam, int loadtime) -{ - int i; - - mcam_set_config_needed(cam, 1); - if (loadtime) - cam->dma_buf_size = dma_buf_size; - else - cam->dma_buf_size = cam->pix_format.sizeimage; - if (n_dma_bufs > 3) - n_dma_bufs = 3; - - cam->nbufs = 0; - for (i = 0; i < n_dma_bufs; i++) { - cam->dma_bufs[i] = dma_alloc_coherent(cam->dev, - cam->dma_buf_size, cam->dma_handles + i, - GFP_KERNEL); - if (cam->dma_bufs[i] == NULL) { - cam_warn(cam, "Failed to allocate DMA buffer\n"); - break; - } - (cam->nbufs)++; - } - - switch (cam->nbufs) { - case 1: - dma_free_coherent(cam->dev, cam->dma_buf_size, - cam->dma_bufs[0], cam->dma_handles[0]); - cam->nbufs = 0; - case 0: - cam_err(cam, "Insufficient DMA buffers, cannot operate\n"); - return -ENOMEM; - - case 2: - if (n_dma_bufs > 2) - cam_warn(cam, "Will limp along with only 2 buffers\n"); - break; - } - return 0; -} - -static void mcam_free_dma_bufs(struct mcam_camera *cam) -{ - int i; - - for (i = 0; i < cam->nbufs; i++) { - dma_free_coherent(cam->dev, cam->dma_buf_size, - cam->dma_bufs[i], cam->dma_handles[i]); - cam->dma_bufs[i] = NULL; - } - cam->nbufs = 0; -} - - -/* - * Set up DMA buffers when operating in vmalloc mode - */ -static void mcam_ctlr_dma_vmalloc(struct mcam_camera *cam) -{ - /* - * Store the first two Y buffers (we aren't supporting - * planar formats for now, so no UV bufs). Then either - * set the third if it exists, or tell the controller - * to just use two. - */ - mcam_reg_write(cam, REG_Y0BAR, cam->dma_handles[0]); - mcam_reg_write(cam, REG_Y1BAR, cam->dma_handles[1]); - if (cam->nbufs > 2) { - mcam_reg_write(cam, REG_Y2BAR, cam->dma_handles[2]); - mcam_reg_clear_bit(cam, REG_CTRL1, C1_TWOBUFS); - } else - mcam_reg_set_bit(cam, REG_CTRL1, C1_TWOBUFS); - if (cam->chip_id == V4L2_IDENT_CAFE) - mcam_reg_write(cam, REG_UBAR, 0); /* 32 bits only */ -} - -/* - * Copy data out to user space in the vmalloc case - */ -static void mcam_frame_tasklet(unsigned long data) -{ - struct mcam_camera *cam = (struct mcam_camera *) data; - int i; - unsigned long flags; - struct mcam_vb_buffer *buf; - - spin_lock_irqsave(&cam->dev_lock, flags); - for (i = 0; i < cam->nbufs; i++) { - int bufno = cam->next_buf; - - if (cam->state != S_STREAMING || bufno < 0) - break; /* I/O got stopped */ - if (++(cam->next_buf) >= cam->nbufs) - cam->next_buf = 0; - if (!test_bit(bufno, &cam->flags)) - continue; - if (list_empty(&cam->buffers)) { - singles++; - break; /* Leave it valid, hope for better later */ - } - delivered++; - clear_bit(bufno, &cam->flags); - buf = list_first_entry(&cam->buffers, struct mcam_vb_buffer, - queue); - list_del_init(&buf->queue); - /* - * Drop the lock during the big copy. This *should* be safe... - */ - spin_unlock_irqrestore(&cam->dev_lock, flags); - memcpy(vb2_plane_vaddr(&buf->vb_buf, 0), cam->dma_bufs[bufno], - cam->pix_format.sizeimage); - mcam_buffer_done(cam, bufno, &buf->vb_buf); - spin_lock_irqsave(&cam->dev_lock, flags); - } - spin_unlock_irqrestore(&cam->dev_lock, flags); -} - - -/* - * Make sure our allocated buffers are up to the task. - */ -static int mcam_check_dma_buffers(struct mcam_camera *cam) -{ - if (cam->nbufs > 0 && cam->dma_buf_size < cam->pix_format.sizeimage) - mcam_free_dma_bufs(cam); - if (cam->nbufs == 0) - return mcam_alloc_dma_bufs(cam, 0); - return 0; -} - -static void mcam_vmalloc_done(struct mcam_camera *cam, int frame) -{ - tasklet_schedule(&cam->s_tasklet); -} - -#else /* MCAM_MODE_VMALLOC */ - -static inline int mcam_alloc_dma_bufs(struct mcam_camera *cam, int loadtime) -{ - return 0; -} - -static inline void mcam_free_dma_bufs(struct mcam_camera *cam) -{ - return; -} - -static inline int mcam_check_dma_buffers(struct mcam_camera *cam) -{ - return 0; -} - - - -#endif /* MCAM_MODE_VMALLOC */ - - -#ifdef MCAM_MODE_DMA_CONTIG -/* ---------------------------------------------------------------------- */ -/* - * DMA-contiguous code. - */ -/* - * Set up a contiguous buffer for the given frame. Here also is where - * the underrun strategy is set: if there is no buffer available, reuse - * the buffer from the other BAR and set the CF_SINGLE_BUFFER flag to - * keep the interrupt handler from giving that buffer back to user - * space. In this way, we always have a buffer to DMA to and don't - * have to try to play games stopping and restarting the controller. - */ -static void mcam_set_contig_buffer(struct mcam_camera *cam, int frame) -{ - struct mcam_vb_buffer *buf; - /* - * If there are no available buffers, go into single mode - */ - if (list_empty(&cam->buffers)) { - buf = cam->vb_bufs[frame ^ 0x1]; - cam->vb_bufs[frame] = buf; - mcam_reg_write(cam, frame == 0 ? REG_Y0BAR : REG_Y1BAR, - vb2_dma_contig_plane_dma_addr(&buf->vb_buf, 0)); - set_bit(CF_SINGLE_BUFFER, &cam->flags); - singles++; - return; - } - /* - * OK, we have a buffer we can use. - */ - buf = list_first_entry(&cam->buffers, struct mcam_vb_buffer, queue); - list_del_init(&buf->queue); - mcam_reg_write(cam, frame == 0 ? REG_Y0BAR : REG_Y1BAR, - vb2_dma_contig_plane_dma_addr(&buf->vb_buf, 0)); - cam->vb_bufs[frame] = buf; - clear_bit(CF_SINGLE_BUFFER, &cam->flags); -} - -/* - * Initial B_DMA_contig setup. - */ -static void mcam_ctlr_dma_contig(struct mcam_camera *cam) -{ - mcam_reg_set_bit(cam, REG_CTRL1, C1_TWOBUFS); - cam->nbufs = 2; - mcam_set_contig_buffer(cam, 0); - mcam_set_contig_buffer(cam, 1); -} - -/* - * Frame completion handling. - */ -static void mcam_dma_contig_done(struct mcam_camera *cam, int frame) -{ - struct mcam_vb_buffer *buf = cam->vb_bufs[frame]; - - if (!test_bit(CF_SINGLE_BUFFER, &cam->flags)) { - delivered++; - mcam_buffer_done(cam, frame, &buf->vb_buf); - } - mcam_set_contig_buffer(cam, frame); -} - -#endif /* MCAM_MODE_DMA_CONTIG */ - -#ifdef MCAM_MODE_DMA_SG -/* ---------------------------------------------------------------------- */ -/* - * Scatter/gather-specific code. - */ - -/* - * Set up the next buffer for S/G I/O; caller should be sure that - * the controller is stopped and a buffer is available. - */ -static void mcam_sg_next_buffer(struct mcam_camera *cam) -{ - struct mcam_vb_buffer *buf; - - buf = list_first_entry(&cam->buffers, struct mcam_vb_buffer, queue); - list_del_init(&buf->queue); - /* - * Very Bad Not Good Things happen if you don't clear - * C1_DESC_ENA before making any descriptor changes. - */ - mcam_reg_clear_bit(cam, REG_CTRL1, C1_DESC_ENA); - mcam_reg_write(cam, REG_DMA_DESC_Y, buf->dma_desc_pa); - mcam_reg_write(cam, REG_DESC_LEN_Y, - buf->dma_desc_nent*sizeof(struct mcam_dma_desc)); - mcam_reg_write(cam, REG_DESC_LEN_U, 0); - mcam_reg_write(cam, REG_DESC_LEN_V, 0); - mcam_reg_set_bit(cam, REG_CTRL1, C1_DESC_ENA); - cam->vb_bufs[0] = buf; -} - -/* - * Initial B_DMA_sg setup - */ -static void mcam_ctlr_dma_sg(struct mcam_camera *cam) -{ - /* - * The list-empty condition can hit us at resume time - * if the buffer list was empty when the system was suspended. - */ - if (list_empty(&cam->buffers)) { - set_bit(CF_SG_RESTART, &cam->flags); - return; - } - - mcam_reg_clear_bit(cam, REG_CTRL1, C1_DESC_3WORD); - mcam_sg_next_buffer(cam); - cam->nbufs = 3; -} - - -/* - * Frame completion with S/G is trickier. We can't muck with - * a descriptor chain on the fly, since the controller buffers it - * internally. So we have to actually stop and restart; Marvell - * says this is the way to do it. - * - * Of course, stopping is easier said than done; experience shows - * that the controller can start a frame *after* C0_ENABLE has been - * cleared. So when running in S/G mode, the controller is "stopped" - * on receipt of the start-of-frame interrupt. That means we can - * safely change the DMA descriptor array here and restart things - * (assuming there's another buffer waiting to go). - */ -static void mcam_dma_sg_done(struct mcam_camera *cam, int frame) -{ - struct mcam_vb_buffer *buf = cam->vb_bufs[0]; - - /* - * If we're no longer supposed to be streaming, don't do anything. - */ - if (cam->state != S_STREAMING) - return; - /* - * If we have another buffer available, put it in and - * restart the engine. - */ - if (!list_empty(&cam->buffers)) { - mcam_sg_next_buffer(cam); - mcam_ctlr_start(cam); - /* - * Otherwise set CF_SG_RESTART and the controller will - * be restarted once another buffer shows up. - */ - } else { - set_bit(CF_SG_RESTART, &cam->flags); - singles++; - cam->vb_bufs[0] = NULL; - } - /* - * Now we can give the completed frame back to user space. - */ - delivered++; - mcam_buffer_done(cam, frame, &buf->vb_buf); -} - - -/* - * Scatter/gather mode requires stopping the controller between - * frames so we can put in a new DMA descriptor array. If no new - * buffer exists at frame completion, the controller is left stopped; - * this function is charged with gettig things going again. - */ -static void mcam_sg_restart(struct mcam_camera *cam) -{ - mcam_ctlr_dma_sg(cam); - mcam_ctlr_start(cam); - clear_bit(CF_SG_RESTART, &cam->flags); -} - -#else /* MCAM_MODE_DMA_SG */ - -static inline void mcam_sg_restart(struct mcam_camera *cam) -{ - return; -} - -#endif /* MCAM_MODE_DMA_SG */ - -/* ---------------------------------------------------------------------- */ -/* - * Buffer-mode-independent controller code. - */ - -/* - * Image format setup - */ -static void mcam_ctlr_image(struct mcam_camera *cam) -{ - int imgsz; - struct v4l2_pix_format *fmt = &cam->pix_format; - - imgsz = ((fmt->height << IMGSZ_V_SHIFT) & IMGSZ_V_MASK) | - (fmt->bytesperline & IMGSZ_H_MASK); - mcam_reg_write(cam, REG_IMGSIZE, imgsz); - mcam_reg_write(cam, REG_IMGOFFSET, 0); - /* YPITCH just drops the last two bits */ - mcam_reg_write_mask(cam, REG_IMGPITCH, fmt->bytesperline, - IMGP_YP_MASK); - /* - * Tell the controller about the image format we are using. - */ - switch (cam->pix_format.pixelformat) { - case V4L2_PIX_FMT_YUYV: - mcam_reg_write_mask(cam, REG_CTRL0, - C0_DF_YUV|C0_YUV_PACKED|C0_YUVE_YUYV, - C0_DF_MASK); - break; - - case V4L2_PIX_FMT_RGB444: - mcam_reg_write_mask(cam, REG_CTRL0, - C0_DF_RGB|C0_RGBF_444|C0_RGB4_XRGB, - C0_DF_MASK); - /* Alpha value? */ - break; - - case V4L2_PIX_FMT_RGB565: - mcam_reg_write_mask(cam, REG_CTRL0, - C0_DF_RGB|C0_RGBF_565|C0_RGB5_BGGR, - C0_DF_MASK); - break; - - default: - cam_err(cam, "Unknown format %x\n", cam->pix_format.pixelformat); - break; - } - /* - * Make sure it knows we want to use hsync/vsync. - */ - mcam_reg_write_mask(cam, REG_CTRL0, C0_SIF_HVSYNC, - C0_SIFM_MASK); -} - - -/* - * Configure the controller for operation; caller holds the - * device mutex. - */ -static int mcam_ctlr_configure(struct mcam_camera *cam) -{ - unsigned long flags; - - spin_lock_irqsave(&cam->dev_lock, flags); - clear_bit(CF_SG_RESTART, &cam->flags); - cam->dma_setup(cam); - mcam_ctlr_image(cam); - mcam_set_config_needed(cam, 0); - spin_unlock_irqrestore(&cam->dev_lock, flags); - return 0; -} - -static void mcam_ctlr_irq_enable(struct mcam_camera *cam) -{ - /* - * Clear any pending interrupts, since we do not - * expect to have I/O active prior to enabling. - */ - mcam_reg_write(cam, REG_IRQSTAT, FRAMEIRQS); - mcam_reg_set_bit(cam, REG_IRQMASK, FRAMEIRQS); -} - -static void mcam_ctlr_irq_disable(struct mcam_camera *cam) -{ - mcam_reg_clear_bit(cam, REG_IRQMASK, FRAMEIRQS); -} - - - -static void mcam_ctlr_init(struct mcam_camera *cam) -{ - unsigned long flags; - - spin_lock_irqsave(&cam->dev_lock, flags); - /* - * Make sure it's not powered down. - */ - mcam_reg_clear_bit(cam, REG_CTRL1, C1_PWRDWN); - /* - * Turn off the enable bit. It sure should be off anyway, - * but it's good to be sure. - */ - mcam_reg_clear_bit(cam, REG_CTRL0, C0_ENABLE); - /* - * Clock the sensor appropriately. Controller clock should - * be 48MHz, sensor "typical" value is half that. - */ - mcam_reg_write_mask(cam, REG_CLKCTRL, 2, CLK_DIV_MASK); - spin_unlock_irqrestore(&cam->dev_lock, flags); -} - - -/* - * Stop the controller, and don't return until we're really sure that no - * further DMA is going on. - */ -static void mcam_ctlr_stop_dma(struct mcam_camera *cam) -{ - unsigned long flags; - - /* - * Theory: stop the camera controller (whether it is operating - * or not). Delay briefly just in case we race with the SOF - * interrupt, then wait until no DMA is active. - */ - spin_lock_irqsave(&cam->dev_lock, flags); - clear_bit(CF_SG_RESTART, &cam->flags); - mcam_ctlr_stop(cam); - cam->state = S_IDLE; - spin_unlock_irqrestore(&cam->dev_lock, flags); - /* - * This is a brutally long sleep, but experience shows that - * it can take the controller a while to get the message that - * it needs to stop grabbing frames. In particular, we can - * sometimes (on mmp) get a frame at the end WITHOUT the - * start-of-frame indication. - */ - msleep(150); - if (test_bit(CF_DMA_ACTIVE, &cam->flags)) - cam_err(cam, "Timeout waiting for DMA to end\n"); - /* This would be bad news - what now? */ - spin_lock_irqsave(&cam->dev_lock, flags); - mcam_ctlr_irq_disable(cam); - spin_unlock_irqrestore(&cam->dev_lock, flags); -} - -/* - * Power up and down. - */ -static void mcam_ctlr_power_up(struct mcam_camera *cam) -{ - unsigned long flags; - - spin_lock_irqsave(&cam->dev_lock, flags); - cam->plat_power_up(cam); - mcam_reg_clear_bit(cam, REG_CTRL1, C1_PWRDWN); - spin_unlock_irqrestore(&cam->dev_lock, flags); - msleep(5); /* Just to be sure */ -} - -static void mcam_ctlr_power_down(struct mcam_camera *cam) -{ - unsigned long flags; - - spin_lock_irqsave(&cam->dev_lock, flags); - /* - * School of hard knocks department: be sure we do any register - * twiddling on the controller *before* calling the platform - * power down routine. - */ - mcam_reg_set_bit(cam, REG_CTRL1, C1_PWRDWN); - cam->plat_power_down(cam); - spin_unlock_irqrestore(&cam->dev_lock, flags); -} - -/* -------------------------------------------------------------------- */ -/* - * Communications with the sensor. - */ - -static int __mcam_cam_reset(struct mcam_camera *cam) -{ - return sensor_call(cam, core, reset, 0); -} - -/* - * We have found the sensor on the i2c. Let's try to have a - * conversation. - */ -static int mcam_cam_init(struct mcam_camera *cam) -{ - struct v4l2_dbg_chip_ident chip; - int ret; - - mutex_lock(&cam->s_mutex); - if (cam->state != S_NOTREADY) - cam_warn(cam, "Cam init with device in funky state %d", - cam->state); - ret = __mcam_cam_reset(cam); - if (ret) - goto out; - chip.ident = V4L2_IDENT_NONE; - chip.match.type = V4L2_CHIP_MATCH_I2C_ADDR; - chip.match.addr = cam->sensor_addr; - ret = sensor_call(cam, core, g_chip_ident, &chip); - if (ret) - goto out; - cam->sensor_type = chip.ident; - if (cam->sensor_type != V4L2_IDENT_OV7670) { - cam_err(cam, "Unsupported sensor type 0x%x", cam->sensor_type); - ret = -EINVAL; - goto out; - } -/* Get/set parameters? */ - ret = 0; - cam->state = S_IDLE; -out: - mcam_ctlr_power_down(cam); - mutex_unlock(&cam->s_mutex); - return ret; -} - -/* - * Configure the sensor to match the parameters we have. Caller should - * hold s_mutex - */ -static int mcam_cam_set_flip(struct mcam_camera *cam) -{ - struct v4l2_control ctrl; - - memset(&ctrl, 0, sizeof(ctrl)); - ctrl.id = V4L2_CID_VFLIP; - ctrl.value = flip; - return sensor_call(cam, core, s_ctrl, &ctrl); -} - - -static int mcam_cam_configure(struct mcam_camera *cam) -{ - struct v4l2_mbus_framefmt mbus_fmt; - int ret; - - v4l2_fill_mbus_format(&mbus_fmt, &cam->pix_format, cam->mbus_code); - ret = sensor_call(cam, core, init, 0); - if (ret == 0) - ret = sensor_call(cam, video, s_mbus_fmt, &mbus_fmt); - /* - * OV7670 does weird things if flip is set *before* format... - */ - ret += mcam_cam_set_flip(cam); - return ret; -} - -/* - * Get everything ready, and start grabbing frames. - */ -static int mcam_read_setup(struct mcam_camera *cam) -{ - int ret; - unsigned long flags; - - /* - * Configuration. If we still don't have DMA buffers, - * make one last, desperate attempt. - */ - if (cam->buffer_mode == B_vmalloc && cam->nbufs == 0 && - mcam_alloc_dma_bufs(cam, 0)) - return -ENOMEM; - - if (mcam_needs_config(cam)) { - mcam_cam_configure(cam); - ret = mcam_ctlr_configure(cam); - if (ret) - return ret; - } - - /* - * Turn it loose. - */ - spin_lock_irqsave(&cam->dev_lock, flags); - clear_bit(CF_DMA_ACTIVE, &cam->flags); - mcam_reset_buffers(cam); - mcam_ctlr_irq_enable(cam); - cam->state = S_STREAMING; - if (!test_bit(CF_SG_RESTART, &cam->flags)) - mcam_ctlr_start(cam); - spin_unlock_irqrestore(&cam->dev_lock, flags); - return 0; -} - -/* ----------------------------------------------------------------------- */ -/* - * Videobuf2 interface code. - */ - -static int mcam_vb_queue_setup(struct vb2_queue *vq, - const struct v4l2_format *fmt, unsigned int *nbufs, - unsigned int *num_planes, unsigned int sizes[], - void *alloc_ctxs[]) -{ - struct mcam_camera *cam = vb2_get_drv_priv(vq); - int minbufs = (cam->buffer_mode == B_DMA_contig) ? 3 : 2; - - sizes[0] = cam->pix_format.sizeimage; - *num_planes = 1; /* Someday we have to support planar formats... */ - if (*nbufs < minbufs) - *nbufs = minbufs; - if (cam->buffer_mode == B_DMA_contig) - alloc_ctxs[0] = cam->vb_alloc_ctx; - return 0; -} - - -static void mcam_vb_buf_queue(struct vb2_buffer *vb) -{ - struct mcam_vb_buffer *mvb = vb_to_mvb(vb); - struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue); - unsigned long flags; - int start; - - spin_lock_irqsave(&cam->dev_lock, flags); - start = (cam->state == S_BUFWAIT) && !list_empty(&cam->buffers); - list_add(&mvb->queue, &cam->buffers); - if (cam->state == S_STREAMING && test_bit(CF_SG_RESTART, &cam->flags)) - mcam_sg_restart(cam); - spin_unlock_irqrestore(&cam->dev_lock, flags); - if (start) - mcam_read_setup(cam); -} - - -/* - * vb2 uses these to release the mutex when waiting in dqbuf. I'm - * not actually sure we need to do this (I'm not sure that vb2_dqbuf() needs - * to be called with the mutex held), but better safe than sorry. - */ -static void mcam_vb_wait_prepare(struct vb2_queue *vq) -{ - struct mcam_camera *cam = vb2_get_drv_priv(vq); - - mutex_unlock(&cam->s_mutex); -} - -static void mcam_vb_wait_finish(struct vb2_queue *vq) -{ - struct mcam_camera *cam = vb2_get_drv_priv(vq); - - mutex_lock(&cam->s_mutex); -} - -/* - * These need to be called with the mutex held from vb2 - */ -static int mcam_vb_start_streaming(struct vb2_queue *vq, unsigned int count) -{ - struct mcam_camera *cam = vb2_get_drv_priv(vq); - - if (cam->state != S_IDLE) { - INIT_LIST_HEAD(&cam->buffers); - return -EINVAL; - } - cam->sequence = 0; - /* - * Videobuf2 sneakily hoards all the buffers and won't - * give them to us until *after* streaming starts. But - * we can't actually start streaming until we have a - * destination. So go into a wait state and hope they - * give us buffers soon. - */ - if (cam->buffer_mode != B_vmalloc && list_empty(&cam->buffers)) { - cam->state = S_BUFWAIT; - return 0; - } - return mcam_read_setup(cam); -} - -static int mcam_vb_stop_streaming(struct vb2_queue *vq) -{ - struct mcam_camera *cam = vb2_get_drv_priv(vq); - unsigned long flags; - - if (cam->state == S_BUFWAIT) { - /* They never gave us buffers */ - cam->state = S_IDLE; - return 0; - } - if (cam->state != S_STREAMING) - return -EINVAL; - mcam_ctlr_stop_dma(cam); - /* - * VB2 reclaims the buffers, so we need to forget - * about them. - */ - spin_lock_irqsave(&cam->dev_lock, flags); - INIT_LIST_HEAD(&cam->buffers); - spin_unlock_irqrestore(&cam->dev_lock, flags); - return 0; -} - - -static const struct vb2_ops mcam_vb2_ops = { - .queue_setup = mcam_vb_queue_setup, - .buf_queue = mcam_vb_buf_queue, - .start_streaming = mcam_vb_start_streaming, - .stop_streaming = mcam_vb_stop_streaming, - .wait_prepare = mcam_vb_wait_prepare, - .wait_finish = mcam_vb_wait_finish, -}; - - -#ifdef MCAM_MODE_DMA_SG -/* - * Scatter/gather mode uses all of the above functions plus a - * few extras to deal with DMA mapping. - */ -static int mcam_vb_sg_buf_init(struct vb2_buffer *vb) -{ - struct mcam_vb_buffer *mvb = vb_to_mvb(vb); - struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue); - int ndesc = cam->pix_format.sizeimage/PAGE_SIZE + 1; - - mvb->dma_desc = dma_alloc_coherent(cam->dev, - ndesc * sizeof(struct mcam_dma_desc), - &mvb->dma_desc_pa, GFP_KERNEL); - if (mvb->dma_desc == NULL) { - cam_err(cam, "Unable to get DMA descriptor array\n"); - return -ENOMEM; - } - return 0; -} - -static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb) -{ - struct mcam_vb_buffer *mvb = vb_to_mvb(vb); - struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue); - struct vb2_dma_sg_desc *sgd = vb2_dma_sg_plane_desc(vb, 0); - struct mcam_dma_desc *desc = mvb->dma_desc; - struct scatterlist *sg; - int i; - - mvb->dma_desc_nent = dma_map_sg(cam->dev, sgd->sglist, sgd->num_pages, - DMA_FROM_DEVICE); - if (mvb->dma_desc_nent <= 0) - return -EIO; /* Not sure what's right here */ - for_each_sg(sgd->sglist, sg, mvb->dma_desc_nent, i) { - desc->dma_addr = sg_dma_address(sg); - desc->segment_len = sg_dma_len(sg); - desc++; - } - return 0; -} - -static int mcam_vb_sg_buf_finish(struct vb2_buffer *vb) -{ - struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue); - struct vb2_dma_sg_desc *sgd = vb2_dma_sg_plane_desc(vb, 0); - - dma_unmap_sg(cam->dev, sgd->sglist, sgd->num_pages, DMA_FROM_DEVICE); - return 0; -} - -static void mcam_vb_sg_buf_cleanup(struct vb2_buffer *vb) -{ - struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue); - struct mcam_vb_buffer *mvb = vb_to_mvb(vb); - int ndesc = cam->pix_format.sizeimage/PAGE_SIZE + 1; - - dma_free_coherent(cam->dev, ndesc * sizeof(struct mcam_dma_desc), - mvb->dma_desc, mvb->dma_desc_pa); -} - - -static const struct vb2_ops mcam_vb2_sg_ops = { - .queue_setup = mcam_vb_queue_setup, - .buf_init = mcam_vb_sg_buf_init, - .buf_prepare = mcam_vb_sg_buf_prepare, - .buf_queue = mcam_vb_buf_queue, - .buf_finish = mcam_vb_sg_buf_finish, - .buf_cleanup = mcam_vb_sg_buf_cleanup, - .start_streaming = mcam_vb_start_streaming, - .stop_streaming = mcam_vb_stop_streaming, - .wait_prepare = mcam_vb_wait_prepare, - .wait_finish = mcam_vb_wait_finish, -}; - -#endif /* MCAM_MODE_DMA_SG */ - -static int mcam_setup_vb2(struct mcam_camera *cam) -{ - struct vb2_queue *vq = &cam->vb_queue; - - memset(vq, 0, sizeof(*vq)); - vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - vq->drv_priv = cam; - INIT_LIST_HEAD(&cam->buffers); - switch (cam->buffer_mode) { - case B_DMA_contig: -#ifdef MCAM_MODE_DMA_CONTIG - vq->ops = &mcam_vb2_ops; - vq->mem_ops = &vb2_dma_contig_memops; - cam->vb_alloc_ctx = vb2_dma_contig_init_ctx(cam->dev); - vq->io_modes = VB2_MMAP | VB2_USERPTR; - cam->dma_setup = mcam_ctlr_dma_contig; - cam->frame_complete = mcam_dma_contig_done; -#endif - break; - case B_DMA_sg: -#ifdef MCAM_MODE_DMA_SG - vq->ops = &mcam_vb2_sg_ops; - vq->mem_ops = &vb2_dma_sg_memops; - vq->io_modes = VB2_MMAP | VB2_USERPTR; - cam->dma_setup = mcam_ctlr_dma_sg; - cam->frame_complete = mcam_dma_sg_done; -#endif - break; - case B_vmalloc: -#ifdef MCAM_MODE_VMALLOC - tasklet_init(&cam->s_tasklet, mcam_frame_tasklet, - (unsigned long) cam); - vq->ops = &mcam_vb2_ops; - vq->mem_ops = &vb2_vmalloc_memops; - vq->buf_struct_size = sizeof(struct mcam_vb_buffer); - vq->io_modes = VB2_MMAP; - cam->dma_setup = mcam_ctlr_dma_vmalloc; - cam->frame_complete = mcam_vmalloc_done; -#endif - break; - } - return vb2_queue_init(vq); -} - -static void mcam_cleanup_vb2(struct mcam_camera *cam) -{ - vb2_queue_release(&cam->vb_queue); -#ifdef MCAM_MODE_DMA_CONTIG - if (cam->buffer_mode == B_DMA_contig) - vb2_dma_contig_cleanup_ctx(cam->vb_alloc_ctx); -#endif -} - - -/* ---------------------------------------------------------------------- */ -/* - * The long list of V4L2 ioctl() operations. - */ - -static int mcam_vidioc_streamon(struct file *filp, void *priv, - enum v4l2_buf_type type) -{ - struct mcam_camera *cam = filp->private_data; - int ret; - - mutex_lock(&cam->s_mutex); - ret = vb2_streamon(&cam->vb_queue, type); - mutex_unlock(&cam->s_mutex); - return ret; -} - - -static int mcam_vidioc_streamoff(struct file *filp, void *priv, - enum v4l2_buf_type type) -{ - struct mcam_camera *cam = filp->private_data; - int ret; - - mutex_lock(&cam->s_mutex); - ret = vb2_streamoff(&cam->vb_queue, type); - mutex_unlock(&cam->s_mutex); - return ret; -} - - -static int mcam_vidioc_reqbufs(struct file *filp, void *priv, - struct v4l2_requestbuffers *req) -{ - struct mcam_camera *cam = filp->private_data; - int ret; - - mutex_lock(&cam->s_mutex); - ret = vb2_reqbufs(&cam->vb_queue, req); - mutex_unlock(&cam->s_mutex); - return ret; -} - - -static int mcam_vidioc_querybuf(struct file *filp, void *priv, - struct v4l2_buffer *buf) -{ - struct mcam_camera *cam = filp->private_data; - int ret; - - mutex_lock(&cam->s_mutex); - ret = vb2_querybuf(&cam->vb_queue, buf); - mutex_unlock(&cam->s_mutex); - return ret; -} - -static int mcam_vidioc_qbuf(struct file *filp, void *priv, - struct v4l2_buffer *buf) -{ - struct mcam_camera *cam = filp->private_data; - int ret; - - mutex_lock(&cam->s_mutex); - ret = vb2_qbuf(&cam->vb_queue, buf); - mutex_unlock(&cam->s_mutex); - return ret; -} - -static int mcam_vidioc_dqbuf(struct file *filp, void *priv, - struct v4l2_buffer *buf) -{ - struct mcam_camera *cam = filp->private_data; - int ret; - - mutex_lock(&cam->s_mutex); - ret = vb2_dqbuf(&cam->vb_queue, buf, filp->f_flags & O_NONBLOCK); - mutex_unlock(&cam->s_mutex); - return ret; -} - - - -static int mcam_vidioc_queryctrl(struct file *filp, void *priv, - struct v4l2_queryctrl *qc) -{ - struct mcam_camera *cam = priv; - int ret; - - mutex_lock(&cam->s_mutex); - ret = sensor_call(cam, core, queryctrl, qc); - mutex_unlock(&cam->s_mutex); - return ret; -} - - -static int mcam_vidioc_g_ctrl(struct file *filp, void *priv, - struct v4l2_control *ctrl) -{ - struct mcam_camera *cam = priv; - int ret; - - mutex_lock(&cam->s_mutex); - ret = sensor_call(cam, core, g_ctrl, ctrl); - mutex_unlock(&cam->s_mutex); - return ret; -} - - -static int mcam_vidioc_s_ctrl(struct file *filp, void *priv, - struct v4l2_control *ctrl) -{ - struct mcam_camera *cam = priv; - int ret; - - mutex_lock(&cam->s_mutex); - ret = sensor_call(cam, core, s_ctrl, ctrl); - mutex_unlock(&cam->s_mutex); - return ret; -} - - -static int mcam_vidioc_querycap(struct file *file, void *priv, - struct v4l2_capability *cap) -{ - strcpy(cap->driver, "marvell_ccic"); - strcpy(cap->card, "marvell_ccic"); - cap->version = 1; - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | - V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; - return 0; -} - - -static int mcam_vidioc_enum_fmt_vid_cap(struct file *filp, - void *priv, struct v4l2_fmtdesc *fmt) -{ - if (fmt->index >= N_MCAM_FMTS) - return -EINVAL; - strlcpy(fmt->description, mcam_formats[fmt->index].desc, - sizeof(fmt->description)); - fmt->pixelformat = mcam_formats[fmt->index].pixelformat; - return 0; -} - -static int mcam_vidioc_try_fmt_vid_cap(struct file *filp, void *priv, - struct v4l2_format *fmt) -{ - struct mcam_camera *cam = priv; - struct mcam_format_struct *f; - struct v4l2_pix_format *pix = &fmt->fmt.pix; - struct v4l2_mbus_framefmt mbus_fmt; - int ret; - - f = mcam_find_format(pix->pixelformat); - pix->pixelformat = f->pixelformat; - v4l2_fill_mbus_format(&mbus_fmt, pix, f->mbus_code); - mutex_lock(&cam->s_mutex); - ret = sensor_call(cam, video, try_mbus_fmt, &mbus_fmt); - mutex_unlock(&cam->s_mutex); - v4l2_fill_pix_format(pix, &mbus_fmt); - pix->bytesperline = pix->width * f->bpp; - pix->sizeimage = pix->height * pix->bytesperline; - return ret; -} - -static int mcam_vidioc_s_fmt_vid_cap(struct file *filp, void *priv, - struct v4l2_format *fmt) -{ - struct mcam_camera *cam = priv; - struct mcam_format_struct *f; - int ret; - - /* - * Can't do anything if the device is not idle - * Also can't if there are streaming buffers in place. - */ - if (cam->state != S_IDLE || cam->vb_queue.num_buffers > 0) - return -EBUSY; - - f = mcam_find_format(fmt->fmt.pix.pixelformat); - - /* - * See if the formatting works in principle. - */ - ret = mcam_vidioc_try_fmt_vid_cap(filp, priv, fmt); - if (ret) - return ret; - /* - * Now we start to change things for real, so let's do it - * under lock. - */ - mutex_lock(&cam->s_mutex); - cam->pix_format = fmt->fmt.pix; - cam->mbus_code = f->mbus_code; - - /* - * Make sure we have appropriate DMA buffers. - */ - if (cam->buffer_mode == B_vmalloc) { - ret = mcam_check_dma_buffers(cam); - if (ret) - goto out; - } - mcam_set_config_needed(cam, 1); -out: - mutex_unlock(&cam->s_mutex); - return ret; -} - -/* - * Return our stored notion of how the camera is/should be configured. - * The V4l2 spec wants us to be smarter, and actually get this from - * the camera (and not mess with it at open time). Someday. - */ -static int mcam_vidioc_g_fmt_vid_cap(struct file *filp, void *priv, - struct v4l2_format *f) -{ - struct mcam_camera *cam = priv; - - f->fmt.pix = cam->pix_format; - return 0; -} - -/* - * We only have one input - the sensor - so minimize the nonsense here. - */ -static int mcam_vidioc_enum_input(struct file *filp, void *priv, - struct v4l2_input *input) -{ - if (input->index != 0) - return -EINVAL; - - input->type = V4L2_INPUT_TYPE_CAMERA; - input->std = V4L2_STD_ALL; /* Not sure what should go here */ - strcpy(input->name, "Camera"); - return 0; -} - -static int mcam_vidioc_g_input(struct file *filp, void *priv, unsigned int *i) -{ - *i = 0; - return 0; -} - -static int mcam_vidioc_s_input(struct file *filp, void *priv, unsigned int i) -{ - if (i != 0) - return -EINVAL; - return 0; -} - -/* from vivi.c */ -static int mcam_vidioc_s_std(struct file *filp, void *priv, v4l2_std_id *a) -{ - return 0; -} - -/* - * G/S_PARM. Most of this is done by the sensor, but we are - * the level which controls the number of read buffers. - */ -static int mcam_vidioc_g_parm(struct file *filp, void *priv, - struct v4l2_streamparm *parms) -{ - struct mcam_camera *cam = priv; - int ret; - - mutex_lock(&cam->s_mutex); - ret = sensor_call(cam, video, g_parm, parms); - mutex_unlock(&cam->s_mutex); - parms->parm.capture.readbuffers = n_dma_bufs; - return ret; -} - -static int mcam_vidioc_s_parm(struct file *filp, void *priv, - struct v4l2_streamparm *parms) -{ - struct mcam_camera *cam = priv; - int ret; - - mutex_lock(&cam->s_mutex); - ret = sensor_call(cam, video, s_parm, parms); - mutex_unlock(&cam->s_mutex); - parms->parm.capture.readbuffers = n_dma_bufs; - return ret; -} - -static int mcam_vidioc_g_chip_ident(struct file *file, void *priv, - struct v4l2_dbg_chip_ident *chip) -{ - struct mcam_camera *cam = priv; - - chip->ident = V4L2_IDENT_NONE; - chip->revision = 0; - if (v4l2_chip_match_host(&chip->match)) { - chip->ident = cam->chip_id; - return 0; - } - return sensor_call(cam, core, g_chip_ident, chip); -} - -static int mcam_vidioc_enum_framesizes(struct file *filp, void *priv, - struct v4l2_frmsizeenum *sizes) -{ - struct mcam_camera *cam = priv; - int ret; - - mutex_lock(&cam->s_mutex); - ret = sensor_call(cam, video, enum_framesizes, sizes); - mutex_unlock(&cam->s_mutex); - return ret; -} - -static int mcam_vidioc_enum_frameintervals(struct file *filp, void *priv, - struct v4l2_frmivalenum *interval) -{ - struct mcam_camera *cam = priv; - int ret; - - mutex_lock(&cam->s_mutex); - ret = sensor_call(cam, video, enum_frameintervals, interval); - mutex_unlock(&cam->s_mutex); - return ret; -} - -#ifdef CONFIG_VIDEO_ADV_DEBUG -static int mcam_vidioc_g_register(struct file *file, void *priv, - struct v4l2_dbg_register *reg) -{ - struct mcam_camera *cam = priv; - - if (v4l2_chip_match_host(®->match)) { - reg->val = mcam_reg_read(cam, reg->reg); - reg->size = 4; - return 0; - } - return sensor_call(cam, core, g_register, reg); -} - -static int mcam_vidioc_s_register(struct file *file, void *priv, - struct v4l2_dbg_register *reg) -{ - struct mcam_camera *cam = priv; - - if (v4l2_chip_match_host(®->match)) { - mcam_reg_write(cam, reg->reg, reg->val); - return 0; - } - return sensor_call(cam, core, s_register, reg); -} -#endif - -static const struct v4l2_ioctl_ops mcam_v4l_ioctl_ops = { - .vidioc_querycap = mcam_vidioc_querycap, - .vidioc_enum_fmt_vid_cap = mcam_vidioc_enum_fmt_vid_cap, - .vidioc_try_fmt_vid_cap = mcam_vidioc_try_fmt_vid_cap, - .vidioc_s_fmt_vid_cap = mcam_vidioc_s_fmt_vid_cap, - .vidioc_g_fmt_vid_cap = mcam_vidioc_g_fmt_vid_cap, - .vidioc_enum_input = mcam_vidioc_enum_input, - .vidioc_g_input = mcam_vidioc_g_input, - .vidioc_s_input = mcam_vidioc_s_input, - .vidioc_s_std = mcam_vidioc_s_std, - .vidioc_reqbufs = mcam_vidioc_reqbufs, - .vidioc_querybuf = mcam_vidioc_querybuf, - .vidioc_qbuf = mcam_vidioc_qbuf, - .vidioc_dqbuf = mcam_vidioc_dqbuf, - .vidioc_streamon = mcam_vidioc_streamon, - .vidioc_streamoff = mcam_vidioc_streamoff, - .vidioc_queryctrl = mcam_vidioc_queryctrl, - .vidioc_g_ctrl = mcam_vidioc_g_ctrl, - .vidioc_s_ctrl = mcam_vidioc_s_ctrl, - .vidioc_g_parm = mcam_vidioc_g_parm, - .vidioc_s_parm = mcam_vidioc_s_parm, - .vidioc_enum_framesizes = mcam_vidioc_enum_framesizes, - .vidioc_enum_frameintervals = mcam_vidioc_enum_frameintervals, - .vidioc_g_chip_ident = mcam_vidioc_g_chip_ident, -#ifdef CONFIG_VIDEO_ADV_DEBUG - .vidioc_g_register = mcam_vidioc_g_register, - .vidioc_s_register = mcam_vidioc_s_register, -#endif -}; - -/* ---------------------------------------------------------------------- */ -/* - * Our various file operations. - */ -static int mcam_v4l_open(struct file *filp) -{ - struct mcam_camera *cam = video_drvdata(filp); - int ret = 0; - - filp->private_data = cam; - - frames = singles = delivered = 0; - mutex_lock(&cam->s_mutex); - if (cam->users == 0) { - ret = mcam_setup_vb2(cam); - if (ret) - goto out; - mcam_ctlr_power_up(cam); - __mcam_cam_reset(cam); - mcam_set_config_needed(cam, 1); - } - (cam->users)++; -out: - mutex_unlock(&cam->s_mutex); - return ret; -} - - -static int mcam_v4l_release(struct file *filp) -{ - struct mcam_camera *cam = filp->private_data; - - cam_dbg(cam, "Release, %d frames, %d singles, %d delivered\n", frames, - singles, delivered); - mutex_lock(&cam->s_mutex); - (cam->users)--; - if (cam->users == 0) { - mcam_ctlr_stop_dma(cam); - mcam_cleanup_vb2(cam); - mcam_ctlr_power_down(cam); - if (cam->buffer_mode == B_vmalloc && alloc_bufs_at_read) - mcam_free_dma_bufs(cam); - } - mutex_unlock(&cam->s_mutex); - return 0; -} - -static ssize_t mcam_v4l_read(struct file *filp, - char __user *buffer, size_t len, loff_t *pos) -{ - struct mcam_camera *cam = filp->private_data; - int ret; - - mutex_lock(&cam->s_mutex); - ret = vb2_read(&cam->vb_queue, buffer, len, pos, - filp->f_flags & O_NONBLOCK); - mutex_unlock(&cam->s_mutex); - return ret; -} - - - -static unsigned int mcam_v4l_poll(struct file *filp, - struct poll_table_struct *pt) -{ - struct mcam_camera *cam = filp->private_data; - int ret; - - mutex_lock(&cam->s_mutex); - ret = vb2_poll(&cam->vb_queue, filp, pt); - mutex_unlock(&cam->s_mutex); - return ret; -} - - -static int mcam_v4l_mmap(struct file *filp, struct vm_area_struct *vma) -{ - struct mcam_camera *cam = filp->private_data; - int ret; - - mutex_lock(&cam->s_mutex); - ret = vb2_mmap(&cam->vb_queue, vma); - mutex_unlock(&cam->s_mutex); - return ret; -} - - - -static const struct v4l2_file_operations mcam_v4l_fops = { - .owner = THIS_MODULE, - .open = mcam_v4l_open, - .release = mcam_v4l_release, - .read = mcam_v4l_read, - .poll = mcam_v4l_poll, - .mmap = mcam_v4l_mmap, - .unlocked_ioctl = video_ioctl2, -}; - - -/* - * This template device holds all of those v4l2 methods; we - * clone it for specific real devices. - */ -static struct video_device mcam_v4l_template = { - .name = "mcam", - .tvnorms = V4L2_STD_NTSC_M, - .current_norm = V4L2_STD_NTSC_M, /* make mplayer happy */ - - .fops = &mcam_v4l_fops, - .ioctl_ops = &mcam_v4l_ioctl_ops, - .release = video_device_release_empty, -}; - -/* ---------------------------------------------------------------------- */ -/* - * Interrupt handler stuff - */ -static void mcam_frame_complete(struct mcam_camera *cam, int frame) -{ - /* - * Basic frame housekeeping. - */ - set_bit(frame, &cam->flags); - clear_bit(CF_DMA_ACTIVE, &cam->flags); - cam->next_buf = frame; - cam->buf_seq[frame] = ++(cam->sequence); - frames++; - /* - * "This should never happen" - */ - if (cam->state != S_STREAMING) - return; - /* - * Process the frame and set up the next one. - */ - cam->frame_complete(cam, frame); -} - - -/* - * The interrupt handler; this needs to be called from the - * platform irq handler with the lock held. - */ -int mccic_irq(struct mcam_camera *cam, unsigned int irqs) -{ - unsigned int frame, handled = 0; - - mcam_reg_write(cam, REG_IRQSTAT, FRAMEIRQS); /* Clear'em all */ - /* - * Handle any frame completions. There really should - * not be more than one of these, or we have fallen - * far behind. - * - * When running in S/G mode, the frame number lacks any - * real meaning - there's only one descriptor array - but - * the controller still picks a different one to signal - * each time. - */ - for (frame = 0; frame < cam->nbufs; frame++) - if (irqs & (IRQ_EOF0 << frame)) { - mcam_frame_complete(cam, frame); - handled = 1; - if (cam->buffer_mode == B_DMA_sg) - break; - } - /* - * If a frame starts, note that we have DMA active. This - * code assumes that we won't get multiple frame interrupts - * at once; may want to rethink that. - */ - if (irqs & (IRQ_SOF0 | IRQ_SOF1 | IRQ_SOF2)) { - set_bit(CF_DMA_ACTIVE, &cam->flags); - handled = 1; - if (cam->buffer_mode == B_DMA_sg) - mcam_ctlr_stop(cam); - } - return handled; -} - -/* ---------------------------------------------------------------------- */ -/* - * Registration and such. - */ -static struct ov7670_config sensor_cfg = { - /* - * Exclude QCIF mode, because it only captures a tiny portion - * of the sensor FOV - */ - .min_width = 320, - .min_height = 240, -}; - - -int mccic_register(struct mcam_camera *cam) -{ - struct i2c_board_info ov7670_info = { - .type = "ov7670", - .addr = 0x42 >> 1, - .platform_data = &sensor_cfg, - }; - int ret; - - /* - * Validate the requested buffer mode. - */ - if (buffer_mode >= 0) - cam->buffer_mode = buffer_mode; - if (cam->buffer_mode == B_DMA_sg && - cam->chip_id == V4L2_IDENT_CAFE) { - printk(KERN_ERR "marvell-cam: Cafe can't do S/G I/O, " - "attempting vmalloc mode instead\n"); - cam->buffer_mode = B_vmalloc; - } - if (!mcam_buffer_mode_supported(cam->buffer_mode)) { - printk(KERN_ERR "marvell-cam: buffer mode %d unsupported\n", - cam->buffer_mode); - return -EINVAL; - } - /* - * Register with V4L - */ - ret = v4l2_device_register(cam->dev, &cam->v4l2_dev); - if (ret) - return ret; - - mutex_init(&cam->s_mutex); - cam->state = S_NOTREADY; - mcam_set_config_needed(cam, 1); - cam->pix_format = mcam_def_pix_format; - cam->mbus_code = mcam_def_mbus_code; - INIT_LIST_HEAD(&cam->buffers); - mcam_ctlr_init(cam); - - /* - * Try to find the sensor. - */ - sensor_cfg.clock_speed = cam->clock_speed; - sensor_cfg.use_smbus = cam->use_smbus; - cam->sensor_addr = ov7670_info.addr; - cam->sensor = v4l2_i2c_new_subdev_board(&cam->v4l2_dev, - cam->i2c_adapter, &ov7670_info, NULL); - if (cam->sensor == NULL) { - ret = -ENODEV; - goto out_unregister; - } - - ret = mcam_cam_init(cam); - if (ret) - goto out_unregister; - /* - * Get the v4l2 setup done. - */ - mutex_lock(&cam->s_mutex); - cam->vdev = mcam_v4l_template; - cam->vdev.debug = 0; - cam->vdev.v4l2_dev = &cam->v4l2_dev; - ret = video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1); - if (ret) - goto out; - video_set_drvdata(&cam->vdev, cam); - - /* - * If so requested, try to get our DMA buffers now. - */ - if (cam->buffer_mode == B_vmalloc && !alloc_bufs_at_read) { - if (mcam_alloc_dma_bufs(cam, 1)) - cam_warn(cam, "Unable to alloc DMA buffers at load" - " will try again later."); - } - -out: - mutex_unlock(&cam->s_mutex); - return ret; -out_unregister: - v4l2_device_unregister(&cam->v4l2_dev); - return ret; -} - - -void mccic_shutdown(struct mcam_camera *cam) -{ - /* - * If we have no users (and we really, really should have no - * users) the device will already be powered down. Trying to - * take it down again will wedge the machine, which is frowned - * upon. - */ - if (cam->users > 0) { - cam_warn(cam, "Removing a device with users!\n"); - mcam_ctlr_power_down(cam); - } - vb2_queue_release(&cam->vb_queue); - if (cam->buffer_mode == B_vmalloc) - mcam_free_dma_bufs(cam); - video_unregister_device(&cam->vdev); - v4l2_device_unregister(&cam->v4l2_dev); -} - -/* - * Power management - */ -#ifdef CONFIG_PM - -void mccic_suspend(struct mcam_camera *cam) -{ - mutex_lock(&cam->s_mutex); - if (cam->users > 0) { - enum mcam_state cstate = cam->state; - - mcam_ctlr_stop_dma(cam); - mcam_ctlr_power_down(cam); - cam->state = cstate; - } - mutex_unlock(&cam->s_mutex); -} - -int mccic_resume(struct mcam_camera *cam) -{ - int ret = 0; - - mutex_lock(&cam->s_mutex); - if (cam->users > 0) { - mcam_ctlr_power_up(cam); - __mcam_cam_reset(cam); - } else { - mcam_ctlr_power_down(cam); - } - mutex_unlock(&cam->s_mutex); - - set_bit(CF_CONFIG_NEEDED, &cam->flags); - if (cam->state == S_STREAMING) { - /* - * If there was a buffer in the DMA engine at suspend - * time, put it back on the queue or we'll forget about it. - */ - if (cam->buffer_mode == B_DMA_sg && cam->vb_bufs[0]) - list_add(&cam->vb_bufs[0]->queue, &cam->buffers); - ret = mcam_read_setup(cam); - } - return ret; -} -#endif /* CONFIG_PM */ diff --git a/drivers/media/video/marvell-ccic/mcam-core.h b/drivers/media/video/marvell-ccic/mcam-core.h deleted file mode 100644 index bd6acba9fb37..000000000000 --- a/drivers/media/video/marvell-ccic/mcam-core.h +++ /dev/null @@ -1,322 +0,0 @@ -/* - * Marvell camera core structures. - * - * Copyright 2011 Jonathan Corbet corbet@lwn.net - */ -#ifndef _MCAM_CORE_H -#define _MCAM_CORE_H - -#include <linux/list.h> -#include <media/v4l2-common.h> -#include <media/v4l2-dev.h> -#include <media/videobuf2-core.h> - -/* - * Create our own symbols for the supported buffer modes, but, for now, - * base them entirely on which videobuf2 options have been selected. - */ -#if defined(CONFIG_VIDEOBUF2_VMALLOC) || defined(CONFIG_VIDEOBUF2_VMALLOC_MODULE) -#define MCAM_MODE_VMALLOC 1 -#endif - -#if defined(CONFIG_VIDEOBUF2_DMA_CONTIG) || defined(CONFIG_VIDEOBUF2_DMA_CONTIG_MODULE) -#define MCAM_MODE_DMA_CONTIG 1 -#endif - -#if defined(CONFIG_VIDEOBUF2_DMA_SG) || defined(CONFIG_VIDEOBUF2_DMA_SG_MODULE) -#define MCAM_MODE_DMA_SG 1 -#endif - -#if !defined(MCAM_MODE_VMALLOC) && !defined(MCAM_MODE_DMA_CONTIG) && \ - !defined(MCAM_MODE_DMA_SG) -#error One of the videobuf buffer modes must be selected in the config -#endif - - -enum mcam_state { - S_NOTREADY, /* Not yet initialized */ - S_IDLE, /* Just hanging around */ - S_FLAKED, /* Some sort of problem */ - S_STREAMING, /* Streaming data */ - S_BUFWAIT /* streaming requested but no buffers yet */ -}; -#define MAX_DMA_BUFS 3 - -/* - * Different platforms work best with different buffer modes, so we - * let the platform pick. - */ -enum mcam_buffer_mode { - B_vmalloc = 0, - B_DMA_contig = 1, - B_DMA_sg = 2 -}; - -/* - * Is a given buffer mode supported by the current kernel configuration? - */ -static inline int mcam_buffer_mode_supported(enum mcam_buffer_mode mode) -{ - switch (mode) { -#ifdef MCAM_MODE_VMALLOC - case B_vmalloc: -#endif -#ifdef MCAM_MODE_DMA_CONTIG - case B_DMA_contig: -#endif -#ifdef MCAM_MODE_DMA_SG - case B_DMA_sg: -#endif - return 1; - default: - return 0; - } -} - - -/* - * A description of one of our devices. - * Locking: controlled by s_mutex. Certain fields, however, require - * the dev_lock spinlock; they are marked as such by comments. - * dev_lock is also required for access to device registers. - */ -struct mcam_camera { - /* - * These fields should be set by the platform code prior to - * calling mcam_register(). - */ - struct i2c_adapter *i2c_adapter; - unsigned char __iomem *regs; - spinlock_t dev_lock; - struct device *dev; /* For messages, dma alloc */ - unsigned int chip_id; - short int clock_speed; /* Sensor clock speed, default 30 */ - short int use_smbus; /* SMBUS or straight I2c? */ - enum mcam_buffer_mode buffer_mode; - /* - * Callbacks from the core to the platform code. - */ - void (*plat_power_up) (struct mcam_camera *cam); - void (*plat_power_down) (struct mcam_camera *cam); - - /* - * Everything below here is private to the mcam core and - * should not be touched by the platform code. - */ - struct v4l2_device v4l2_dev; - enum mcam_state state; - unsigned long flags; /* Buffer status, mainly (dev_lock) */ - int users; /* How many open FDs */ - - /* - * Subsystem structures. - */ - struct video_device vdev; - struct v4l2_subdev *sensor; - unsigned short sensor_addr; - - /* Videobuf2 stuff */ - struct vb2_queue vb_queue; - struct list_head buffers; /* Available frames */ - - unsigned int nbufs; /* How many are alloc'd */ - int next_buf; /* Next to consume (dev_lock) */ - - /* DMA buffers - vmalloc mode */ -#ifdef MCAM_MODE_VMALLOC - unsigned int dma_buf_size; /* allocated size */ - void *dma_bufs[MAX_DMA_BUFS]; /* Internal buffer addresses */ - dma_addr_t dma_handles[MAX_DMA_BUFS]; /* Buffer bus addresses */ - struct tasklet_struct s_tasklet; -#endif - unsigned int sequence; /* Frame sequence number */ - unsigned int buf_seq[MAX_DMA_BUFS]; /* Sequence for individual bufs */ - - /* DMA buffers - DMA modes */ - struct mcam_vb_buffer *vb_bufs[MAX_DMA_BUFS]; - struct vb2_alloc_ctx *vb_alloc_ctx; - - /* Mode-specific ops, set at open time */ - void (*dma_setup)(struct mcam_camera *cam); - void (*frame_complete)(struct mcam_camera *cam, int frame); - - /* Current operating parameters */ - u32 sensor_type; /* Currently ov7670 only */ - struct v4l2_pix_format pix_format; - enum v4l2_mbus_pixelcode mbus_code; - - /* Locks */ - struct mutex s_mutex; /* Access to this structure */ -}; - - -/* - * Register I/O functions. These are here because the platform code - * may legitimately need to mess with the register space. - */ -/* - * Device register I/O - */ -static inline void mcam_reg_write(struct mcam_camera *cam, unsigned int reg, - unsigned int val) -{ - iowrite32(val, cam->regs + reg); -} - -static inline unsigned int mcam_reg_read(struct mcam_camera *cam, - unsigned int reg) -{ - return ioread32(cam->regs + reg); -} - - -static inline void mcam_reg_write_mask(struct mcam_camera *cam, unsigned int reg, - unsigned int val, unsigned int mask) -{ - unsigned int v = mcam_reg_read(cam, reg); - - v = (v & ~mask) | (val & mask); - mcam_reg_write(cam, reg, v); -} - -static inline void mcam_reg_clear_bit(struct mcam_camera *cam, - unsigned int reg, unsigned int val) -{ - mcam_reg_write_mask(cam, reg, 0, val); -} - -static inline void mcam_reg_set_bit(struct mcam_camera *cam, - unsigned int reg, unsigned int val) -{ - mcam_reg_write_mask(cam, reg, val, val); -} - -/* - * Functions for use by platform code. - */ -int mccic_register(struct mcam_camera *cam); -int mccic_irq(struct mcam_camera *cam, unsigned int irqs); -void mccic_shutdown(struct mcam_camera *cam); -#ifdef CONFIG_PM -void mccic_suspend(struct mcam_camera *cam); -int mccic_resume(struct mcam_camera *cam); -#endif - -/* - * Register definitions for the m88alp01 camera interface. Offsets in bytes - * as given in the spec. - */ -#define REG_Y0BAR 0x00 -#define REG_Y1BAR 0x04 -#define REG_Y2BAR 0x08 -/* ... */ - -#define REG_IMGPITCH 0x24 /* Image pitch register */ -#define IMGP_YP_SHFT 2 /* Y pitch params */ -#define IMGP_YP_MASK 0x00003ffc /* Y pitch field */ -#define IMGP_UVP_SHFT 18 /* UV pitch (planar) */ -#define IMGP_UVP_MASK 0x3ffc0000 -#define REG_IRQSTATRAW 0x28 /* RAW IRQ Status */ -#define IRQ_EOF0 0x00000001 /* End of frame 0 */ -#define IRQ_EOF1 0x00000002 /* End of frame 1 */ -#define IRQ_EOF2 0x00000004 /* End of frame 2 */ -#define IRQ_SOF0 0x00000008 /* Start of frame 0 */ -#define IRQ_SOF1 0x00000010 /* Start of frame 1 */ -#define IRQ_SOF2 0x00000020 /* Start of frame 2 */ -#define IRQ_OVERFLOW 0x00000040 /* FIFO overflow */ -#define IRQ_TWSIW 0x00010000 /* TWSI (smbus) write */ -#define IRQ_TWSIR 0x00020000 /* TWSI read */ -#define IRQ_TWSIE 0x00040000 /* TWSI error */ -#define TWSIIRQS (IRQ_TWSIW|IRQ_TWSIR|IRQ_TWSIE) -#define FRAMEIRQS (IRQ_EOF0|IRQ_EOF1|IRQ_EOF2|IRQ_SOF0|IRQ_SOF1|IRQ_SOF2) -#define ALLIRQS (TWSIIRQS|FRAMEIRQS|IRQ_OVERFLOW) -#define REG_IRQMASK 0x2c /* IRQ mask - same bits as IRQSTAT */ -#define REG_IRQSTAT 0x30 /* IRQ status / clear */ - -#define REG_IMGSIZE 0x34 /* Image size */ -#define IMGSZ_V_MASK 0x1fff0000 -#define IMGSZ_V_SHIFT 16 -#define IMGSZ_H_MASK 0x00003fff -#define REG_IMGOFFSET 0x38 /* IMage offset */ - -#define REG_CTRL0 0x3c /* Control 0 */ -#define C0_ENABLE 0x00000001 /* Makes the whole thing go */ - -/* Mask for all the format bits */ -#define C0_DF_MASK 0x00fffffc /* Bits 2-23 */ - -/* RGB ordering */ -#define C0_RGB4_RGBX 0x00000000 -#define C0_RGB4_XRGB 0x00000004 -#define C0_RGB4_BGRX 0x00000008 -#define C0_RGB4_XBGR 0x0000000c -#define C0_RGB5_RGGB 0x00000000 -#define C0_RGB5_GRBG 0x00000004 -#define C0_RGB5_GBRG 0x00000008 -#define C0_RGB5_BGGR 0x0000000c - -/* Spec has two fields for DIN and DOUT, but they must match, so - combine them here. */ -#define C0_DF_YUV 0x00000000 /* Data is YUV */ -#define C0_DF_RGB 0x000000a0 /* ... RGB */ -#define C0_DF_BAYER 0x00000140 /* ... Bayer */ -/* 8-8-8 must be missing from the below - ask */ -#define C0_RGBF_565 0x00000000 -#define C0_RGBF_444 0x00000800 -#define C0_RGB_BGR 0x00001000 /* Blue comes first */ -#define C0_YUV_PLANAR 0x00000000 /* YUV 422 planar format */ -#define C0_YUV_PACKED 0x00008000 /* YUV 422 packed */ -#define C0_YUV_420PL 0x0000a000 /* YUV 420 planar */ -/* Think that 420 packed must be 111 - ask */ -#define C0_YUVE_YUYV 0x00000000 /* Y1CbY0Cr */ -#define C0_YUVE_YVYU 0x00010000 /* Y1CrY0Cb */ -#define C0_YUVE_VYUY 0x00020000 /* CrY1CbY0 */ -#define C0_YUVE_UYVY 0x00030000 /* CbY1CrY0 */ -#define C0_YUVE_XYUV 0x00000000 /* 420: .YUV */ -#define C0_YUVE_XYVU 0x00010000 /* 420: .YVU */ -#define C0_YUVE_XUVY 0x00020000 /* 420: .UVY */ -#define C0_YUVE_XVUY 0x00030000 /* 420: .VUY */ -/* Bayer bits 18,19 if needed */ -#define C0_HPOL_LOW 0x01000000 /* HSYNC polarity active low */ -#define C0_VPOL_LOW 0x02000000 /* VSYNC polarity active low */ -#define C0_VCLK_LOW 0x04000000 /* VCLK on falling edge */ -#define C0_DOWNSCALE 0x08000000 /* Enable downscaler */ -#define C0_SIFM_MASK 0xc0000000 /* SIF mode bits */ -#define C0_SIF_HVSYNC 0x00000000 /* Use H/VSYNC */ -#define CO_SOF_NOSYNC 0x40000000 /* Use inband active signaling */ - -/* Bits below C1_444ALPHA are not present in Cafe */ -#define REG_CTRL1 0x40 /* Control 1 */ -#define C1_CLKGATE 0x00000001 /* Sensor clock gate */ -#define C1_DESC_ENA 0x00000100 /* DMA descriptor enable */ -#define C1_DESC_3WORD 0x00000200 /* Three-word descriptors used */ -#define C1_444ALPHA 0x00f00000 /* Alpha field in RGB444 */ -#define C1_ALPHA_SHFT 20 -#define C1_DMAB32 0x00000000 /* 32-byte DMA burst */ -#define C1_DMAB16 0x02000000 /* 16-byte DMA burst */ -#define C1_DMAB64 0x04000000 /* 64-byte DMA burst */ -#define C1_DMAB_MASK 0x06000000 -#define C1_TWOBUFS 0x08000000 /* Use only two DMA buffers */ -#define C1_PWRDWN 0x10000000 /* Power down */ - -#define REG_CLKCTRL 0x88 /* Clock control */ -#define CLK_DIV_MASK 0x0000ffff /* Upper bits RW "reserved" */ - -/* This appears to be a Cafe-only register */ -#define REG_UBAR 0xc4 /* Upper base address register */ - -/* Armada 610 DMA descriptor registers */ -#define REG_DMA_DESC_Y 0x200 -#define REG_DMA_DESC_U 0x204 -#define REG_DMA_DESC_V 0x208 -#define REG_DESC_LEN_Y 0x20c /* Lengths are in bytes */ -#define REG_DESC_LEN_U 0x210 -#define REG_DESC_LEN_V 0x214 - -/* - * Useful stuff that probably belongs somewhere global. - */ -#define VGA_WIDTH 640 -#define VGA_HEIGHT 480 - -#endif /* _MCAM_CORE_H */ diff --git a/drivers/media/video/marvell-ccic/mmp-driver.c b/drivers/media/video/marvell-ccic/mmp-driver.c deleted file mode 100644 index c4c17fe76c0d..000000000000 --- a/drivers/media/video/marvell-ccic/mmp-driver.c +++ /dev/null @@ -1,380 +0,0 @@ -/* - * Support for the camera device found on Marvell MMP processors; known - * to work with the Armada 610 as used in the OLPC 1.75 system. - * - * Copyright 2011 Jonathan Corbet <corbet@lwn.net> - * - * This file may be distributed under the terms of the GNU General - * Public License, version 2. - */ - -#include <linux/init.h> -#include <linux/kernel.h> -#include <linux/module.h> -#include <linux/i2c.h> -#include <linux/i2c-gpio.h> -#include <linux/interrupt.h> -#include <linux/spinlock.h> -#include <linux/slab.h> -#include <linux/videodev2.h> -#include <media/v4l2-device.h> -#include <media/v4l2-chip-ident.h> -#include <media/mmp-camera.h> -#include <linux/device.h> -#include <linux/platform_device.h> -#include <linux/gpio.h> -#include <linux/io.h> -#include <linux/delay.h> -#include <linux/list.h> -#include <linux/pm.h> - -#include "mcam-core.h" - -MODULE_ALIAS("platform:mmp-camera"); -MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>"); -MODULE_LICENSE("GPL"); - -struct mmp_camera { - void *power_regs; - struct platform_device *pdev; - struct mcam_camera mcam; - struct list_head devlist; - int irq; -}; - -static inline struct mmp_camera *mcam_to_cam(struct mcam_camera *mcam) -{ - return container_of(mcam, struct mmp_camera, mcam); -} - -/* - * A silly little infrastructure so we can keep track of our devices. - * Chances are that we will never have more than one of them, but - * the Armada 610 *does* have two controllers... - */ - -static LIST_HEAD(mmpcam_devices); -static struct mutex mmpcam_devices_lock; - -static void mmpcam_add_device(struct mmp_camera *cam) -{ - mutex_lock(&mmpcam_devices_lock); - list_add(&cam->devlist, &mmpcam_devices); - mutex_unlock(&mmpcam_devices_lock); -} - -static void mmpcam_remove_device(struct mmp_camera *cam) -{ - mutex_lock(&mmpcam_devices_lock); - list_del(&cam->devlist); - mutex_unlock(&mmpcam_devices_lock); -} - -/* - * Platform dev remove passes us a platform_device, and there's - * no handy unused drvdata to stash a backpointer in. So just - * dig it out of our list. - */ -static struct mmp_camera *mmpcam_find_device(struct platform_device *pdev) -{ - struct mmp_camera *cam; - - mutex_lock(&mmpcam_devices_lock); - list_for_each_entry(cam, &mmpcam_devices, devlist) { - if (cam->pdev == pdev) { - mutex_unlock(&mmpcam_devices_lock); - return cam; - } - } - mutex_unlock(&mmpcam_devices_lock); - return NULL; -} - - - - -/* - * Power-related registers; this almost certainly belongs - * somewhere else. - * - * ARMADA 610 register manual, sec 7.2.1, p1842. - */ -#define CPU_SUBSYS_PMU_BASE 0xd4282800 -#define REG_CCIC_DCGCR 0x28 /* CCIC dyn clock gate ctrl reg */ -#define REG_CCIC_CRCR 0x50 /* CCIC clk reset ctrl reg */ - -/* - * Power control. - */ -static void mmpcam_power_up_ctlr(struct mmp_camera *cam) -{ - iowrite32(0x3f, cam->power_regs + REG_CCIC_DCGCR); - iowrite32(0x3805b, cam->power_regs + REG_CCIC_CRCR); - mdelay(1); -} - -static void mmpcam_power_up(struct mcam_camera *mcam) -{ - struct mmp_camera *cam = mcam_to_cam(mcam); - struct mmp_camera_platform_data *pdata; -/* - * Turn on power and clocks to the controller. - */ - mmpcam_power_up_ctlr(cam); -/* - * Provide power to the sensor. - */ - mcam_reg_write(mcam, REG_CLKCTRL, 0x60000002); - pdata = cam->pdev->dev.platform_data; - gpio_set_value(pdata->sensor_power_gpio, 1); - mdelay(5); - mcam_reg_clear_bit(mcam, REG_CTRL1, 0x10000000); - gpio_set_value(pdata->sensor_reset_gpio, 0); /* reset is active low */ - mdelay(5); - gpio_set_value(pdata->sensor_reset_gpio, 1); /* reset is active low */ - mdelay(5); -} - -static void mmpcam_power_down(struct mcam_camera *mcam) -{ - struct mmp_camera *cam = mcam_to_cam(mcam); - struct mmp_camera_platform_data *pdata; -/* - * Turn off clocks and set reset lines - */ - iowrite32(0, cam->power_regs + REG_CCIC_DCGCR); - iowrite32(0, cam->power_regs + REG_CCIC_CRCR); -/* - * Shut down the sensor. - */ - pdata = cam->pdev->dev.platform_data; - gpio_set_value(pdata->sensor_power_gpio, 0); - gpio_set_value(pdata->sensor_reset_gpio, 0); -} - - -static irqreturn_t mmpcam_irq(int irq, void *data) -{ - struct mcam_camera *mcam = data; - unsigned int irqs, handled; - - spin_lock(&mcam->dev_lock); - irqs = mcam_reg_read(mcam, REG_IRQSTAT); - handled = mccic_irq(mcam, irqs); - spin_unlock(&mcam->dev_lock); - return IRQ_RETVAL(handled); -} - - -static int mmpcam_probe(struct platform_device *pdev) -{ - struct mmp_camera *cam; - struct mcam_camera *mcam; - struct resource *res; - struct mmp_camera_platform_data *pdata; - int ret; - - cam = kzalloc(sizeof(*cam), GFP_KERNEL); - if (cam == NULL) - return -ENOMEM; - cam->pdev = pdev; - INIT_LIST_HEAD(&cam->devlist); - - mcam = &cam->mcam; - mcam->plat_power_up = mmpcam_power_up; - mcam->plat_power_down = mmpcam_power_down; - mcam->dev = &pdev->dev; - mcam->use_smbus = 0; - mcam->chip_id = V4L2_IDENT_ARMADA610; - mcam->buffer_mode = B_DMA_sg; - spin_lock_init(&mcam->dev_lock); - /* - * Get our I/O memory. - */ - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (res == NULL) { - dev_err(&pdev->dev, "no iomem resource!\n"); - ret = -ENODEV; - goto out_free; - } - mcam->regs = ioremap(res->start, resource_size(res)); - if (mcam->regs == NULL) { - dev_err(&pdev->dev, "MMIO ioremap fail\n"); - ret = -ENODEV; - goto out_free; - } - /* - * Power/clock memory is elsewhere; get it too. Perhaps this - * should really be managed outside of this driver? - */ - res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (res == NULL) { - dev_err(&pdev->dev, "no power resource!\n"); - ret = -ENODEV; - goto out_unmap1; - } - cam->power_regs = ioremap(res->start, resource_size(res)); - if (cam->power_regs == NULL) { - dev_err(&pdev->dev, "power MMIO ioremap fail\n"); - ret = -ENODEV; - goto out_unmap1; - } - /* - * Find the i2c adapter. This assumes, of course, that the - * i2c bus is already up and functioning. - */ - pdata = pdev->dev.platform_data; - mcam->i2c_adapter = platform_get_drvdata(pdata->i2c_device); - if (mcam->i2c_adapter == NULL) { - ret = -ENODEV; - dev_err(&pdev->dev, "No i2c adapter\n"); - goto out_unmap2; - } - /* - * Sensor GPIO pins. - */ - ret = gpio_request(pdata->sensor_power_gpio, "cam-power"); - if (ret) { - dev_err(&pdev->dev, "Can't get sensor power gpio %d", - pdata->sensor_power_gpio); - goto out_unmap2; - } - gpio_direction_output(pdata->sensor_power_gpio, 0); - ret = gpio_request(pdata->sensor_reset_gpio, "cam-reset"); - if (ret) { - dev_err(&pdev->dev, "Can't get sensor reset gpio %d", - pdata->sensor_reset_gpio); - goto out_gpio; - } - gpio_direction_output(pdata->sensor_reset_gpio, 0); - /* - * Power the device up and hand it off to the core. - */ - mmpcam_power_up(mcam); - ret = mccic_register(mcam); - if (ret) - goto out_gpio2; - /* - * Finally, set up our IRQ now that the core is ready to - * deal with it. - */ - res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); - if (res == NULL) { - ret = -ENODEV; - goto out_unregister; - } - cam->irq = res->start; - ret = request_irq(cam->irq, mmpcam_irq, IRQF_SHARED, - "mmp-camera", mcam); - if (ret == 0) { - mmpcam_add_device(cam); - return 0; - } - -out_unregister: - mccic_shutdown(mcam); -out_gpio2: - mmpcam_power_down(mcam); - gpio_free(pdata->sensor_reset_gpio); -out_gpio: - gpio_free(pdata->sensor_power_gpio); -out_unmap2: - iounmap(cam->power_regs); -out_unmap1: - iounmap(mcam->regs); -out_free: - kfree(cam); - return ret; -} - - -static int mmpcam_remove(struct mmp_camera *cam) -{ - struct mcam_camera *mcam = &cam->mcam; - struct mmp_camera_platform_data *pdata; - - mmpcam_remove_device(cam); - free_irq(cam->irq, mcam); - mccic_shutdown(mcam); - mmpcam_power_down(mcam); - pdata = cam->pdev->dev.platform_data; - gpio_free(pdata->sensor_reset_gpio); - gpio_free(pdata->sensor_power_gpio); - iounmap(cam->power_regs); - iounmap(mcam->regs); - kfree(cam); - return 0; -} - -static int mmpcam_platform_remove(struct platform_device *pdev) -{ - struct mmp_camera *cam = mmpcam_find_device(pdev); - - if (cam == NULL) - return -ENODEV; - return mmpcam_remove(cam); -} - -/* - * Suspend/resume support. - */ -#ifdef CONFIG_PM - -static int mmpcam_suspend(struct platform_device *pdev, pm_message_t state) -{ - struct mmp_camera *cam = mmpcam_find_device(pdev); - - if (state.event != PM_EVENT_SUSPEND) - return 0; - mccic_suspend(&cam->mcam); - return 0; -} - -static int mmpcam_resume(struct platform_device *pdev) -{ - struct mmp_camera *cam = mmpcam_find_device(pdev); - - /* - * Power up unconditionally just in case the core tries to - * touch a register even if nothing was active before; trust - * me, it's better this way. - */ - mmpcam_power_up_ctlr(cam); - return mccic_resume(&cam->mcam); -} - -#endif - - -static struct platform_driver mmpcam_driver = { - .probe = mmpcam_probe, - .remove = mmpcam_platform_remove, -#ifdef CONFIG_PM - .suspend = mmpcam_suspend, - .resume = mmpcam_resume, -#endif - .driver = { - .name = "mmp-camera", - .owner = THIS_MODULE - } -}; - - -static int __init mmpcam_init_module(void) -{ - mutex_init(&mmpcam_devices_lock); - return platform_driver_register(&mmpcam_driver); -} - -static void __exit mmpcam_exit_module(void) -{ - platform_driver_unregister(&mmpcam_driver); - /* - * platform_driver_unregister() should have emptied the list - */ - if (!list_empty(&mmpcam_devices)) - printk(KERN_ERR "mmp_camera leaving devices behind\n"); -} - -module_init(mmpcam_init_module); -module_exit(mmpcam_exit_module); |