recipes-bsp/linux/linux-omap-psp-2.6.32/cam/0022-omap3beagle-camera-Clarify-regulators-names.patch

   1 From db7e3a7af04196e80fe15e2a651440575f9313af Mon Sep 17 00:00:00 2001
   2 From: Sergio Aguirre <saaguirre@ti.com>
   3 Date: Thu, 24 Jun 2010 17:53:55 -0500
   4 Subject: [PATCH 22/75] omap3beagle: camera: Clarify regulators names
   5
   6 Changed:
   7  - beagle_mt9t111_reg1 -> beagle_mt9t111_1_8v
   8  - beagle_mt9t111_reg2 -> beagle_mt9t111_2_8v
   9
  10 To help clarify sequence.
  11
  12 Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
  13 ---
  14  arch/arm/mach-omap2/board-omap3beagle-camera.c |   42 ++++++++++++------------
  15  1 files changed, 21 insertions(+), 21 deletions(-)
  16
  17 diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c
  18 index 529a6be..6babaf3 100644
  19 --- a/arch/arm/mach-omap2/board-omap3beagle-camera.c
  20 +++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c
  21 @@ -51,8 +51,8 @@
  22
  23  #define ISP_MT9T111_MCLK               216000000
  24
  25 -static struct regulator *beagle_mt9t111_reg1;
  26 -static struct regulator *beagle_mt9t111_reg2;
  27 +static struct regulator *beagle_mt9t111_1_8v;
  28 +static struct regulator *beagle_mt9t111_2_8v;
  29
  30  #if defined(CONFIG_VIDEO_MT9T111) || defined(CONFIG_VIDEO_MT9T111_MODULE)
  31  static struct isp_interface_config mt9t111_if_config = {
  32 @@ -167,10 +167,10 @@ static int mt9t111_power_set(struct v4l2_int_device *s, enum v4l2_power power)
  33         case V4L2_POWER_STANDBY:
  34                 isp_set_xclk(vdev->cam->isp, 0, CAM_USE_XCLKA);
  35
  36 -               if (regulator_is_enabled(beagle_mt9t111_reg1))
  37 -                       regulator_disable(beagle_mt9t111_reg1);
  38 -               if (regulator_is_enabled(beagle_mt9t111_reg2))
  39 -                       regulator_disable(beagle_mt9t111_reg2);
  40 +               if (regulator_is_enabled(beagle_mt9t111_1_8v))
  41 +                       regulator_disable(beagle_mt9t111_1_8v);
  42 +               if (regulator_is_enabled(beagle_mt9t111_2_8v))
  43 +                       regulator_disable(beagle_mt9t111_2_8v);
  44                 break;
  45
  46         case V4L2_POWER_ON:
  47 @@ -181,8 +181,8 @@ static int mt9t111_power_set(struct v4l2_int_device *s, enum v4l2_power power)
  48  #endif
  49
  50                 /* turn on analog power */
  51 -               regulator_enable(beagle_mt9t111_reg1);
  52 -               regulator_enable(beagle_mt9t111_reg2);
  53 +               regulator_enable(beagle_mt9t111_1_8v);
  54 +               regulator_enable(beagle_mt9t111_2_8v);
  55                 udelay(100);
  56
  57                 break;
  58 @@ -212,16 +212,16 @@ static int beagle_cam_probe(struct platform_device *pdev)
  59  {
  60         int err;
  61
  62 -       beagle_mt9t111_reg1 = regulator_get(&pdev->dev, "vaux3_1");
  63 -       if (IS_ERR(beagle_mt9t111_reg1)) {
  64 +       beagle_mt9t111_1_8v = regulator_get(&pdev->dev, "vaux3_1");
  65 +       if (IS_ERR(beagle_mt9t111_1_8v)) {
  66                 dev_err(&pdev->dev, "vaux3_1 regulator missing\n");
  67 -               return PTR_ERR(beagle_mt9t111_reg1);
  68 +               return PTR_ERR(beagle_mt9t111_1_8v);
  69         }
  70 -       beagle_mt9t111_reg2 = regulator_get(&pdev->dev, "vaux4_1");
  71 -       if (IS_ERR(beagle_mt9t111_reg2)) {
  72 +       beagle_mt9t111_2_8v = regulator_get(&pdev->dev, "vaux4_1");
  73 +       if (IS_ERR(beagle_mt9t111_2_8v)) {
  74                 dev_err(&pdev->dev, "vaux4_1 regulator missing\n");
  75 -               regulator_put(beagle_mt9t111_reg1);
  76 -               return PTR_ERR(beagle_mt9t111_reg2);
  77 +               regulator_put(beagle_mt9t111_1_8v);
  78 +               return PTR_ERR(beagle_mt9t111_2_8v);
  79         }
  80
  81         printk(KERN_INFO MODULE_NAME ": Driver registration complete \n");
  82 @@ -231,12 +231,12 @@ static int beagle_cam_probe(struct platform_device *pdev)
  83
  84  static int beagle_cam_remove(struct platform_device *pdev)
  85  {
  86 -       if (regulator_is_enabled(beagle_mt9t111_reg1))
  87 -               regulator_disable(beagle_mt9t111_reg1);
  88 -       regulator_put(beagle_mt9t111_reg1);
  89 -       if (regulator_is_enabled(beagle_mt9t111_reg2))
  90 -               regulator_disable(beagle_mt9t111_reg2);
  91 -       regulator_put(beagle_mt9t111_reg2);
  92 +       if (regulator_is_enabled(beagle_mt9t111_1_8v))
  93 +               regulator_disable(beagle_mt9t111_1_8v);
  94 +       regulator_put(beagle_mt9t111_1_8v);
  95 +       if (regulator_is_enabled(beagle_mt9t111_2_8v))
  96 +               regulator_disable(beagle_mt9t111_2_8v);
  97 +       regulator_put(beagle_mt9t111_2_8v);
  98
  99         return 0;
 100  }
 101 --
 102 1.6.6.1
 103