V4L/DVB (11481): gspca - m5602-mt9m111: More constant replacement

Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
index d1bb9dd..5dd90a6 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_mt9m111.h
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
@@ -193,7 +193,9 @@ static const unsigned char init_mt9m111[][4] =
        {SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},
        {SENSOR, MT9M111_SC_RESET, 0x00, 0x04},
        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
-       {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},
+       {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00,
+               MT9M111_TRISTATE_PIN_IN_STANDBY |
+               MT9M111_SOC_SOFT_STANDBY},
        {BRIDGE, M5602_XB_GPIO_EN_H, 0x06, 0x00},
        {BRIDGE, M5602_XB_GPIO_EN_L, 0x00, 0x00},
        {BRIDGE, M5602_XB_I2C_CLK_DIV, 0x0a, 0x00},
@@ -214,7 +216,9 @@ static const unsigned char init_mt9m111[][4] =
        {SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},
        {SENSOR, MT9M111_SC_RESET, 0x00, 0x04},
        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
-       {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},
+       {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00,
+               MT9M111_TRISTATE_PIN_IN_STANDBY |
+               MT9M111_SOC_SOFT_STANDBY},
        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
        {SENSOR, MT9M111_SC_RESET, 0x00, 0x05},
        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
@@ -230,8 +234,9 @@ static const unsigned char init_mt9m111[][4] =
        {SENSOR, MT9M111_SC_RESET, 0x00, 0x0c},
        {SENSOR, MT9M111_SC_RESET, 0x00, 0x04},
        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x01},
-       {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00, 0x03},
-
+       {SENSOR, MT9M111_CP_GLOBAL_CLK_CONTROL, 0x00,
+               MT9M111_TRISTATE_PIN_IN_STANDBY |
+               MT9M111_SOC_SOFT_STANDBY},
        {BRIDGE, M5602_XB_GPIO_DIR, 0x05, 0x00},
        {BRIDGE, M5602_XB_GPIO_DAT, 0x04, 0x00},
        {BRIDGE, M5602_XB_GPIO_EN_H, 0x3e, 0x00},
@@ -274,8 +279,8 @@ static const unsigned char init_mt9m111[][4] =
        {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x02},
        {SENSOR, MT9M111_CC_AUTO_EXPOSURE_PARAMETER_18, 0x00, 0x00},
        {SENSOR, MT9M111_CC_AWB_PARAMETER_7, 0xef, 0x03},
-       {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
 
+       {SENSOR, MT9M111_PAGE_MAP, 0x00, 0x00},
        {SENSOR, 0x33, 0x03, 0x49},
        {SENSOR, 0x34, 0xc0, 0x19},
        {SENSOR, 0x3f, 0x20, 0x20},