Skip to content

Commit

Permalink
V4L/DVB (7250): Clean up pxa-camera driver, remove non-functional and…
Browse files Browse the repository at this point in the history 
… never tested pm-support

This patch addresses most issues pointed out by Russell and Erik, moves
recently introduced into pxa-regs.h camera-specific defines into
pxa_camera.c, removes dummy power-management functions, improves
function-naming, etc.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed Apr 24, 2008
1 parent bb55de3 commit 7102b77
Showing 1 changed file with 64 additions and 86 deletions.
150 changes: 64 additions & 86 deletions drivers/media/video/pxa_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@
* (at your option) any later version.
*/

#include <asm/io.h>

#include <linux/init.h>
#include <linux/module.h>
#include <linux/io.h>
#include <linux/delay.h>
#include <linux/dma-mapping.h>
#include <linux/errno.h>
Expand Down Expand Up @@ -42,6 +41,26 @@
#define PXA_CAM_VERSION_CODE KERNEL_VERSION(0, 0, 5)
#define PXA_CAM_DRV_NAME "pxa27x-camera"

#define CICR0_SIM_MP (0 << 24)
#define CICR0_SIM_SP (1 << 24)
#define CICR0_SIM_MS (2 << 24)
#define CICR0_SIM_EP (3 << 24)
#define CICR0_SIM_ES (4 << 24)

#define CICR1_DW_VAL(x) ((x) & CICR1_DW) /* Data bus width */
#define CICR1_PPL_VAL(x) (((x) << 15) & CICR1_PPL) /* Pixels per line */

#define CICR2_BLW_VAL(x) (((x) << 24) & CICR2_BLW) /* Beginning-of-line pixel clock wait count */
#define CICR2_ELW_VAL(x) (((x) << 16) & CICR2_ELW) /* End-of-line pixel clock wait count */
#define CICR2_HSW_VAL(x) (((x) << 10) & CICR2_HSW) /* Horizontal sync pulse width */
#define CICR2_BFPW_VAL(x) (((x) << 3) & CICR2_BFPW) /* Beginning-of-frame pixel clock wait count */
#define CICR2_FSW_VAL(x) (((x) << 0) & CICR2_FSW) /* Frame stabilization wait count */

#define CICR3_BFW_VAL(x) (((x) << 24) & CICR3_BFW) /* Beginning-of-frame line clock wait count */
#define CICR3_EFW_VAL(x) (((x) << 16) & CICR3_EFW) /* End-of-frame line clock wait count */
#define CICR3_VSW_VAL(x) (((x) << 11) & CICR3_VSW) /* Vertical sync pulse width */
#define CICR3_LPF_VAL(x) (((x) << 0) & CICR3_LPF) /* Lines per frame */

#define CICR0_IRQ_MASK (CICR0_TOM | CICR0_RDAVM | CICR0_FEM | CICR0_EOLM | \
CICR0_PERRM | CICR0_QDM | CICR0_CDM | CICR0_SOFM | \
CICR0_EOFM | CICR0_FOM)
Expand Down Expand Up @@ -83,8 +102,6 @@ struct pxa_camera_dev {
void __iomem *base;
unsigned int dma_chan_y;

enum v4l2_buf_type type;

struct pxacamera_platform_data *pdata;
struct resource *res;
unsigned long platform_flags;
Expand All @@ -94,8 +111,6 @@ struct pxa_camera_dev {

spinlock_t lock;

int dma_running;

struct pxa_buffer *active;
};

Expand All @@ -106,9 +121,8 @@ static unsigned int vid_limit = 16; /* Video memory limit, in Mb */
/*
* Videobuf operations
*/
static int
pxa_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
unsigned int *size)
static int pxa_videobuf_setup(struct videobuf_queue *vq, unsigned int *count,
unsigned int *size)
{
struct soc_camera_device *icd = vq->priv_data;

Expand Down Expand Up @@ -151,9 +165,8 @@ static void free_buffer(struct videobuf_queue *vq, struct pxa_buffer *buf)
buf->vb.state = VIDEOBUF_NEEDS_INIT;
}

