Merge "msm: camera: Rename EzTune config to Module config." into msm-3.0
diff --git a/drivers/media/video/msm/msm_vfe32.c b/drivers/media/video/msm/msm_vfe32.c
index faf8d6d..ea70ce5 100644
--- a/drivers/media/video/msm/msm_vfe32.c
+++ b/drivers/media/video/msm/msm_vfe32.c
@@ -199,7 +199,7 @@
V32_DEMOSAICV3_DBCC_OFF},
{VFE_CMD_DEMOSAICV3_DBPC_UPDATE},
{VFE_CMD_XBAR_CFG},
- {VFE_CMD_EZTUNE_CFG},
+ {VFE_CMD_MODULE_CFG, V32_MODULE_CFG_LEN, V32_MODULE_CFG_OFF},
{VFE_CMD_ZSL},
/*115*/ {VFE_CMD_LINEARIZATION_UPDATE, V32_LINEARIZATION_LEN1,
V32_LINEARIZATION_OFF1},
@@ -1807,7 +1807,7 @@
vfe32_sync_timer_start(cmdp);
break;
- case VFE_CMD_EZTUNE_CFG: {
+ case VFE_CMD_MODULE_CFG: {
cmdp = kmalloc(cmd->length, GFP_ATOMIC);
if (!cmdp) {
rc = -ENOMEM;
diff --git a/drivers/media/video/msm/msm_vfe32.h b/drivers/media/video/msm/msm_vfe32.h
index d3ed0e6..d763c2e 100644
--- a/drivers/media/video/msm/msm_vfe32.h
+++ b/drivers/media/video/msm/msm_vfe32.h
@@ -332,8 +332,8 @@
#define V32_DEMOSAICV3_ABF_OFF 0x000002A4
#define V32_DEMOSAICV3_ABF_LEN 180
-#define V32_EZTUNE_CFG_OFF 0x00000010
-#define V32_EZTUNE_CFG_LEN 4
+#define V32_MODULE_CFG_OFF 0x00000010
+#define V32_MODULE_CFG_LEN 4
#define V32_CLF_CFG_OFF 0x000006B0
#define V32_CLF_CFG_LEN 72
diff --git a/include/media/msm_isp.h b/include/media/msm_isp.h
index bd69d46..f6668ef 100644
--- a/include/media/msm_isp.h
+++ b/include/media/msm_isp.h
@@ -156,7 +156,7 @@
#define VFE_CMD_DEMOSAICV3_DBCC_UPDATE 110
#define VFE_CMD_DEMOSAICV3_DBPC_UPDATE 111
#define VFE_CMD_XBAR_CFG 112
-#define VFE_CMD_EZTUNE_CFG 113
+#define VFE_CMD_MODULE_CFG 113
#define VFE_CMD_ZSL 114
#define VFE_CMD_LINEARIZATION_UPDATE 115
#define VFE_CMD_DEMOSAICV3_ABF_UPDATE 116