diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-04-06 15:21:25 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-04-06 15:39:24 +0200 |
| commit | 616a026e640dc5b322a3f4ba6f8de757f389f127 (patch) | |
| tree | 23c799d4b30cfceaed2876483b5baefa6eddf007 /recipes/linux/linux-omap-2.6.29/isp | |
| parent | c273263b147da671b5ee105eb85d4302daf33555 (diff) | |
| download | openembedded-616a026e640dc5b322a3f4ba6f8de757f389f127.tar.gz | |
linux-omap 2.6.29: fixes
* add patch to fix leds
* tweak ISP patches to handle new API
* tweak beagleboard defconfig
Diffstat (limited to 'recipes/linux/linux-omap-2.6.29/isp')
2 files changed, 15 insertions, 15 deletions
diff --git a/recipes/linux/linux-omap-2.6.29/isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch b/recipes/linux/linux-omap-2.6.29/isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch index 77b273c789..f796ce8346 100644 --- a/recipes/linux/linux-omap-2.6.29/isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch +++ b/recipes/linux/linux-omap-2.6.29/isp/standalone/0001-Resizer-and-Previewer-driver-added-to-commit.patch @@ -443,7 +443,7 @@ index 0000000..634a056 + wait_for_completion_interruptible(&device->wfc); + + if (device->isp_addr_read) { -+ ispmmu_unmap(device->isp_addr_read); ++ ispmmu_vunmap(device->isp_addr_read); + device->isp_addr_read = 0; + } + @@ -465,7 +465,7 @@ index 0000000..634a056 + struct prev_fh *fh = q->priv_data; + struct prev_device *device = fh->device; + -+ ispmmu_unmap(device->isp_addr_read); ++ ispmmu_vunmap(device->isp_addr_read); + device->isp_addr_read = 0; + spin_lock(&device->vbq_lock); + vb->state = VIDEOBUF_NEEDS_INIT; @@ -550,7 +550,7 @@ index 0000000..634a056 + if (vb->state == VIDEOBUF_NEEDS_INIT) { + err = videobuf_iolock(q, vb, NULL); + if (!err) { -+ isp_addr = ispmmu_map_sg(dma->sglist, dma->sglen); ++ isp_addr = ispmmu_vmap(dma->sglist, dma->sglen); + if (!isp_addr) + err = -EIO; + else @@ -1450,11 +1450,11 @@ index 0000000..54bc425 + } + + if (fh->isp_addr_read) { -+ ispmmu_unmap(fh->isp_addr_read); ++ ispmmu_vunmap(fh->isp_addr_read); + fh->isp_addr_read = 0; + } + if (fh->isp_addr_write) { -+ ispmmu_unmap(fh->isp_addr_write); ++ ispmmu_vunmap(fh->isp_addr_write); + fh->isp_addr_write = 0; + } + @@ -2128,8 +2128,8 @@ index 0000000..54bc425 + videobuf_dma_free(dma); + } + -+ ispmmu_unmap(fh->isp_addr_read); -+ ispmmu_unmap(fh->isp_addr_write); ++ ispmmu_vunmap(fh->isp_addr_read); ++ ispmmu_vunmap(fh->isp_addr_write); + fh->isp_addr_read = 0; + fh->isp_addr_write = 0; + spin_lock(&fh->vbq_lock); @@ -2231,7 +2231,7 @@ index 0000000..54bc425 + if (vb->state == VIDEOBUF_NEEDS_INIT) { + err = videobuf_iolock(q, vb, NULL); + if (!err) { -+ isp_addr = ispmmu_map_sg(dma->sglist, dma->sglen); ++ isp_addr = ispmmu_vmap(dma->sglist, dma->sglen); + if (!isp_addr) + err = -EIO; + else { diff --git a/recipes/linux/linux-omap-2.6.29/isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch b/recipes/linux/linux-omap-2.6.29/isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch index e14da9986a..631b05f417 100644 --- a/recipes/linux/linux-omap-2.6.29/isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch +++ b/recipes/linux/linux-omap-2.6.29/isp/standalone/0002-Resizer-bug-fixes-on-top-of-1.0.2-release.patch @@ -125,11 +125,11 @@ index 54bc425..8059c70 100644 } - if (fh->isp_addr_read) { -- ispmmu_unmap(fh->isp_addr_read); +- ispmmu_vunmap(fh->isp_addr_read); - fh->isp_addr_read = 0; - } - if (fh->isp_addr_write) { -- ispmmu_unmap(fh->isp_addr_write); +- ispmmu_vunmap(fh->isp_addr_write); - fh->isp_addr_write = 0; - } - @@ -270,11 +270,11 @@ index 54bc425..8059c70 100644 + dma = videobuf_to_dma(q->bufs[vb->i]); + videobuf_dma_unmap(q, dma); + videobuf_dma_free(dma); -+ ispmmu_unmap(fh->config->buf_address[vb->i]); ++ ispmmu_vunmap(fh->config->buf_address[vb->i]); + fh->config->buf_address[vb->i] = 0; -- ispmmu_unmap(fh->isp_addr_read); -- ispmmu_unmap(fh->isp_addr_write); +- ispmmu_vunmap(fh->isp_addr_read); +- ispmmu_vunmap(fh->isp_addr_write); - fh->isp_addr_read = 0; - fh->isp_addr_write = 0; spin_lock(&fh->vbq_lock); @@ -429,7 +429,7 @@ index 54bc425..8059c70 100644 if (vb->state == VIDEOBUF_NEEDS_INIT) { - err = videobuf_iolock(q, vb, NULL); - if (!err) { -- isp_addr = ispmmu_map_sg(dma->sglist, dma->sglen); +- isp_addr = ispmmu_vmap(dma->sglist, dma->sglen); - if (!isp_addr) - err = -EIO; - else { @@ -491,7 +491,7 @@ index 54bc425..8059c70 100644 + goto buf_release; + spin_unlock(&fh->vbq_lock); + } -+ isp_addr = ispmmu_map_sg(dma->sglist, dma->sglen); ++ isp_addr = ispmmu_vmap(dma->sglist, dma->sglen); + if (!isp_addr) + err = -EIO; + else { |