1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
From 784407ada9241d907cf08145885410351a7eafc4 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Fri, 25 Jun 2010 12:03:59 -0500
Subject: [PATCH 25/75] omap3beagle: camera: Rename regulators to match actual voltage levels
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
arch/arm/mach-omap2/board-omap3beagle-camera.c | 46 ++++++++++++------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c
index 792c48d..8a4b7bc 100644
--- a/arch/arm/mach-omap2/board-omap3beagle-camera.c
+++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c
@@ -53,8 +53,8 @@
#define LEOPARD_RESET_GPIO 98
-static struct regulator *beagle_mt9t111_1_8v;
-static struct regulator *beagle_mt9t111_2_8v;
+static struct regulator *beagle_mt9t111_1_8v1;
+static struct regulator *beagle_mt9t111_1_8v2;
#if defined(CONFIG_VIDEO_MT9T111) || defined(CONFIG_VIDEO_MT9T111_MODULE)
static struct isp_interface_config mt9t111_if_config = {
@@ -169,10 +169,10 @@ static int mt9t111_power_set(struct v4l2_int_device *s, enum v4l2_power power)
case V4L2_POWER_STANDBY:
isp_set_xclk(vdev->cam->isp, 0, CAM_USE_XCLKA);
- if (regulator_is_enabled(beagle_mt9t111_1_8v))
- regulator_disable(beagle_mt9t111_1_8v);
- if (regulator_is_enabled(beagle_mt9t111_2_8v))
- regulator_disable(beagle_mt9t111_2_8v);
+ if (regulator_is_enabled(beagle_mt9t111_1_8v1))
+ regulator_disable(beagle_mt9t111_1_8v1);
+ if (regulator_is_enabled(beagle_mt9t111_1_8v2))
+ regulator_disable(beagle_mt9t111_1_8v2);
break;
case V4L2_POWER_ON:
@@ -184,12 +184,12 @@ static int mt9t111_power_set(struct v4l2_int_device *s, enum v4l2_power power)
gpio_set_value(LEOPARD_RESET_GPIO, 0);
/* turn on VDD */
- regulator_enable(beagle_mt9t111_1_8v);
+ regulator_enable(beagle_mt9t111_1_8v1);
mdelay(1);
/* turn on VDD_IO */
- regulator_enable(beagle_mt9t111_2_8v);
+ regulator_enable(beagle_mt9t111_1_8v2);
mdelay(50);
@@ -240,23 +240,23 @@ static int beagle_cam_probe(struct platform_device *pdev)
{
int err;
- beagle_mt9t111_1_8v = regulator_get(&pdev->dev, "vaux3_1");
- if (IS_ERR(beagle_mt9t111_1_8v)) {
+ beagle_mt9t111_1_8v1 = regulator_get(&pdev->dev, "vaux3_1");
+ if (IS_ERR(beagle_mt9t111_1_8v1)) {
dev_err(&pdev->dev, "vaux3_1 regulator missing\n");
- return PTR_ERR(beagle_mt9t111_1_8v);
+ return PTR_ERR(beagle_mt9t111_1_8v1);
}
- beagle_mt9t111_2_8v = regulator_get(&pdev->dev, "vaux4_1");
- if (IS_ERR(beagle_mt9t111_2_8v)) {
+ beagle_mt9t111_1_8v2 = regulator_get(&pdev->dev, "vaux4_1");
+ if (IS_ERR(beagle_mt9t111_1_8v2)) {
dev_err(&pdev->dev, "vaux4_1 regulator missing\n");
- regulator_put(beagle_mt9t111_1_8v);
- return PTR_ERR(beagle_mt9t111_2_8v);
+ regulator_put(beagle_mt9t111_1_8v1);
+ return PTR_ERR(beagle_mt9t111_1_8v2);
}
if (gpio_request(LEOPARD_RESET_GPIO, "cam_rst") != 0) {
dev_err(&pdev->dev, "Could not request GPIO %d",
LEOPARD_RESET_GPIO);
- regulator_put(beagle_mt9t111_2_8v);
- regulator_put(beagle_mt9t111_1_8v);
+ regulator_put(beagle_mt9t111_1_8v2);
+ regulator_put(beagle_mt9t111_1_8v1);
return -ENODEV;
}
@@ -270,12 +270,12 @@ static int beagle_cam_probe(struct platform_device *pdev)
static int beagle_cam_remove(struct platform_device *pdev)
{
- if (regulator_is_enabled(beagle_mt9t111_1_8v))
- regulator_disable(beagle_mt9t111_1_8v);
- regulator_put(beagle_mt9t111_1_8v);
- if (regulator_is_enabled(beagle_mt9t111_2_8v))
- regulator_disable(beagle_mt9t111_2_8v);
- regulator_put(beagle_mt9t111_2_8v);
+ if (regulator_is_enabled(beagle_mt9t111_1_8v1))
+ regulator_disable(beagle_mt9t111_1_8v1);
+ regulator_put(beagle_mt9t111_1_8v1);
+ if (regulator_is_enabled(beagle_mt9t111_1_8v2))
+ regulator_disable(beagle_mt9t111_1_8v2);
+ regulator_put(beagle_mt9t111_1_8v2);
gpio_free(LEOPARD_RESET_GPIO);
--
1.6.6.1
|
