Pandora Sourcecodes - openembedded.git/blob

   1 From 2cda8f55cb01496f88ba9ad15a276f84eaa02870 Mon Sep 17 00:00:00 2001
   2 From: Sergio Aguirre <saaguirre@ti.com>
   3 Date: Thu, 24 Jun 2010 14:27:39 -0500
   4 Subject: [PATCH 15/28] Revert "DEBUG: omap3beagle: camera: Force mode0 in cam_xclka"
   5
   6 This reverts commit 158e14b3d449dde2c6aa9f8cddb86fbbee2d2cd7.
   7 ---
   8  arch/arm/mach-omap2/board-omap3beagle-camera.c |    3 ---
   9  1 files changed, 0 insertions(+), 3 deletions(-)
  10
  11 diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c
  12 index 77f9469..1652f15 100644
  13 --- a/arch/arm/mach-omap2/board-omap3beagle-camera.c
  14 +++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c
  15 @@ -34,7 +34,6 @@
  16
  17  #include <plat/mux.h>
  18  #include <plat/board.h>
  19 -#include <plat/control.h>
  20
  21  #include <media/v4l2-int-device.h>
  22  #include <media/mt9t111.h>
  23 @@ -161,7 +160,6 @@ static int mt9t111_power_set(struct v4l2_int_device *s, enum v4l2_power power)
  24         switch (power) {
  25         case V4L2_POWER_OFF:
  26         case V4L2_POWER_STANDBY:
  27 -               omap_ctrl_writew(0x0, 0x110); /* Control XCLKA output mux */
  28                 isp_set_xclk(vdev->cam->isp, 0, CAM_USE_XCLKA);
  29
  30                 if (regulator_is_enabled(beagle_mt9t111_reg1))
  31 @@ -171,7 +169,6 @@ static int mt9t111_power_set(struct v4l2_int_device *s, enum v4l2_power power)
  32                 break;
  33
  34         case V4L2_POWER_ON:
  35 -               omap_ctrl_writew(0x0, 0x110); /* Control XCLKA output mux */
  36                 isp_set_xclk(vdev->cam->isp, MT9T111_CLK_MIN, CAM_USE_XCLKA);
  37
  38  #if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE)
  39 --
  40 1.6.6.1
  41