media: platform: rename omap/ to ti/omap/

As the end goal is to have platform drivers split by vendor,
rename omap/ to ti/omap/.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

1 files changed, 0 insertions, 361 deletions

diff --git a/drivers/media/platform/omap/omap_voutlib.c b/drivers/media/platform/omap/omap_voutlib.c
deleted file mode 100644
index 480a7e95533d..000000000000
--- a/drivers/media/platform/omap/omap_voutlib.c
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * omap_voutlib.c
- *
- * Copyright (C) 2005-2010 Texas Instruments.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- *
- * Based on the OMAP2 camera driver
- * Video-for-Linux (Version 2) camera capture driver for
- * the OMAP24xx camera controller.
- *
- * Author: Andy Lowe (source@mvista.com)
- *
- * Copyright (C) 2004 MontaVista Software, Inc.
- * Copyright (C) 2010 Texas Instruments.
- *
- */
-
-#include <linux/module.h>
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/videodev2.h>
-
-#include <linux/dma-mapping.h>
-
-#include <video/omapfb_dss.h>
-
-#include "omap_voutlib.h"
-
-MODULE_AUTHOR("Texas Instruments");
-MODULE_DESCRIPTION("OMAP Video library");
-MODULE_LICENSE("GPL");
-
-/* Return the default overlay cropping rectangle in crop given the image
- * size in pix and the video display size in fbuf.  The default
- * cropping rectangle is the largest rectangle no larger than the capture size
- * that will fit on the display.  The default cropping rectangle is centered in
- * the image.  All dimensions and offsets are rounded down to even numbers.
- */
-void omap_vout_default_crop(struct v4l2_pix_format *pix,
-		  struct v4l2_framebuffer *fbuf, struct v4l2_rect *crop)
-{
-	crop->width = (pix->width < fbuf->fmt.width) ?
-		pix->width : fbuf->fmt.width;
-	crop->height = (pix->height < fbuf->fmt.height) ?
-		pix->height : fbuf->fmt.height;
-	crop->width &= ~1;
-	crop->height &= ~1;
-	crop->left = ((pix->width - crop->width) >> 1) & ~1;
-	crop->top = ((pix->height - crop->height) >> 1) & ~1;
-}
-EXPORT_SYMBOL_GPL(omap_vout_default_crop);
-
-/* Given a new render window in new_win, adjust the window to the
- * nearest supported configuration.  The adjusted window parameters are
- * returned in new_win.
- * Returns zero if successful, or -EINVAL if the requested window is
- * impossible and cannot reasonably be adjusted.
- */
-int omap_vout_try_window(struct v4l2_framebuffer *fbuf,
-			struct v4l2_window *new_win)
-{
-	struct v4l2_rect try_win;
-
-	/* make a working copy of the new_win rectangle */
-	try_win = new_win->w;
-
-	/* adjust the preview window so it fits on the display by clipping any
-	 * offscreen areas
-	 */
-	if (try_win.left < 0) {
-		try_win.width += try_win.left;
-		try_win.left = 0;
-	}
-	if (try_win.top < 0) {
-		try_win.height += try_win.top;
-		try_win.top = 0;
-	}
-	try_win.width = (try_win.width < fbuf->fmt.width) ?
-		try_win.width : fbuf->fmt.width;
-	try_win.height = (try_win.height < fbuf->fmt.height) ?
-		try_win.height : fbuf->fmt.height;
-	if (try_win.left + try_win.width > fbuf->fmt.width)
-		try_win.width = fbuf->fmt.width - try_win.left;
-	if (try_win.top + try_win.height > fbuf->fmt.height)
-		try_win.height = fbuf->fmt.height - try_win.top;
-	try_win.width &= ~1;
-	try_win.height &= ~1;
-
-	if (try_win.width <= 0 || try_win.height <= 0)
-		return -EINVAL;
-
-	/* We now have a valid preview window, so go with it */
-	new_win->w = try_win;
-	new_win->field = V4L2_FIELD_NONE;
-	new_win->clips = NULL;
-	new_win->clipcount = 0;
-	new_win->bitmap = NULL;
-
-	return 0;
-}
-EXPORT_SYMBOL_GPL(omap_vout_try_window);
-
-/* Given a new render window in new_win, adjust the window to the
- * nearest supported configuration.  The image cropping window in crop
- * will also be adjusted if necessary.  Preference is given to keeping the
- * the window as close to the requested configuration as possible.  If
- * successful, new_win, vout->win, and crop are updated.
- * Returns zero if successful, or -EINVAL if the requested preview window is
- * impossible and cannot reasonably be adjusted.
- */
-int omap_vout_new_window(struct v4l2_rect *crop,
-		struct v4l2_window *win, struct v4l2_framebuffer *fbuf,
-		struct v4l2_window *new_win)
-{
-	int err;
-
-	err = omap_vout_try_window(fbuf, new_win);
-	if (err)
-		return err;
-
-	/* update our preview window */
-	win->w = new_win->w;
-	win->field = new_win->field;
-	win->chromakey = new_win->chromakey;
-
-	/* Adjust the cropping window to allow for resizing limitation */
-	if (omap_vout_dss_omap24xx()) {
-		/* For 24xx limit is 8x to 1/2x scaling. */
-		if ((crop->height/win->w.height) >= 2)
-			crop->height = win->w.height * 2;
-
-		if ((crop->width/win->w.width) >= 2)
-			crop->width = win->w.width * 2;
-
-		if (crop->width > 768) {
-			/* The OMAP2420 vertical resizing line buffer is 768
-			 * pixels wide. If the cropped image is wider than
-			 * 768 pixels then it cannot be vertically resized.
-			 */
-			if (crop->height != win->w.height)
-				crop->width = 768;
-		}
-	} else if (omap_vout_dss_omap34xx()) {
-		/* For 34xx limit is 8x to 1/4x scaling. */
-		if ((crop->height/win->w.height) >= 4)
-			crop->height = win->w.height * 4;
-
-		if ((crop->width/win->w.width) >= 4)
-			crop->width = win->w.width * 4;
-	}
-	return 0;
-}
-EXPORT_SYMBOL_GPL(omap_vout_new_window);
-
-/* Given a new cropping rectangle in new_crop, adjust the cropping rectangle to
- * the nearest supported configuration.  The image render window in win will
- * also be adjusted if necessary.  The preview window is adjusted such that the
- * horizontal and vertical rescaling ratios stay constant.  If the render
- * window would fall outside the display boundaries, the cropping rectangle
- * will also be adjusted to maintain the rescaling ratios.  If successful, crop
- * and win are updated.
- * Returns zero if successful, or -EINVAL if the requested cropping rectangle is
- * impossible and cannot reasonably be adjusted.
- */
-int omap_vout_new_crop(struct v4l2_pix_format *pix,
-	      struct v4l2_rect *crop, struct v4l2_window *win,
-	      struct v4l2_framebuffer *fbuf, const struct v4l2_rect *new_crop)
-{
-	struct v4l2_rect try_crop;
-	unsigned long vresize, hresize;
-
-	/* make a working copy of the new_crop rectangle */
-	try_crop = *new_crop;
-
-	/* adjust the cropping rectangle so it fits in the image */
-	if (try_crop.left < 0) {
-		try_crop.width += try_crop.left;
-		try_crop.left = 0;
-	}
-	if (try_crop.top < 0) {
-		try_crop.height += try_crop.top;
-		try_crop.top = 0;
-	}
-	try_crop.width = (try_crop.width < pix->width) ?
-		try_crop.width : pix->width;
-	try_crop.height = (try_crop.height < pix->height) ?
-		try_crop.height : pix->height;
-	if (try_crop.left + try_crop.width > pix->width)
-		try_crop.width = pix->width - try_crop.left;
-	if (try_crop.top + try_crop.height > pix->height)
-		try_crop.height = pix->height - try_crop.top;
-
-	try_crop.width &= ~1;
-	try_crop.height &= ~1;
-
-	if (try_crop.width <= 0 || try_crop.height <= 0)
-		return -EINVAL;
-
-	if (omap_vout_dss_omap24xx()) {
-		if (try_crop.height != win->w.height) {
-			/* If we're resizing vertically, we can't support a
-			 * crop width wider than 768 pixels.
-			 */
-			if (try_crop.width > 768)
-				try_crop.width = 768;
-		}
-	}
-	/* vertical resizing */
-	vresize = (1024 * try_crop.height) / win->w.height;
-	if (omap_vout_dss_omap24xx() && (vresize > 2048))
-		vresize = 2048;
-	else if (omap_vout_dss_omap34xx() && (vresize > 4096))
-		vresize = 4096;
-
-	win->w.height = ((1024 * try_crop.height) / vresize) & ~1;
-	if (win->w.height == 0)
-		win->w.height = 2;
-	if (win->w.height + win->w.top > fbuf->fmt.height) {
-		/* We made the preview window extend below the bottom of the
-		 * display, so clip it to the display boundary and resize the
-		 * cropping height to maintain the vertical resizing ratio.
-		 */
-		win->w.height = (fbuf->fmt.height - win->w.top) & ~1;
-		if (try_crop.height == 0)
-			try_crop.height = 2;
-	}
-	/* horizontal resizing */
-	hresize = (1024 * try_crop.width) / win->w.width;
-	if (omap_vout_dss_omap24xx() && (hresize > 2048))
-		hresize = 2048;
-	else if (omap_vout_dss_omap34xx() && (hresize > 4096))
-		hresize = 4096;
-
-	win->w.width = ((1024 * try_crop.width) / hresize) & ~1;
-	if (win->w.width == 0)
-		win->w.width = 2;
-	if (win->w.width + win->w.left > fbuf->fmt.width) {
-		/* We made the preview window extend past the right side of the
-		 * display, so clip it to the display boundary and resize the
-		 * cropping width to maintain the horizontal resizing ratio.
-		 */
-		win->w.width = (fbuf->fmt.width - win->w.left) & ~1;
-		if (try_crop.width == 0)
-			try_crop.width = 2;
-	}
-	if (omap_vout_dss_omap24xx()) {
-		if ((try_crop.height/win->w.height) >= 2)
-			try_crop.height = win->w.height * 2;
-
-		if ((try_crop.width/win->w.width) >= 2)
-			try_crop.width = win->w.width * 2;
-
-		if (try_crop.width > 768) {
-			/* The OMAP2420 vertical resizing line buffer is
-			 * 768 pixels wide.  If the cropped image is wider
-			 * than 768 pixels then it cannot be vertically resized.
-			 */
-			if (try_crop.height != win->w.height)
-				try_crop.width = 768;
-		}
-	} else if (omap_vout_dss_omap34xx()) {
-		if ((try_crop.height/win->w.height) >= 4)
-			try_crop.height = win->w.height * 4;
-
-		if ((try_crop.width/win->w.width) >= 4)
-			try_crop.width = win->w.width * 4;
-	}
-	/* update our cropping rectangle and we're done */
-	*crop = try_crop;
-	return 0;
-}
-EXPORT_SYMBOL_GPL(omap_vout_new_crop);
-
-/* Given a new format in pix and fbuf,  crop and win
- * structures are initialized to default values. crop
- * is initialized to the largest window size that will fit on the display.  The
- * crop window is centered in the image. win is initialized to
- * the same size as crop and is centered on the display.
- * All sizes and offsets are constrained to be even numbers.
- */
-void omap_vout_new_format(struct v4l2_pix_format *pix,
-		struct v4l2_framebuffer *fbuf, struct v4l2_rect *crop,
-		struct v4l2_window *win)
-{
-	/* crop defines the preview source window in the image capture
-	 * buffer
-	 */
-	omap_vout_default_crop(pix, fbuf, crop);
-
-	/* win defines the preview target window on the display */
-	win->w.width = crop->width;
-	win->w.height = crop->height;
-	win->w.left = ((fbuf->fmt.width - win->w.width) >> 1) & ~1;
-	win->w.top = ((fbuf->fmt.height - win->w.height) >> 1) & ~1;
-}
-EXPORT_SYMBOL_GPL(omap_vout_new_format);
-
-/*
- * Allocate buffers
- */
-unsigned long omap_vout_alloc_buffer(u32 buf_size, u32 *phys_addr)
-{
-	u32 order, size;
-	unsigned long virt_addr, addr;
-
-	size = PAGE_ALIGN(buf_size);
-	order = get_order(size);
-	virt_addr = __get_free_pages(GFP_KERNEL, order);
-	addr = virt_addr;
-
-	if (virt_addr) {
-		while (size > 0) {
-			SetPageReserved(virt_to_page(addr));
-			addr += PAGE_SIZE;
-			size -= PAGE_SIZE;
-		}
-	}
-	*phys_addr = (u32) virt_to_phys((void *) virt_addr);
-	return virt_addr;
-}
-
-/*
- * Free buffers
- */
-void omap_vout_free_buffer(unsigned long virtaddr, u32 buf_size)
-{
-	u32 order, size;
-	unsigned long addr = virtaddr;
-
-	size = PAGE_ALIGN(buf_size);
-	order = get_order(size);
-
-	while (size > 0) {
-		ClearPageReserved(virt_to_page(addr));
-		addr += PAGE_SIZE;
-		size -= PAGE_SIZE;
-	}
-	free_pages((unsigned long) virtaddr, order);
-}
-
-bool omap_vout_dss_omap24xx(void)
-{
-	return omapdss_get_version() == OMAPDSS_VER_OMAP24xx;
-}
-
-bool omap_vout_dss_omap34xx(void)
-{
-	switch (omapdss_get_version()) {
-	case OMAPDSS_VER_OMAP34xx_ES1:
-	case OMAPDSS_VER_OMAP34xx_ES3:
-	case OMAPDSS_VER_OMAP3630:
-	case OMAPDSS_VER_AM35xx:
-		return true;
-	default:
-		return false;
-	}
-}