commit 4d28c093e70f2cde3369f7fc021e1b14d1875346
author Shuzhen Wang <shuzhenw@codeaurora.org> Thu Jul 14 15:40:33 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 10:27:48 2011 -0700
tree 19adec0ecc50674a2e5dee3c6bd6a2fde4d8f25e
parent 6b3eb1abf195fa795545b0c9937b5561c481d763

camera: 8960: Enable GDHS support.

Enable GDHS support for VFE, VPE, and IJPEG.

Signed-off-by: Shuzhen Wang <shuzhenw@codeaurora.org>

arch/arm/mach-msm/devices-8960.c

diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index f59ed3d..d856ac6 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -1079,6 +1079,9 @@
 };
 
 struct platform_device *msm_footswitch_devices[] = {
+	FS_8X60(FS_IJPEG,  "fs_ijpeg"),
+	FS_8X60(FS_VFE,    "fs_vfe"),
+	FS_8X60(FS_VPE,    "fs_vpe"),
 };
 unsigned msm_num_footswitch_devices = ARRAY_SIZE(msm_footswitch_devices);
 

drivers/media/video/msm/msm_io_8960.c

diff --git a/drivers/media/video/msm/msm_io_8960.c b/drivers/media/video/msm/msm_io_8960.c
index 4b0600b..c07e8a4 100644
--- a/drivers/media/video/msm/msm_io_8960.c
+++ b/drivers/media/video/msm/msm_io_8960.c
@@ -466,11 +466,12 @@
 	if (fs_vfe == NULL) {
 		fs_vfe = regulator_get(&pdev->dev, "fs_vfe");
 		if (IS_ERR(fs_vfe)) {
-			CDBG("%s: Regulator FS_VFE get failed %ld\n", __func__,
-				PTR_ERR(fs_vfe));
+			pr_err("%s: Regulator FS_VFE get failed %ld\n",
+				__func__, PTR_ERR(fs_vfe));
 			fs_vfe = NULL;
 		} else if (regulator_enable(fs_vfe)) {
-			CDBG("%s: Regulator FS_VFE enable failed\n", __func__);
+			pr_err("%s: Regulator FS_VFE enable failed\n",
+							__func__);
 			regulator_put(fs_vfe);
 		}
 	}
@@ -984,7 +985,8 @@
 	if (fs_ijpeg) {
 		rc = regulator_disable(fs_ijpeg);
 		if (rc < 0) {
-			CDBG("%s: Regulator disable failed %d\n", __func__, rc);
+			pr_err("%s: Regulator disable failed %d\n",
+						__func__, rc);
 			return rc;
 		}
 		regulator_put(fs_ijpeg);
@@ -1008,11 +1010,11 @@
 		return rc;
 	fs_ijpeg = regulator_get(NULL, "fs_ijpeg");
 	if (IS_ERR(fs_ijpeg)) {
-		CDBG("%s: Regulator FS_IJPEG get failed %ld\n", __func__,
-			PTR_ERR(fs_ijpeg));
+		pr_err("%s: Regulator FS_IJPEG get failed %ld\n",
+			__func__, PTR_ERR(fs_ijpeg));
 		fs_ijpeg = NULL;
 	} else if (regulator_enable(fs_ijpeg)) {
-		CDBG("%s: Regulator FS_IJPEG enable failed\n", __func__);
+		pr_err("%s: Regulator FS_IJPEG enable failed\n", __func__);
 		regulator_put(fs_ijpeg);
 	}
 	CDBG("%s: exit %d\n", __func__, rc);
@@ -1040,11 +1042,11 @@
 	(void)clk_rate;
 	fs_vpe = regulator_get(NULL, "fs_vpe");
 	if (IS_ERR(fs_vpe)) {
-		CDBG("%s: Regulator FS_VPE get failed %ld\n", __func__,
+		pr_err("%s: Regulator FS_VPE get failed %ld\n", __func__,
 			PTR_ERR(fs_vpe));
 		fs_vpe = NULL;
 	} else if (regulator_enable(fs_vpe)) {
-		CDBG("%s: Regulator FS_VPE enable failed\n", __func__);
+		pr_err("%s: Regulator FS_VPE enable failed\n", __func__);
 		regulator_put(fs_vpe);
 	}