static int
pxa_videobuf_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
enum v4l2_field field)
static int pxa_videobuf_prepare(struct videobuf_queue *vq,
struct videobuf_buffer *vb, enum v4l2_field field)
{
struct soc_camera_device *icd = vq->priv_data;
struct soc_camera_host *ici =
Expand Down Expand Up @@ -255,15 +268,15 @@ pxa_videobuf_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
return ret;
}

static void
pxa_videobuf_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
static void pxa_videobuf_queue(struct videobuf_queue *vq,
struct videobuf_buffer *vb)
{
struct soc_camera_device *icd = vq->priv_data;
struct soc_camera_host *ici =
to_soc_camera_host(icd->dev.parent);
struct pxa_camera_dev *pcdev = ici->priv;
struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb);
struct pxa_buffer *active = pcdev->active;
struct pxa_buffer *active;
struct videobuf_dmabuf *dma = videobuf_to_dma(vb);
int nents = dma->sglen;
unsigned long flags;
Expand All @@ -275,8 +288,9 @@ pxa_videobuf_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
list_add_tail(&vb->queue, &pcdev->capture);

vb->state = VIDEOBUF_ACTIVE;
active = pcdev->active;

if (!pcdev->active) {
if (!active) {
CIFR |= CIFR_RESET_F;
DDADR(pcdev->dma_chan_y) = buf->sg_dma;
DCSR(pcdev->dma_chan_y) = DCSR_RUN;
Expand Down Expand Up @@ -373,22 +387,21 @@ static void pxa_camera_dma_irq_y(int channel, void *data)
spin_lock_irqsave(&pcdev->lock, flags);

status = DCSR(pcdev->dma_chan_y);
DCSR(pcdev->dma_chan_y) = status;

if (status & DCSR_BUSERR) {
dev_err(pcdev->dev, "%s: Bus Error\n", __FUNCTION__);
DCSR(pcdev->dma_chan_y) |= DCSR_BUSERR;
dev_err(pcdev->dev, "DMA Bus Error IRQ!\n");
goto out;
}

if (!(status & DCSR_ENDINTR)) {
dev_err(pcdev->dev, "%s: unknown dma interrupt source. "
"status: 0x%08x\n", __FUNCTION__, status);
dev_err(pcdev->dev, "Unknown DMA IRQ source, "
"status: 0x%08x\n", status);
goto out;
}

DCSR(pcdev->dma_chan_y) |= DCSR_ENDINTR;

if (!pcdev->active) {
dev_err(pcdev->dev, "%s: no active buf\n", __FUNCTION__);
dev_err(pcdev->dev, "DMA End IRQ with no active buffer!\n");
goto out;
}

Expand All @@ -398,7 +411,7 @@ static void pxa_camera_dma_irq_y(int channel, void *data)
dev_dbg(pcdev->dev, "%s (vb=0x%p) 0x%08lx %d\n", __FUNCTION__,
vb, vb->baddr, vb->bsize);

/* _init is used to debug races, see comment in pxa_is_reqbufs() */
/* _init is used to debug races, see comment in pxa_camera_reqbufs() */
list_del_init(&vb->queue);
vb->state = VIDEOBUF_DONE;
do_gettimeofday(&vb->ts);
Expand All @@ -419,7 +432,7 @@ static void pxa_camera_dma_irq_y(int channel, void *data)
spin_unlock_irqrestore(&pcdev->lock, flags);
}

static struct videobuf_queue_ops pxa_video_ops = {
static struct videobuf_queue_ops pxa_videobuf_ops = {
.buf_setup = pxa_videobuf_setup,
.buf_prepare = pxa_videobuf_prepare,
.buf_queue = pxa_videobuf_queue,
Expand All @@ -444,7 +457,7 @@ static int mclk_get_divisor(struct pxa_camera_dev *pcdev)
return div;
}

static void pxa_is_activate(struct pxa_camera_dev *pcdev)
static void pxa_camera_activate(struct pxa_camera_dev *pcdev)
{
struct pxacamera_platform_data *pdata = pcdev->pdata;
u32 cicr4 = 0;
Expand Down Expand Up @@ -486,7 +499,7 @@ static void pxa_is_activate(struct pxa_camera_dev *pcdev)
clk_enable(pcdev->clk);
}

static void pxa_is_deactivate(struct pxa_camera_dev *pcdev)
static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev)
{
struct pxacamera_platform_data *board = pcdev->pdata;

Expand Down Expand Up @@ -518,7 +531,7 @@ static irqreturn_t pxa_camera_irq(int irq, void *data)

/* The following two functions absolutely depend on the fact, that
* there can be only one camera on PXA quick capture interface */
static int pxa_is_add_device(struct soc_camera_device *icd)
static int pxa_camera_add_device(struct soc_camera_device *icd)
{
struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
struct pxa_camera_dev *pcdev = ici->priv;
Expand All @@ -534,7 +547,7 @@ static int pxa_is_add_device(struct soc_camera_device *icd)
dev_info(&icd->dev, "PXA Camera driver attached to camera %d\n",
icd->devnum);

pxa_is_activate(pcdev);
pxa_camera_activate(pcdev);
ret = icd->ops->init(icd);

if (!ret)
Expand All @@ -546,7 +559,7 @@ static int pxa_is_add_device(struct soc_camera_device *icd)
return ret;
}

static void pxa_is_remove_device(struct soc_camera_device *icd)
static void pxa_camera_remove_device(struct soc_camera_device *icd)
{
struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
struct pxa_camera_dev *pcdev = ici->priv;
Expand All @@ -563,13 +576,13 @@ static void pxa_is_remove_device(struct soc_camera_device *icd)

icd->ops->release(icd);

pxa_is_deactivate(pcdev);
pxa_camera_deactivate(pcdev);

pcdev->icd = NULL;
}

static int pxa_is_set_capture_format(struct soc_camera_device *icd,
__u32 pixfmt, struct v4l2_rect *rect)
static int pxa_camera_set_capture_format(struct soc_camera_device *icd,
__u32 pixfmt, struct v4l2_rect *rect)
{
struct soc_camera_host *ici =
to_soc_camera_host(icd->dev.parent);
Expand Down Expand Up @@ -652,14 +665,14 @@ static int pxa_is_set_capture_format(struct soc_camera_device *icd,

/* CIF interrupts are not used, only DMA */
CICR0 = (pcdev->platform_flags & PXA_CAMERA_MASTER ?
0 : (CICR0_SL_CAP_EN | CICR0_SIM_SP)) |
CICR0_SIM_MP : (CICR0_SL_CAP_EN | CICR0_SIM_SP)) |
CICR0_DMAEN | CICR0_IRQ_MASK | (cicr0 & CICR0_ENB);

return 0;
}

static int pxa_is_try_fmt_cap(struct soc_camera_host *ici,
struct v4l2_format *f)
static int pxa_camera_try_fmt_cap(struct soc_camera_host *ici,
struct v4l2_format *f)
{
/* limit to pxa hardware capabilities */
if (f->fmt.pix.height < 32)
Expand All @@ -675,8 +688,8 @@ static int pxa_is_try_fmt_cap(struct soc_camera_host *ici,
return 0;
}

static int pxa_is_reqbufs(struct soc_camera_file *icf,
struct v4l2_requestbuffers *p)
static int pxa_camera_reqbufs(struct soc_camera_file *icf,
struct v4l2_requestbuffers *p)
{
int i;

Expand All @@ -694,7 +707,7 @@ static int pxa_is_reqbufs(struct soc_camera_file *icf,
return 0;
}

static unsigned int pxa_is_poll(struct file *file, poll_table *pt)
static unsigned int pxa_camera_poll(struct file *file, poll_table *pt)
{
struct soc_camera_file *icf = file->private_data;
struct pxa_buffer *buf;
Expand All @@ -711,8 +724,8 @@ static unsigned int pxa_is_poll(struct file *file, poll_table *pt)
return 0;
}

static int pxa_is_querycap(struct soc_camera_host *ici,
struct v4l2_capability *cap)
static int pxa_camera_querycap(struct soc_camera_host *ici,
struct v4l2_capability *cap)
{
/* cap->name is set by the firendly caller:-> */
strlcpy(cap->card, pxa_cam_driver_description, sizeof(cap->card));
Expand All @@ -725,15 +738,15 @@ static int pxa_is_querycap(struct soc_camera_host *ici,
/* Should beallocated dynamically too, but we have only one. */
static struct soc_camera_host pxa_soc_camera_host = {
.drv_name = PXA_CAM_DRV_NAME,
.vbq_ops = &pxa_video_ops,
.add = pxa_is_add_device,
.remove = pxa_is_remove_device,
.vbq_ops = &pxa_videobuf_ops,
.add = pxa_camera_add_device,
.remove = pxa_camera_remove_device,
.msize = sizeof(struct pxa_buffer),
.set_capture_format = pxa_is_set_capture_format,
.try_fmt_cap = pxa_is_try_fmt_cap,
.reqbufs = pxa_is_reqbufs,
.poll = pxa_is_poll,
.querycap = pxa_is_querycap,
.set_capture_format = pxa_camera_set_capture_format,
.try_fmt_cap = pxa_camera_try_fmt_cap,
.reqbufs = pxa_camera_reqbufs,
.poll = pxa_camera_poll,
.querycap = pxa_camera_querycap,
};

static int pxa_camera_probe(struct platform_device *pdev)
Expand All @@ -753,8 +766,7 @@ static int pxa_camera_probe(struct platform_device *pdev)

pcdev = kzalloc(sizeof(*pcdev), GFP_KERNEL);
if (!pcdev) {
dev_err(&pdev->dev, "%s: Could not allocate pcdev\n",
__FUNCTION__);
dev_err(&pdev->dev, "Could not allocate pcdev\n");
err = -ENOMEM;
goto exit;
}
Expand Down Expand Up @@ -871,51 +883,17 @@ static int __devexit pxa_camera_remove(struct platform_device *pdev)

kfree(pcdev);

dev_info(&pdev->dev, "%s: PXA Camera driver unloaded\n", __FUNCTION__);

return 0;
}

/*
* Suspend the Camera Module.
*/
static int pxa_camera_suspend(struct platform_device *pdev, pm_message_t level)
{
struct pxa_camera_dev *pcdev = platform_get_drvdata(pdev);
dev_info(&pdev->dev, "PXA Camera driver unloaded\n");

dev_info(&pdev->dev, "camera suspend\n");
disable_irq(pcdev->irq);
return 0;
}

/*
* Resume the Camera Module.
*/
static int pxa_camera_resume(struct platform_device *pdev)
{
struct pxa_camera_dev *pcdev = platform_get_drvdata(pdev);

dev_info(&pdev->dev, "camera resume\n");
enable_irq(pcdev->irq);

/* if (pcdev) { */ /* FIXME: dev in use? */
/* DRCMR68 = pcdev->dma_chan_y | DRCMR_MAPVLD; */
/* DRCMR69 = pcdev->dma_chan_cb | DRCMR_MAPVLD; */
/* DRCMR70 = pcdev->dma_chan_cr | DRCMR_MAPVLD; */
/* } */

return 0;
}


static struct platform_driver pxa_camera_driver = {
.driver = {
.name = PXA_CAM_DRV_NAME,
},
.probe = pxa_camera_probe,
.remove = __exit_p(pxa_camera_remove),
.suspend = pxa_camera_suspend,
.resume = pxa_camera_resume,
};


Expand Down

0 comments on commit 7102b77

Please sign in to comment.