media: ov5640: major driver cleanuptoradex_tk1_l4t_r21.5

Signed-off-by: Peter Gielda <pgielda@antmicro.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

1 files changed, 802 insertions, 1017 deletions

diff --git a/drivers/media/i2c/soc_camera/ov5640.c b/drivers/media/i2c/soc_camera/ov5640.c
index 0c0834c15610..acd532b8b7d3 100644
--- a/drivers/media/i2c/soc_camera/ov5640.c
+++ b/drivers/media/i2c/soc_camera/ov5640.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2013 NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017 Antmicro Ltd. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -30,1073 +31,853 @@ struct ov5640_reg {
 #define OV5640_TABLE_WAIT_MS 0
 #define OV5640_TABLE_END 1
 
+/* System and IO Pad Control [0x3000 ~ 0x3052] */
+#define OV5640_SYSTEM_RESET_00    0x3000  /* default 0x30 -> all 0x00 */
+#define OV5640_SYSTEM_RESET_01    0x3001  /* default 0x08 */
+#define OV5640_SYSTEM_RESET_02    0x3002  /* default 0x1c */
+#define OV5640_SYSTEM_RESET_03    0x3003  /* default 0x00 */
+#define OV5640_SYSTEM_CLK_EN_00   0x3004  /* default 0xcf -> all 0xff */
+#define OV5640_SYSTEM_CLK_EN_01   0x3005  /* default 0xf7 */
+#define OV5640_SYSTEM_CLK_EN_02   0x3006  /* default 0xe3 -> all 0xc3 */
+#define OV5640_SYSTEM_CLK_EN_03   0x3007  /* default 0xff */
+#define OV5640_SYSTEM_CTRL        0x3008  /* default 0x02 all -> (0x82, 0x42, 0x02) */
+#define OV5640_CHIP_ID_H          0x300a  /* default 0x56 */
+#define OV5640_CHIP_ID_L          0x300b  /* default 0x40 */
+#define OV5640_SYSTEM_MIPI_CTRL   0x300e  /* default 0x58 -> all 0x45 */
+#define OV5640_IO_CTRL_01         0x3017  /* default 0x00 */
+#define OV5640_IO_CTRL_02         0x3018  /* default 0x00 */
+#define OV5640_SYSTEM_CTRL_2D     0x302d  /* default ---- -> all 0x60 !! */
+#define OV5640_SYSTEM_CTRL_2E     0x302e  /* default ---- -> all 0x08 !! */
+#define OV5640_SC_PLL_CTRL0       0x3034  /* default 0x1a -> all 0x18 MIPI_MODE */
+#define OV5640_SC_PLL_CTRL1       0x3035  /* default 0x11 -> 0x11 0x11 0x21 0x14 */
+#define OV5640_SC_PLL_CTRL2       0x3036  /* default 0x69 -> 0x7d 0x54 0x70 0x70 */
+#define OV5640_SC_PLL_CTRL3       0x3037  /* default 0x03 -> all 0x13 */
+#define OV5640_SC_PLL_CTRL5       0x3039  /* not use */
+
+#define SYSTEM_CTRL_SRST    0x80      /* Bit[7]: Software reset */
+#define SYSTEM_CTRL_PDOWN   0x40      /* Bit[6]: Software power down */
+#define MIPI_MODE_8BIT      0x08      /* Bit[3:0]: MIPI bit mode - 8-bit mode */
+#define MIPI_MODE_10BIT     0x0a      /* Bit[3:0]: MIPI bit mode - 10-bit mode */
+
+/* SCCB Control [0x3100 ~ 0x3108] */
+#define OV5640_SCCB_SYSTEM_CTRL   0x3103  /* default 0x00 -> all 0x03 */
+#define OV5640_SCCB_SCLK          0x3108  /* default 0x16 -> all 0x01 */
+
+/* VCM Control [0x3600 ~ 0x3606] */
+#define OV5640_VCM_DEBUG_MODE_0   0x3600  /* default ---- -> all 0x08 */
+#define OV5640_VCM_DEBUG_MODE_1   0x3601  /* default ---- -> all 0x33 */
+
+/* Timing Control [0x3800 ~ 0x3821] */
+#define OV5640_TIMING_HS_H        0x3800  /* default 0x00 -> 0x00 0x01 0x00 0x00 X_ADDR_ST */
+#define OV5640_TIMING_HS_L        0x3801  /* default 0x00 -> 0x00 0x50 0x00 0x00 */
+#define OV5640_TIMING_VS_H        0x3802  /* default 0x00 -> 0x00 0x01 0x00 0x00 Y_ADDR_ST */
+#define OV5640_TIMING_VS_L        0x3803  /* default 0x00 -> 0x00 0xaa 0x00 0x04 */
+#define OV5640_TIMING_HW_H        0x3804  /* default 0x0a -> 0x0a 0x08 0x0a 0x0a X_ADDR_END */
+#define OV5640_TIMING_HW_L        0x3805  /* default 0x3f -> 0x3f 0xef 0x3f 0x3f 2623 */
+#define OV5640_TIMING_VH_H        0x3806  /* default 0x07 -> 0x07 0x05 0x07 0x07 Y_ADDR_END */
+#define OV5640_TIMING_VH_L        0x3807  /* default 0x9f -> 0x9f 0xf9 0x9f 0x9b */
+#define OV5640_TIMING_DVPHO_H     0x3808  /* default 0x0a -> 0x0a 0x07 0x05 0x02  width[11:8]  */
+#define OV5640_TIMING_DVPHO_L     0x3809  /* default 0x20 -> 0x30 0x90 0x18 0x80  width[7:0]   */
+#define OV5640_TIMING_DVPVO_H     0x380a  /* default 0x07 -> 0x07 0x04 0x03 0x01  height[11:8] */
+#define OV5640_TIMING_DVPVO_L     0x380b  /* default 0x98 -> 0x9c 0x48 0xcc 0xe0  height[7:0]  */
+#define OV5640_TIMING_HTS_H       0x380c  /* default 0x0b -> 0x0b 0x09 0x07 0x07 */
+#define OV5640_TIMING_HTS_L       0x380d  /* default 0x1c -> 0x1c 0xc4 0x5e 0x68 */
+#define OV5640_TIMING_VTS_H       0x380e  /* default 0x07 -> 0x07 0x04 0x03 0x03 */
+#define OV5640_TIMING_VTS_L       0x380f  /* default 0xb0 -> 0xb0 0x60 0xde 0xd8 */
+#define OV5640_TIMING_HOFFSET_H   0x3810  /* default 0x00 */
+#define OV5640_TIMING_HOFFSET_L   0x3811  /* default 0x10 -> 0x08 0x08 0x06 0x10 */
+#define OV5640_TIMING_VOFFSET_H   0x3812  /* default 0x00 */
+#define OV5640_TIMING_VOFFSET_L   0x3813  /* default 0x04 -> 0x02 0x04 0x02 0x06 */
+#define OV5640_TIMING_X_INC       0x3814  /* default 0x11 -> 0x11 0x11 0x31 0x31 */
+#define OV5640_TIMING_Y_INC       0x3815  /* default 0x11 -> 0x11 0x11 0x31 0x31 */
+#define OV5640_TIMING_REG20       0x3820  /* default 0x40 */
+#define OV5640_TIMING_REG21       0x3821  /* default 0x00 -> 0x06 0x06 0x07 0x07 */
+#define REG20_SENSOR_VFLIP     0x02
+#define REG20_SENSOR_ISP_FLIP  0x04
+#define REG21_BINNING_EN       0x01
+#define REG21_SENSOR_MIRROR    0x02
+#define REG21_ISP_MIRROR       0x04
+
+#define OV5640_ADDR_H(x)       ((x >> 8 ) & 0x0f)
+#define OV5640_ADDR_L(x)       (x & 0xff)
+#define OV5640_WIDTH_H(x)      ((x >> 8 ) & 0x0f)
+#define OV5640_WIDTH_L(x)      (x & 0xff)
+#define OV5640_HEIGHT_H(x)     ((x >> 8 ) & 0x0f)
+#define OV5640_HEIGHT_L(x)     (x & 0xff)
+#define OV5640_HTS_H(x)        ((x >> 8 ) & 0x1f)
+#define OV5640_HTS_L(x)        (x & 0xff)
+#define OV5640_VTS_H(x)        ((x >> 8 ) & 0xff)
+#define OV5640_VTS_L(x)        (x & 0xff)
+#define OV5640_H_OFFSET_H(x)   ((x >> 8 ) & 0x0F)
+#define OV5640_H_OFFSET_L(x)   (x & 0xff)
+#define OV5640_V_OFFSET_H(x)   ((x >> 8 ) & 0x03)
+#define OV5640_V_OFFSET_L(x)   (x & 0xff)
+
+/* AEC/AGC power down domain control [0x3A00 ~ 0x3A25] */
+#define OV5640_AEC_CTRL_0F        0x3a0f  /* default 0x78 -> all 0x30 */
+#define OV5640_AEC_CTRL_10        0x3a10  /* default 0x68 -> all 0x28 */
+#define OV5640_AEC_CTRL_11        0x3a11  /* default 0xd0 -> all 0x60 */
+#define OV5640_AEC_CTRL_1B        0x3a1b  /* default 0x78 -> all 0x30 */
+#define OV5640_AEC_CTRL_1E        0x3a1e  /* default 0x68 -> all 0x26 */
+#define OV5640_AEC_CTRL_1F        0x3a1f  /* default 0x40 -> all 0x14 */
+#define OV5640_AEC_MAX_EXPO60_H   0x3a02  /* default 0x3d -> 0x07 0x04 0x03 0x03 */
+#define OV5640_AEC_MAX_EXPO60_L   0x3a03  /* default 0x80 -> 0xb6 0x60 0xd8 0xd8 */
+#define OV5640_AEC_B50_STEP_H     0x3a08  /* default 0x01 */
+#define OV5640_AEC_B50_STEP_L     0x3a09  /* default 0x27 -> 0x27 0x50 0x27 0x27 */
+#define OV5640_AEC_B60_STEP_H     0x3a0a  /* default 0x00 -> 0x00 0x01 0x00 0x00 */
+#define OV5640_AEC_B60_STEP_L     0x3a0b  /* default 0xf6 -> 0xf6 0x18 0xf6 0xf6 */
+#define OV5640_AEC_CTRL_0D        0x3a0d  /* default 0x08 -> 0x06 0x03 0x03 0x03 */
+#define OV5640_AEC_CTRL_0E        0x3a0e  /* default 0x06 -> 0x06 0x04 0x04 0x04 */
+#define OV5640_AEC_CTRL_13        0x3a13  /* default 0x40 -> all 0x43 */
+#define OV5640_AEC_MAX_EXPO_H     0x3a14  /* default 0x0e -> 0x07 0x04 0x03 0x03 */
+#define OV5640_AEC_MAX_EXPO_L     0x3a15  /* default 0x40 -> 0xb0 0xd0 0xd8 0xd8 */
+#define OV5640_AEC_GAIN_CEILING_0 0x3a18  /* default 0x03 -> all 0x00 */
+#define OV5640_AEC_GAIN_CEILING_1 0x3a19  /* default 0xE0 -> all 0xf8 */
+
+/* 50/60Hz detector control [0x3C00 ~ 0x3C1E] */
+#define OV5640_5060_CTRL_01       0x3c01  /* default 0x00 -> all 0x34 */
+#define OV5640_5060_CTRL_04       0x3c04  /* default 0x20 -> all 0x28 */
+#define OV5640_5060_CTRL_05       0x3c05  /* default 0x70 -> all 0x98 */
+
+#define OV5640_5060_THRESHOLD_1_H 0x3c06  /* default 0x00 -> all 0x00 */
+#define OV5640_5060_THRESHOLD_1_L 0x3c07  /* default 0x00 -> all 0x07 0x07 0x07 0x07 0x08 */
+#define OV5640_5060_THRESHOLD_2_H 0x3c08  /* default 0x01 -> all 0x00 */
+#define OV5640_5060_THRESHOLD_2_L 0x3c09  /* default 0x2c -> all 0x1c */
+#define OV5640_5060_SAMPLE_NUM_H  0x3c0a  /* default 0x4e -> all 0x9c */
+#define OV5640_5060_SAMPLE_NUM_L  0x3c0b  /* default 0x1f -> all 0x40 */
+
+/* BLC Control [0x4000 ~ 0x4033] */
+#define OV5640_BLC_CTRL_01        0x4001  /* default 0x00 -> 0x02 */
+#define OV5640_BLC_CTRL_04        0x4004  /* default 0x08 -> 0x06 0x06 0x02 0x02 */
+
+/* MIPI control [0x4800 ~ 0x4837] */
+#define OV5640_MIPI_CTRL_00       0x4800  /* default 0x04 */
+#define OV5640_MIPI_CTRL_01       0x4801  /* not use */
+#define OV5640_MIPI_CTRL_05       0x4805  /* not use */
+#define OV5640_MIPI_PCLK_PERIOD   0x4837  /* default 0x10 -> 0x0a 0x0a 0x10 0x44 */
+
+/* Format Control [0x4300 ~ 0x430D] */
+#define FMT_CTRL_00               0x4300  /* default 0xF8 -> all 0x32 */
+
+/* Format Control */
+#define FMT_YUV422	 0x30
+/* Output sequence */
+#define OFMT_YUYV        0x00
+#define OFMT_YVYU        0x01
+#define OFMT_UYVY        0x02
+#define OFMT_VYUY        0x03
+
+/* ISP Control [0x5000 ~ 0x5063] */
+#define OV5640_ISP_CTRL_00        0x5000  /* default 0x06 -> all 0xa7 */
+#define OV5640_ISP_CTRL_01        0x5001  /* default 0x01 -> 0x83 0x83 0x83 0xa3 */
+#define OV5640_ISP_MUX_CTRL       0x501F  /* default 0x00 -> all 0x00 (000: ISP YUV422) */
+#define OV5640_ISP_DEBUG_25       0x5025  /* default ---- -> all 0x00 */
+#define OV5640_ISP_TEST           0x503D  /* default 0x00 */
+#define OV5640_ISP_DEBUG_3E       0x503E  /* default ---- */
+#define OV5640_ISP_DEBUG_46       0x5046  /* default ---- */
+
+#define ISP_SCALE_DIGITAL     0x80       /* Special digital effect */
+#define ISP_SCALE_EN          0x20       /* Scale enable */
+#define ISP_AUTO_BALANCE_EN   0x01       /* Auto white balance enable */
+#define ISP_COLOR_MATRIX_EN   0x02       /* Color matrix enable */
+#define ISP_TEST_EN           0x80
+#define ISP_TEST_00           0x00       /* 00: Standard eight color bar */
+#define ISP_TEST_01           0x01       /* 01: Gradual change at vertical mode 1 */
+#define ISP_TEST_10           0x02       /* 10: Gradual change at horizontal */
+#define ISP_TEST_11           0x03       /* 11: Gradual change at vertical mode 2 */
+#define ISP_TEST_TRANSPARENT  0x20       /* Transparent */
+#define ISP_TEST_ROLLING      0x40       /* Rolling */
+
+/* AWB Control [0x5180 ~ 0x51D0] */
+#define OV5640_AWB_CTRL_00        0x5180  /* default 0xff */
+#define OV5640_AWB_CTRL_01        0x5181  /* default 0x58 -> all 0xf2 */
+#define OV5640_AWB_CTRL_02        0x5182  /* default 0x11 -> all 0x00 */
+#define OV5640_AWB_CTRL_03        0x5183  /* default 0x90 -> all 0x14 */
+#define OV5640_AWB_CTRL_04        0x5184  /* default 0x25 */
+#define OV5640_AWB_CTRL_05        0x5185  /* default 0x24 */
+#define OV5640_AWB_CTRL_06        0x5186  /* default ---- -> all 0x09 */
+#define OV5640_AWB_CTRL_07        0x5187  /* default ---- -> all 0x09 */
+#define OV5640_AWB_CTRL_08        0x5188  /* default ---- -> all 0x09 */
+#define OV5640_AWB_CTRL_09        0x5189  /* default ---- -> all 0x75 */
+#define OV5640_AWB_CTRL_10        0x518a  /* default ---- -> all 0x54 */
+#define OV5640_AWB_CTRL_11        0x518b  /* default ---- -> all 0xe0 */
+#define OV5640_AWB_CTRL_12        0x518c  /* default ---- -> all 0xb2 */
+#define OV5640_AWB_CTRL_13        0x518d  /* default ---- -> all 0x42 */
+#define OV5640_AWB_CTRL_14        0x518e  /* default ---- -> all 0x3d */
+#define OV5640_AWB_CTRL_15        0x518f  /* default ---- -> all 0x56 */
+#define OV5640_AWB_CTRL_16        0x5190  /* default ---- -> all 0x46 */
+#define OV5640_AWB_CTRL_17        0x5191  /* default 0xff -> all 0xf8 */
+#define OV5640_AWB_CTRL_18        0x5192  /* default 0x00 -> all 0x04 */
+#define OV5640_AWB_CTRL_19        0x5193  /* default 0xf0 -> all 0x70 */
+#define OV5640_AWB_CTRL_20        0x5194  /* default 0xf0 */
+#define OV5640_AWB_CTRL_21        0x5195  /* default 0xf0 */
+#define OV5640_AWB_CTRL_22        0x5196  /* default 0x03 */
+#define OV5640_AWB_CTRL_23        0x5197  /* default 0x02 -> all 0x01 */
+#define OV5640_AWB_CTRL_24        0x5198  /* default ---- -> all 0x04 */
+#define OV5640_AWB_CTRL_25        0x5199  /* default ---- -> all 0x12 */
+#define OV5640_AWB_CTRL_26        0x519a  /* default ---- -> all 0x04 */
+#define OV5640_AWB_CTRL_27        0x519b  /* default ---- -> all 0x00 */
+#define OV5640_AWB_CTRL_28        0x519c  /* default ---- -> all 0x06 */
+#define OV5640_AWB_CTRL_29        0x519d  /* default ---- -> all 0x82 */
+#define OV5640_AWB_CTRL_30        0x519e  /* default 0x02 -> all 0x38 */
+
+/* CIP Control [0x5300 ~ 0x530F] */
+#define OV5640_CIP_SH_MT_THRES_1  0x5300  /* default 0x08 */
+#define OV5640_CIP_SH_MT_THRES_2  0x5301  /* default 0x48 -> all 0x30 */
+#define OV5640_CIP_SH_MT_OFFSET_1 0x5302  /* default 0x18 -> all 0x10 */
+#define OV5640_CIP_SH_MT_OFFSET_2 0x5303  /* default 0x0e -> all 0x00 */
+#define OV5640_CIP_DNS_THRES_1    0x5304  /* default 0x08 */
+#define OV5640_CIP_DNS_THRES_2    0x5305  /* default 0x48 -> all 0x30 */
+#define OV5640_CIP_DNS_OFFSET_1   0x5306  /* default 0x09 -> all 0x08 */
+#define OV5640_CIP_DNS_OFFSET_2   0x5307  /* default 0x16 */
+#define OV5640_CIP_SH_TH_THRES_1  0x5309  /* default 0x08 */
+#define OV5640_CIP_SH_TH_THRES_2  0x530a  /* default 0x48 -> all 0x30 */
+#define OV5640_CIP_SH_TH_OFFSET_1 0x530b  /* default 0x04 */
+#define OV5640_CIP_SH_TH_OFFSET_2 0x530c  /* default 0x06 */
+
+/* CMX Control [0x5380 ~ 0x538B] */
+#define OV5640_CMX1               0x5381  /* default 0x20 -> all 0x1e */
+#define OV5640_CMX2               0x5382  /* default 0x64 -> all 0x5b */
+#define OV5640_CMX3               0x5383  /* default 0x08 */
+#define OV5640_CMX4               0x5384  /* default 0x30 -> all 0x0a */
+#define OV5640_CMX5               0x5385  /* default 0x80 -> all 0x7e */
+#define OV5640_CMX6               0x5386  /* default 0xc0 -> all 0x88 */
+#define OV5640_CMX7               0x5387  /* default 0xa0 -> all 0x7c */
+#define OV5640_CMX8               0x5388  /* default 0x98 -> all 0x6c */
+#define OV5640_CMX9               0x5389  /* default 0x08 -> all 0x10 */
+#define OV5640_CMX_SIGN_0         0x538A  /* default 0x01 */
+#define OV5640_CMX_SIGN_1         0x538B  /* default 0x98 */
+
+/* Gamma Control [0x5480 ~ 0x5490] */
+#define OV5640_GAMMA_CTRL_00      0x5480  /* default 0x00 -> all 0x01 */
+#define OV5640_GAMMA_YST_00       0x5481  /* default 0x26 -> all 0x08 */
+#define OV5640_GAMMA_YST_01       0x5482  /* default 0x35 -> all 0x14 */
+
+#define OV5640_GAMMA_YST_02       0x5483  /* default 0x48 -> all 0x28 */
+#define OV5640_GAMMA_YST_03       0x5484  /* default 0x57 -> all 0x51 */
+#define OV5640_GAMMA_YST_04       0x5485  /* default 0x63 -> all 0x65 */
+#define OV5640_GAMMA_YST_05       0x5486  /* default 0x6e -> all 0x71 */
+
+#define OV5640_GAMMA_YST_06       0x5487  /* default 0x77 -> all 0x7d */
+#define OV5640_GAMMA_YST_07       0x5488  /* default 0x80 -> all 0x87 */
+#define OV5640_GAMMA_YST_08       0x5489  /* default 0x88 -> all 0x91 */
+#define OV5640_GAMMA_YST_09       0x548a  /* default 0x96 -> all 0x9a */
+#define OV5640_GAMMA_YST_0A       0x548b  /* default 0xa3 -> all 0xaa */
+#define OV5640_GAMMA_YST_0B       0x548c  /* default 0xaf -> all 0xb8 */
+#define OV5640_GAMMA_YST_0C       0x548d  /* default 0xc5 -> all 0xcd */
+#define OV5640_GAMMA_YST_0D       0x548e  /* default 0xd7 -> all 0xdd */
+#define OV5640_GAMMA_YST_0E       0x548f  /* default 0xe8 -> all 0xea */
+#define OV5640_GAMMA_YST_0F       0x5490  /* default 0x0f -> all 0x1d */
+
+/* SDE Control [0x5580 ~ 0x558C] */
+#define OV5640_SDE_CTRL_0         0x5580  /* default 0x00 -> all 0x02 */
+#define OV5640_SDE_CTRL_3         0x5583  /* default 0x40 */
+#define OV5640_SDE_CTRL_4         0x5584  /* default 0x40 -> all 0x10 */
+#define OV5640_SDE_CTRL_9         0x5589  /* default 0x01 -> all 0x10 */
+#define OV5640_SDE_CTRL_10        0x558a  /* default 0x01 -> all 0x00 */
+#define OV5640_SDE_CTRL_11        0x558b  /* default 0xff -> all 0xf8 */
+
+/* LENC Control [0x5800 ~ 0x5849] */
+#define OV5640_LENC_GMTRX_00      0x5800  /* default 0x10 -> all 0x23 */
+#define OV5640_LENC_GMTRX_01      0x5801  /* default 0x10 -> all 0x14 */
+#define OV5640_LENC_GMTRX_02      0x5802  /* default 0x10 -> all 0x0f */
+#define OV5640_LENC_GMTRX_03      0x5803  /* default 0x10 -> all 0x0f */
+#define OV5640_LENC_GMTRX_04      0x5804  /* default 0x10 -> all 0x12 */
+#define OV5640_LENC_GMTRX_05      0x5805  /* default 0x10 -> all 0x26 */
+#define OV5640_LENC_GMTRX_10      0x5806  /* default 0x10 -> all 0x0c */
+#define OV5640_LENC_GMTRX_11      0x5807  /* default 0x08 */
+#define OV5640_LENC_GMTRX_12      0x5808  /* default 0x08 -> all 0x05 */
+#define OV5640_LENC_GMTRX_13      0x5809  /* default 0x08 -> all 0x05 */
+#define OV5640_LENC_GMTRX_14      0x580a  /* default 0x08 -> all */
+#define OV5640_LENC_GMTRX_15      0x580b  /* default 0x10 -> all 0x0d */
+#define OV5640_LENC_GMTRX_20      0x580c  /* default 0x10 -> all 0x08 */
+#define OV5640_LENC_GMTRX_21      0x580d  /* default 0x08 -> all 0x03 */
+#define OV5640_LENC_GMTRX_22      0x580e  /* default 0x00 */
+#define OV5640_LENC_GMTRX_23      0x580f  /* default 0x00 */
+#define OV5640_LENC_GMTRX_24      0x5810  /* default 0x08 -> all 0x03 */
+#define OV5640_LENC_GMTRX_25      0x5811  /* default 0x10 -> all 0x09 */
+#define OV5640_LENC_GMTRX_30      0x5812  /* default 0x10 -> all 0x07 */
+#define OV5640_LENC_GMTRX_31      0x5813  /* default 0x08 -> all 0x03 */
+#define OV5640_LENC_GMTRX_32      0x5814  /* default 0x00 */
+#define OV5640_LENC_GMTRX_33      0x5815  /* default 0x00 -> all 0x01 */
+#define OV5640_LENC_GMTRX_34      0x5816  /* default 0x08 -> all 0x03 */
+#define OV5640_LENC_GMTRX_35      0x5817  /* default 0x10 -> all 0x08 */
+#define OV5640_LENC_GMTRX_40      0x5818  /* default 0x10 -> all 0x0d */
+#define OV5640_LENC_GMTRX_41      0x5819  /* default 0x08 */
+#define OV5640_LENC_GMTRX_42      0x581a  /* default 0x08 -> all 0x05 */
+#define OV5640_LENC_GMTRX_43      0x581b  /* default 0x08 -> all 0x06 */
+#define OV5640_LENC_GMTRX_44      0x581c  /* default 0x08 */
+#define OV5640_LENC_GMTRX_45      0x581d  /* default 0x10 -> all 0x0e */
+#define OV5640_LENC_GMTRX_50      0x581e  /* default 0x10 -> all 0x29 */
+#define OV5640_LENC_GMTRX_51      0x581f  /* default 0x10 -> all 0x17 */
+#define OV5640_LENC_GMTRX_52      0x5820  /* default 0x10 -> all 0x11 */
+#define OV5640_LENC_GMTRX_53      0x5821  /* default 0x10 -> all 0x11 */
+#define OV5640_LENC_GMTRX_54      0x5822  /* default 0x10 -> all 0x15 */
+#define OV5640_LENC_GMTRX_55      0x5823  /* default 0x10 -> all 0x28 */
+#define OV5640_LENC_BRMATRX_00    0x5824  /* default 0xaa -> all 0x46 */
+#define OV5640_LENC_BRMATRX_01    0x5825  /* default 0xaa -> all 0x26 */
+#define OV5640_LENC_BRMATRX_02    0x5826  /* default 0xaa -> all 0x08 */
+#define OV5640_LENC_BRMATRX_03    0x5827  /* default 0xaa -> all 0x26 */
+#define OV5640_LENC_BRMATRX_04    0x5828  /* default 0xaa -> all 0x64 */
+#define OV5640_LENC_BRMATRX_05    0x5829  /* default 0xaa -> all 0x26 */
+#define OV5640_LENC_BRMATRX_06    0x582a  /* default 0x99 -> all 0x24 */
+#define OV5640_LENC_BRMATRX_07    0x582b  /* default 0x99 -> all 0x22 */
+#define OV5640_LENC_BRMATRX_08    0x582c  /* default 0x99 -> all 0x24 */
+#define OV5640_LENC_BRMATRX_09    0x582d  /* default 0xaa -> all 0x24 */
+#define OV5640_LENC_BRMATRX_20    0x582e  /* default 0xaa -> all 0x06 */
+#define OV5640_LENC_BRMATRX_21    0x582f  /* default 0x99 -> all 0x22 */
+#define OV5640_LENC_BRMATRX_22    0x5830  /* default 0x88 -> all 0x40 */
+#define OV5640_LENC_BRMATRX_23    0x5831  /* default 0x99 -> all 0x42 */
+#define OV5640_LENC_BRMATRX_24    0x5832  /* default 0xaa -> all 0x24 */
+#define OV5640_LENC_BRMATRX_30    0x5833  /* default 0xaa -> all 0x26 */
+#define OV5640_LENC_BRMATRX_31    0x5834  /* default 0x99 -> all 0x24 */
+#define OV5640_LENC_BRMATRX_32    0x5835  /* default 0x99 -> all 0x22 */
+#define OV5640_LENC_BRMATRX_33    0x5836  /* default 0x99 -> all 0x22 */
+#define OV5640_LENC_BRMATRX_34    0x5837  /* default 0xaa -> all 0x26 */
+#define OV5640_LENC_BRMATRX_40    0x5838  /* default 0xaa -> all 0x44 */
+#define OV5640_LENC_BRMATRX_41    0x5839  /* default 0xaa -> all 0x24 */
+#define OV5640_LENC_BRMATRX_42    0x583a  /* default 0xaa -> all 0x26 */
+#define OV5640_LENC_BRMATRX_43    0x583b  /* default 0xaa -> all 0x28 */
+#define OV5640_LENC_BRMATRX_44    0x583c  /* default 0xaa -> all 0x42 */
+#define OV5640_LENC_BR_OFFSET     0x583d  /* default 0x88 -> all 0xce */
+
+
 static struct ov5640_reg mode_2592x1944[] = {
 	/* PLL Control MIPI bit rate/lane = 672MHz, 16-bit mode.
-	 * Output size: 2608x1948 (0, 0) - (2623, 1951),
+	 * Output size: 2592x1944 (0, 0) - (2623, 1951),
 	 * Line Length = 2844, Frame Length = 1968
+         * Scaling method: full resolution (dummy 16 pixel
+         * horizontal, 8 lines) 2608x1952 with dummy
 	 */
-	{0x3103, 0x11},
-	{0x3008, 0x82},
-	{OV5640_TABLE_WAIT_MS, 5},
-	{0x3008, 0x42},
-	{0x3103, 0x03},
-	{0x3017, 0x00},
-	{0x3018, 0x00},
-	{0x3034, 0x18},
-	{0x3035, 0x11},
-	{0x3036, 0x7d},
-	{0x3037, 0x13},
-	{0x3108, 0x01},
-	{0x3630, 0x36},
-	{0x3631, 0x0e},
-	{0x3632, 0xe2},
-	{0x3633, 0x12},
-	{0x3621, 0xe0},
-	{0x3704, 0xa0},
-	{0x3703, 0x5a},
-	{0x3715, 0x78},
-	{0x3717, 0x01},
-	{0x370b, 0x60},
-	{0x3705, 0x1a},
-	{0x3905, 0x02},
-	{0x3906, 0x10},
-	{0x3901, 0x0a},
-	{0x3731, 0x12},
-	{0x3600, 0x08},
-	{0x3601, 0x33},
-	{0x302d, 0x60},
-	{0x3620, 0x52},
-	{0x371b, 0x20},
-	{0x471c, 0x50},
-	{0x3a13, 0x43},
-	{0x3a18, 0x00},
-	{0x3a19, 0xf8},
-	{0x3635, 0x13},
-	{0x3636, 0x03},
-	{0x3634, 0x40},
-	{0x3622, 0x01},
-	{0x3c01, 0x34},
-	{0x3c04, 0x28},
-	{0x3c05, 0x98},
-	{0x3c06, 0x00},
-	{0x3c07, 0x07},
-	{0x3c08, 0x00},
-	{0x3c09, 0x1c},
-	{0x3c0a, 0x9c},
-	{0x3c0b, 0x40},
-	{0x3820, 0x40},
-	{0x3821, 0x06},
-	{0x3814, 0x11},
-	{0x3815, 0x11},
-	{0x3800, 0x00},
-	{0x3801, 0x00},
-	{0x3802, 0x00},
-	{0x3803, 0x00},
-	{0x3804, 0x0a},
-	{0x3805, 0x3f},
-	{0x3806, 0x07},
-	{0x3807, 0x9f},
-	{0x3808, 0x0a},
-	{0x3809, 0x30},
-	{0x380a, 0x07},
-	{0x380b, 0x9c},
-	{0x380c, 0x0b},
-	{0x380d, 0x1c},
-	{0x380e, 0x07},
-	{0x380f, 0xb0},
-	{0x3810, 0x00},
-	{0x3811, 0x08},
-	{0x3812, 0x00},
-	{0x3813, 0x02},
-	{0x3618, 0x04},
+
+	{OV5640_SC_PLL_CTRL0, 0x10 | MIPI_MODE_8BIT },
+	{OV5640_SC_PLL_CTRL1, 0x11},
+	{OV5640_SC_PLL_CTRL2, 0x7d},            /* default 0x69  PLL multipier */
+	{OV5640_SC_PLL_CTRL3, 0x03 | (1<<4) },  /* default 0x03  PLL divided by 2 */
+
+	{OV5640_MIPI_CTRL_00, 0x04},
+	{OV5640_MIPI_PCLK_PERIOD, 0x0a},
+
+	{OV5640_ISP_CTRL_00, 0xa7},
+	{OV5640_ISP_CTRL_01, 0x83},
+	{OV5640_ISP_MUX_CTRL, 0x00},
+
+        /* Timing Control */
+	{OV5640_TIMING_HS_H, OV5640_ADDR_H(0) },
+	{OV5640_TIMING_HS_L, OV5640_ADDR_L(0) },
+	{OV5640_TIMING_VS_H, OV5640_ADDR_H(0) },
+	{OV5640_TIMING_VS_L, OV5640_ADDR_L(0) },
+	{OV5640_TIMING_HW_H, OV5640_ADDR_H(2623) },
+	{OV5640_TIMING_HW_L, OV5640_ADDR_L(2623) },
+	{OV5640_TIMING_VH_H, OV5640_ADDR_H(1951) },
+	{OV5640_TIMING_VH_L, OV5640_ADDR_L(1951) },
+	{OV5640_TIMING_DVPHO_H, OV5640_WIDTH_H(2592) },
+	{OV5640_TIMING_DVPHO_L, OV5640_WIDTH_L(2592) },
+	{OV5640_TIMING_DVPVO_H, OV5640_HEIGHT_H(1944) },
+	{OV5640_TIMING_DVPVO_L, OV5640_HEIGHT_L(1944) },
+	{OV5640_TIMING_HTS_H, OV5640_HTS_H(2844) },
+	{OV5640_TIMING_HTS_L, OV5640_HTS_L(2844) },
+	{OV5640_TIMING_VTS_H, OV5640_VTS_H(1968) },
+	{OV5640_TIMING_VTS_L, OV5640_VTS_L(1968) },
+	{OV5640_TIMING_HOFFSET_H, OV5640_H_OFFSET_H(16) }, // (2623-2592-1)/2
+	{OV5640_TIMING_HOFFSET_L, OV5640_H_OFFSET_L(16) },
+	{OV5640_TIMING_VOFFSET_H, OV5640_V_OFFSET_H(4) },  // (1951-1944-1)/2
+	{OV5640_TIMING_VOFFSET_L, OV5640_V_OFFSET_L(4) },
+	{OV5640_TIMING_X_INC, 0x11},
+	{OV5640_TIMING_Y_INC, 0x11},
+	{OV5640_TIMING_REG20, 0x40},
+	{OV5640_TIMING_REG21, 0},
+
+        /* magic registers */
 	{0x3612, 0x2b},
+	{0x3618, 0x04},
 	{0x3708, 0x64},
 	{0x3709, 0x12},
 	{0x370c, 0x00},
-	{0x3a02, 0x07},
-	{0x3a03, 0xb0},
-	{0x3a08, 0x01},
-	{0x3a09, 0x27},
-	{0x3a0a, 0x00},
-	{0x3a0b, 0xf6},
-	{0x3a0e, 0x06},
-	{0x3a0d, 0x08},
-	{0x3a14, 0x07},
-	{0x3a15, 0xb0},
-	{0x4001, 0x02},
-	{0x4004, 0x06},
-	{0x3000, 0x00},
-	{0x3002, 0x1c},
-	{0x3004, 0xff},
-	{0x3006, 0xc3},
-	{0x300e, 0x45},
-	{0x302e, 0x08},
-	{0x4300, 0x32},
-	{0x4800, 0x4},
-	{0x4837, 0x0a},
-	{0x501f, 0x00},
-	{0x440e, 0x00},
-	{0x5000, 0xa7},
-	{0x5001, 0x83},
-	{0x5180, 0xff},
-	{0x5181, 0xf2},
-	{0x5182, 0x00},
-	{0x5183, 0x14},
-	{0x5184, 0x25},
-	{0x5185, 0x24},
-	{0x5186, 0x09},
-	{0x5187, 0x09},
-	{0x5188, 0x09},
-	{0x5189, 0x75},
-	{0x518a, 0x54},
-	{0x518b, 0xe0},
-	{0x518c, 0xb2},
-	{0x518d, 0x42},
-	{0x518e, 0x3d},
-	{0x518f, 0x56},
-	{0x5190, 0x46},
-	{0x5191, 0xf8},
-	{0x5192, 0x04},
-	{0x5193, 0x70},
-	{0x5194, 0xf0},
-	{0x5195, 0xf0},
-	{0x5196, 0x03},
-	{0x5197, 0x01},
-	{0x5198, 0x04},
-	{0x5199, 0x12},
-	{0x519a, 0x04},
-	{0x519b, 0x00},
-	{0x519c, 0x06},
-	{0x519d, 0x82},
-	{0x519e, 0x38},
-	{0x5381, 0x1e},
-	{0x5382, 0x5b},
-	{0x5383, 0x08},
-	{0x5384, 0x0a},
-	{0x5385, 0x7e},
-	{0x5386, 0x88},
-	{0x5387, 0x7c},
-	{0x5388, 0x6c},
-	{0x5389, 0x10},
-	{0x538a, 0x01},
-	{0x538b, 0x98},
-	{0x5300, 0x08},
-	{0x5301, 0x30},
-	{0x5302, 0x10},
-	{0x5303, 0x00},
-	{0x5304, 0x08},
-	{0x5305, 0x30},
-	{0x5306, 0x08},
-	{0x5307, 0x16},
-	{0x5309, 0x08},
-	{0x530a, 0x30},
-	{0x530b, 0x04},
-	{0x530c, 0x06},
-	{0x5480, 0x01},
-	{0x5481, 0x08},
-	{0x5482, 0x14},
-	{0x5483, 0x28},
-	{0x5484, 0x51},
-	{0x5485, 0x65},
-	{0x5486, 0x71},
-	{0x5487, 0x7d},
-	{0x5488, 0x87},
-	{0x5489, 0x91},
-	{0x548a, 0x9a},
-	{0x548b, 0xaa},
-	{0x548c, 0xb8},
-	{0x548d, 0xcd},
-	{0x548e, 0xdd},
-	{0x548f, 0xea},
-	{0x5490, 0x1d},
-	{0x5580, 0x02},
-	{0x5583, 0x40},
-	{0x5584, 0x10},
-	{0x5589, 0x10},
-	{0x558a, 0x00},
-	{0x558b, 0xf8},
-	{0x5800, 0x23},
-	{0x5801, 0x14},
-	{0x5802, 0x0f},
-	{0x5803, 0x0f},
-	{0x5804, 0x12},
-	{0x5805, 0x26},
-	{0x5806, 0x0c},
-	{0x5807, 0x08},
-	{0x5808, 0x05},
-	{0x5809, 0x05},
-	{0x580a, 0x08},
-	{0x580b, 0x0d},
-	{0x580c, 0x08},
-	{0x580d, 0x03},
-	{0x580e, 0x00},
-	{0x580f, 0x00},
-	{0x5810, 0x03},
-	{0x5811, 0x09},
-	{0x5812, 0x07},
-	{0x5813, 0x03},
-	{0x5814, 0x00},
-	{0x5815, 0x01},
-	{0x5816, 0x03},
-	{0x5817, 0x08},
-	{0x5818, 0x0d},
-	{0x5819, 0x08},
-	{0x581a, 0x05},
-	{0x581b, 0x06},
-	{0x581c, 0x08},
-	{0x581d, 0x0e},
-	{0x581e, 0x29},
-	{0x581f, 0x17},
-	{0x5820, 0x11},
-	{0x5821, 0x11},
-	{0x5822, 0x15},
-	{0x5823, 0x28},
-	{0x5824, 0x46},
-	{0x5825, 0x26},
-	{0x5826, 0x08},
-	{0x5827, 0x26},
-	{0x5828, 0x64},
-	{0x5829, 0x26},
-	{0x582a, 0x24},
-	{0x582b, 0x22},
-	{0x582c, 0x24},
-	{0x582d, 0x24},
-	{0x582e, 0x06},
-	{0x582f, 0x22},
-	{0x5830, 0x40},
-	{0x5831, 0x42},
-	{0x5832, 0x24},
-	{0x5833, 0x26},
-	{0x5834, 0x24},
-	{0x5835, 0x22},
-	{0x5836, 0x22},
-	{0x5837, 0x26},
-	{0x5838, 0x44},
-	{0x5839, 0x24},
-	{0x583a, 0x26},
-	{0x583b, 0x28},
-	{0x583c, 0x42},
-	{0x583d, 0xce},
-	{0x5025, 0x00},
-	{0x3a0f, 0x30},
-	{0x3a10, 0x28},
-	{0x3a1b, 0x30},
-	{0x3a1e, 0x26},
-	{0x3a11, 0x60},
-	{0x3a1f, 0x14},
-	{0x3008, 0x02},
+
+	/* AEC/AGC Power Down Domain Control */
+	{OV5640_AEC_MAX_EXPO60_H, 0x07},
+	{OV5640_AEC_MAX_EXPO60_L, 0xb0},
+	{OV5640_AEC_B50_STEP_H, 0x01},
+	{OV5640_AEC_B50_STEP_L, 0x27},
+	{OV5640_AEC_B60_STEP_H, 0x00},
+	{OV5640_AEC_B60_STEP_L, 0xf6},
+	{OV5640_AEC_CTRL_0E, 0x06},
+	{OV5640_AEC_CTRL_0D, 0x08},
+	{OV5640_AEC_MAX_EXPO_H, 0x07},
+	{OV5640_AEC_MAX_EXPO_L, 0xb0},
+	{OV5640_AEC_CTRL_13, 0x43},
+	{OV5640_AEC_GAIN_CEILING_0, 0x00},
+	{OV5640_AEC_GAIN_CEILING_1, 0xf8},
+	{OV5640_AEC_CTRL_0F, 0x30},
+	{OV5640_AEC_CTRL_10, 0x28},
+	{OV5640_AEC_CTRL_1B, 0x30},
+	{OV5640_AEC_CTRL_1E, 0x26},
+	{OV5640_AEC_CTRL_11, 0x60},
+	{OV5640_AEC_CTRL_1F, 0x14},
+
+	{OV5640_SYSTEM_CTRL, 0x02},
 	{OV5640_TABLE_END, 0x0000}
 };
 
 static struct ov5640_reg mode_1920x1080[] = {
 	/* PLL Control MIPI bit rate/lane = 672MHz, 16-bit mode.
-	 * Output size: 1936x1096 (336, 426) - (2287, 1529),
+	 * Output size: 1936x1088 (336, 426) - (2287, 1529),
 	 * Line Length = 2500, Frame Length = 1120.
+         * Scaling method: cropping from full resolution
+         * 1936x1088 with dummy pixels
 	 */
-	{0x3103, 0x11},
-	{0x3008, 0x82},
-	{OV5640_TABLE_WAIT_MS, 5},
-	{0x3008, 0x42},
-	{0x3103, 0x03},
-	{0x3017, 0x00},
-	{0x3018, 0x00},
-	{0x3034, 0x18},
-	{0x3035, 0x11},
-	{0x3036, 0x54},
-	{0x3037, 0x13},
-	{0x3108, 0x01},
-	{0x3630, 0x36},
-	{0x3631, 0x0e},
-	{0x3632, 0xe2},
-	{0x3633, 0x12},
-	{0x3621, 0xe0},
-	{0x3704, 0xa0},
-	{0x3703, 0x5a},
-	{0x3715, 0x78},
-	{0x3717, 0x01},
-	{0x370b, 0x60},
-	{0x3705, 0x1a},
-	{0x3905, 0x02},
-	{0x3906, 0x10},
-	{0x3901, 0x0a},
-	{0x3731, 0x12},
-	{0x3600, 0x08},
-	{0x3601, 0x33},
-	{0x302d, 0x60},
-	{0x3620, 0x52},
-	{0x371b, 0x20},
-	{0x471c, 0x50},
-	{0x3a13, 0x43},
-	{0x3a18, 0x00},
-	{0x3a19, 0xf8},
-	{0x3635, 0x13},
-	{0x3636, 0x03},
-	{0x3634, 0x40},
-	{0x3622, 0x01},
-	{0x3c01, 0x34},
-	{0x3c04, 0x28},
-	{0x3c05, 0x98},
-	{0x3c06, 0x00},
-	{0x3c07, 0x07},
-	{0x3c08, 0x00},
-	{0x3c09, 0x1c},
-	{0x3c0a, 0x9c},
-	{0x3c0b, 0x40},
-	{0x3820, 0x40},
-	{0x3821, 0x06},
-	{0x3814, 0x11},
-	{0x3815, 0x11},
-	{0x3800, 0x01},
-	{0x3801, 0x50},
-	{0x3802, 0x01},
-	{0x3803, 0xaa},
-	{0x3804, 0x08},
-	{0x3805, 0xef},
-	{0x3806, 0x05},
-	{0x3807, 0xf9},
-	{0x3808, 0x07},
-	{0x3809, 0x90},
-	{0x380a, 0x04},
-	{0x380b, 0x48},
-	{0x380c, 0x09},
-	{0x380d, 0xc4},
-	{0x380e, 0x04},
-	{0x380f, 0x60},
-	{0x3810, 0x00},
-	{0x3811, 0x08},
-	{0x3812, 0x00},
-	{0x3813, 0x04},
-	{0x3618, 0x04},
+
+	{OV5640_SC_PLL_CTRL0, 0x10 | MIPI_MODE_8BIT },
+	{OV5640_SC_PLL_CTRL1, 0x11},
+	{OV5640_SC_PLL_CTRL2, 0x54},            /* default 0x69  PLL multipier */
+	{OV5640_SC_PLL_CTRL3, 0x03 | (1<<4) },  /* default 0x03  PLL divided by 2 */
+
+	{OV5640_MIPI_CTRL_00, 0x04},
+	{OV5640_MIPI_PCLK_PERIOD, 0x0a},
+
+	{OV5640_ISP_CTRL_00, 0xa7},
+	{OV5640_ISP_CTRL_01, 0x83},
+	{OV5640_ISP_MUX_CTRL, 0x00},
+
+        /* Timing Control */
+	{OV5640_TIMING_HS_H, OV5640_ADDR_H(336) },
+	{OV5640_TIMING_HS_L, OV5640_ADDR_L(336) },
+	{OV5640_TIMING_VS_H, OV5640_ADDR_H(426) },
+	{OV5640_TIMING_VS_L, OV5640_ADDR_L(426) },
+	{OV5640_TIMING_HW_H, OV5640_ADDR_H(2287) },
+	{OV5640_TIMING_HW_L, OV5640_ADDR_L(2287) },
+	{OV5640_TIMING_VH_H, OV5640_ADDR_H(1529) },
+	{OV5640_TIMING_VH_L, OV5640_ADDR_L(1529) },
+	{OV5640_TIMING_DVPHO_H, OV5640_WIDTH_H(1920) }, //1936
+	{OV5640_TIMING_DVPHO_L, OV5640_WIDTH_L(1920) },
+	{OV5640_TIMING_DVPVO_H, OV5640_HEIGHT_H(1080) }, //1088
+	{OV5640_TIMING_DVPVO_L, OV5640_HEIGHT_L(1080) },
+	{OV5640_TIMING_HTS_H, OV5640_HTS_H(2500) },
+	{OV5640_TIMING_HTS_L, OV5640_HTS_L(2500) },
+	{OV5640_TIMING_VTS_H, OV5640_VTS_H(1120) },
+	{OV5640_TIMING_VTS_L, OV5640_VTS_L(1120) },
+	{OV5640_TIMING_HOFFSET_H, OV5640_H_OFFSET_H(15) }, // (2287-336-1936-1)/2
+	{OV5640_TIMING_HOFFSET_L, OV5640_H_OFFSET_L(15) },
+	{OV5640_TIMING_VOFFSET_H, OV5640_V_OFFSET_H(11) }, // (1529-426-1088-1)/2
+	{OV5640_TIMING_VOFFSET_L, OV5640_V_OFFSET_L(11) },
+	{OV5640_TIMING_X_INC, 0x11},
+	{OV5640_TIMING_Y_INC, 0x11},
+	{OV5640_TIMING_REG20, 0x40},
+	{OV5640_TIMING_REG21, 0},
+
+        /* magic registers */
 	{0x3612, 0x2b},
+	{0x3618, 0x04},
 	{0x3708, 0x64},
 	{0x3709, 0x12},
 	{0x370c, 0x00},
-	{0x3a02, 0x04},
-	{0x3a03, 0x60},
-	{0x3a08, 0x01},
-	{0x3a09, 0x50},
-	{0x3a0a, 0x01},
-	{0x3a0b, 0x18},
-	{0x3a0e, 0x03},
-	{0x3a0d, 0x04},
-	{0x3a14, 0x04},
-	{0x3a15, 0x60},
-	{0x4001, 0x02},
-	{0x4004, 0x06},
-	{0x3000, 0x00},
-	{0x3002, 0x1c},
-	{0x3004, 0xff},
-	{0x3006, 0xc3},
-	{0x300e, 0x45},
-	{0x302e, 0x08},
-	{0x4300, 0x32},
-	{0x501f, 0x00},
-	{0x4713, 0x02},
-	{0x4407, 0x04},
-	{0x440e, 0x00},
-	{0x460b, 0x37},
-	{0x460c, 0x20},
-	{0x4800, 0x4},
-	{0x4837, 0x0a},
-	{0x3824, 0x04},
-	{0x5000, 0xa7},
-	{0x5001, 0x83},
-	{0x5180, 0xff},
-	{0x5181, 0xf2},
-	{0x5182, 0x00},
-	{0x5183, 0x14},
-	{0x5184, 0x25},
-	{0x5185, 0x24},
-	{0x5186, 0x09},
-	{0x5187, 0x09},
-	{0x5188, 0x09},
-	{0x5189, 0x75},
-	{0x518a, 0x54},
-	{0x518b, 0xe0},
-	{0x518c, 0xb2},
-	{0x518d, 0x42},
-	{0x518e, 0x3d},
-	{0x518f, 0x56},
-	{0x5190, 0x46},
-	{0x5191, 0xf8},
-	{0x5192, 0x04},
-	{0x5193, 0x70},
-	{0x5194, 0xf0},
-	{0x5195, 0xf0},
-	{0x5196, 0x03},
-	{0x5197, 0x01},
-	{0x5198, 0x04},
-	{0x5199, 0x12},
-	{0x519a, 0x04},
-	{0x519b, 0x00},
-	{0x519c, 0x06},
-	{0x519d, 0x82},
-	{0x519e, 0x38},
-	{0x5381, 0x1e},
-	{0x5382, 0x5b},
-	{0x5383, 0x08},
-	{0x5384, 0x0a},
-	{0x5385, 0x7e},
-	{0x5386, 0x88},
-	{0x5387, 0x7c},
-	{0x5388, 0x6c},
-	{0x5389, 0x10},
-	{0x538a, 0x01},
-	{0x538b, 0x98},
-	{0x5300, 0x08},
-	{0x5301, 0x30},
-	{0x5302, 0x10},
-	{0x5303, 0x00},
-	{0x5304, 0x08},
-	{0x5305, 0x30},
-	{0x5306, 0x08},
-	{0x5307, 0x16},
-	{0x5309, 0x08},
-	{0x530a, 0x30},
-	{0x530b, 0x04},
-	{0x530c, 0x06},
-	{0x5480, 0x01},
-	{0x5481, 0x08},
-	{0x5482, 0x14},
-	{0x5483, 0x28},
-	{0x5484, 0x51},
-	{0x5485, 0x65},
-	{0x5486, 0x71},
-	{0x5487, 0x7d},
-
-	{0x5488, 0x87},
-	{0x5489, 0x91},
-	{0x548a, 0x9a},
-	{0x548b, 0xaa},
-	{0x548c, 0xb8},
-	{0x548d, 0xcd},
-	{0x548e, 0xdd},
-	{0x548f, 0xea},
-	{0x5490, 0x1d},
-	{0x5580, 0x02},
-	{0x5583, 0x40},
-	{0x5584, 0x10},
-	{0x5589, 0x10},
-	{0x558a, 0x00},
-	{0x558b, 0xf8},
-	{0x5800, 0x23},
-	{0x5801, 0x14},
-	{0x5802, 0x0f},
-	{0x5803, 0x0f},
-	{0x5804, 0x12},
-	{0x5805, 0x26},
-	{0x5806, 0x0c},
-	{0x5807, 0x08},
-	{0x5808, 0x05},
-	{0x5809, 0x05},
-	{0x580a, 0x08},
-	{0x580b, 0x0d},
-	{0x580c, 0x08},
-	{0x580d, 0x03},
-	{0x580e, 0x00},
-	{0x580f, 0x00},
-	{0x5810, 0x03},
-	{0x5811, 0x09},
-	{0x5812, 0x07},
-	{0x5813, 0x03},
-	{0x5814, 0x00},
-	{0x5815, 0x01},
-	{0x5816, 0x03},
-	{0x5817, 0x08},
-	{0x5818, 0x0d},
-	{0x5819, 0x08},
-	{0x581a, 0x05},
-	{0x581b, 0x06},
-	{0x581c, 0x08},
-	{0x581d, 0x0e},
-	{0x581e, 0x29},
-	{0x581f, 0x17},
-	{0x5820, 0x11},
-	{0x5821, 0x11},
-	{0x5822, 0x15},
-	{0x5823, 0x28},
-	{0x5824, 0x46},
-	{0x5825, 0x26},
-	{0x5826, 0x08},
-	{0x5827, 0x26},
-	{0x5828, 0x64},
-	{0x5829, 0x26},
-	{0x582a, 0x24},
-	{0x582b, 0x22},
-	{0x582c, 0x24},
-	{0x582d, 0x24},
-	{0x582e, 0x06},
-	{0x582f, 0x22},
-	{0x5830, 0x40},
-	{0x5831, 0x42},
-	{0x5832, 0x24},
-	{0x5833, 0x26},
-	{0x5834, 0x24},
-	{0x5835, 0x22},
-	{0x5836, 0x22},
-	{0x5837, 0x26},
-	{0x5838, 0x44},
-	{0x5839, 0x24},
-	{0x583a, 0x26},
-	{0x583b, 0x28},
-	{0x583c, 0x42},
-	{0x583d, 0xce},
-	{0x5025, 0x00},
-	{0x3a0f, 0x30},
-	{0x3a10, 0x28},
-	{0x3a1b, 0x30},
-	{0x3a1e, 0x26},
-	{0x3a11, 0x60},
-	{0x3a1f, 0x14},
-	{0x3008, 0x02},
+
+	/* AEC/AGC Power Down Domain Control */
+	{OV5640_AEC_MAX_EXPO60_H, 0x04},
+	{OV5640_AEC_MAX_EXPO60_L, 0x60},
+	{OV5640_AEC_B50_STEP_H, 0x01},
+	{OV5640_AEC_B50_STEP_L, 0x50},
+	{OV5640_AEC_B60_STEP_H, 0x01},
+	{OV5640_AEC_B60_STEP_L, 0x18},
+	{OV5640_AEC_CTRL_0E, 0x03},
+	{OV5640_AEC_CTRL_0D, 0x04},
+	{OV5640_AEC_MAX_EXPO_H, 0x04},
+	{OV5640_AEC_MAX_EXPO_L, 0x60},
+	{OV5640_AEC_CTRL_13, 0x43},
+	{OV5640_AEC_GAIN_CEILING_0, 0x00},
+	{OV5640_AEC_GAIN_CEILING_1, 0xf8},
+	{OV5640_AEC_CTRL_0F, 0x30},
+	{OV5640_AEC_CTRL_10, 0x28},
+	{OV5640_AEC_CTRL_1B, 0x30},
+	{OV5640_AEC_CTRL_1E, 0x26},
+	{OV5640_AEC_CTRL_11, 0x60},
+	{OV5640_AEC_CTRL_1F, 0x14},
+
+	{OV5640_SYSTEM_CTRL, 0x02},
 	{OV5640_TABLE_END, 0x0000}
 };
 
-static struct ov5640_reg mode_1296x972[] = {
+static struct ov5640_reg mode_1280x960[] = {
 	/* PLL Control MIPI bit rate/lane = 448MHz, 16-bit mode.
 	 * Output size: 1304x972 (0, 0) - (2623, 1951),
 	 * Line Length = 1886, Frame Length = 990.
+         * Scaling method: subsampling in vertical and horizontal
+         * 1296x968 supports 2x2 binning
 	 */
-	{0x3103, 0x11},
-	{0x3008, 0x82},
-	{OV5640_TABLE_WAIT_MS, 5},
-	{0x3008, 0x42},
-	{0x3103, 0x03},
-	{0x3017, 0x00},
-	{0x3018, 0x00},
-	{0x3034, 0x18},
-	{0x3035, 0x21},
-	{0x3036, 0x70},
-	{0x3037, 0x13},
-	{0x3108, 0x01},
-	{0x3630, 0x36},
-	{0x3631, 0x0e},
-	{0x3632, 0xe2},
-	{0x3633, 0x12},
-	{0x3621, 0xe0},
-	{0x3704, 0xa0},
-	{0x3703, 0x5a},
-	{0x3715, 0x78},
-	{0x3717, 0x01},
-	{0x370b, 0x60},
-	{0x3705, 0x1a},
-	{0x3905, 0x02},
-	{0x3906, 0x10},
-	{0x3901, 0x0a},
-	{0x3731, 0x12},
-	{0x3600, 0x08},
-	{0x3601, 0x33},
-	{0x302d, 0x60},
-	{0x3620, 0x52},
-	{0x371b, 0x20},
-	{0x471c, 0x50},
-	{0x3a13, 0x43},
-	{0x3a18, 0x00},
-	{0x3a19, 0xf8},
-	{0x3635, 0x13},
-	{0x3636, 0x03},
-	{0x3634, 0x40},
-	{0x3622, 0x01},
-	{0x3c01, 0x34},
-	{0x3c04, 0x28},
-	{0x3c05, 0x98},
-	{0x3c06, 0x00},
-	{0x3c07, 0x07},
-	{0x3c08, 0x00},
-	{0x3c09, 0x1c},
-	{0x3c0a, 0x9c},
-	{0x3c0b, 0x40},
-	{0x3820, 0x41},
-	{0x3821, 0x07},
-	{0x3814, 0x31},
-	{0x3815, 0x31},
-	{0x3800, 0x00},
-	{0x3801, 0x00},
-	{0x3802, 0x00},
-	{0x3803, 0x00},
-	{0x3804, 0x0a},
-	{0x3805, 0x3f},
-	{0x3806, 0x07},
-	{0x3807, 0x9f},
-	{0x3808, 0x05},
-	{0x3809, 0x18},
-	{0x380a, 0x03},
-	{0x380b, 0xcc},
-	{0x380c, 0x07},
-	{0x380d, 0x5e},
-	{0x380e, 0x03},
-	{0x380f, 0xde},
-	{0x3810, 0x00},
-	{0x3811, 0x06},
-	{0x3812, 0x00},
-	{0x3813, 0x02},
-	{0x3618, 0x00},
+
+	{OV5640_SC_PLL_CTRL0, 0x10 | MIPI_MODE_8BIT },
+	{OV5640_SC_PLL_CTRL1, 0x21},
+	{OV5640_SC_PLL_CTRL2, 0x70},            /* default 0x69  PLL multipier */
+	{OV5640_SC_PLL_CTRL3, 0x03 | (1<<4) },  /* default 0x03  PLL divided by 2 */
+
+	{OV5640_MIPI_CTRL_00, 0x04},
+	{OV5640_MIPI_PCLK_PERIOD, 0x10},
+
+	{OV5640_ISP_CTRL_00, 0xa7},
+	{OV5640_ISP_CTRL_01, 0x83},
+	{OV5640_ISP_MUX_CTRL, 0x00},
+
+        /* Timing Control */
+	{OV5640_TIMING_HS_H, OV5640_ADDR_H(0) },
+	{OV5640_TIMING_HS_L, OV5640_ADDR_L(0) },
+	{OV5640_TIMING_VS_H, OV5640_ADDR_H(0) },
+	{OV5640_TIMING_VS_L, OV5640_ADDR_L(0) },
+	{OV5640_TIMING_HW_H, OV5640_ADDR_H(2623) },
+	{OV5640_TIMING_HW_L, OV5640_ADDR_L(2623) },
+	{OV5640_TIMING_VH_H, OV5640_ADDR_H(1951) },
+	{OV5640_TIMING_VH_L, OV5640_ADDR_L(1951) },
+	{OV5640_TIMING_DVPHO_H, OV5640_WIDTH_H(1280) },
+	{OV5640_TIMING_DVPHO_L, OV5640_WIDTH_L(1280) },
+	{OV5640_TIMING_DVPVO_H, OV5640_HEIGHT_H(960) },
+	{OV5640_TIMING_DVPVO_L, OV5640_HEIGHT_L(960) },
+	{OV5640_TIMING_HTS_H, OV5640_HTS_H(1886) },
+	{OV5640_TIMING_HTS_L, OV5640_HTS_L(1886) },
+	{OV5640_TIMING_VTS_H, OV5640_VTS_H(990) },
+	{OV5640_TIMING_VTS_L, OV5640_VTS_L(990) },
+	{OV5640_TIMING_HOFFSET_H, OV5640_H_OFFSET_H(31) }, // (2623-0-(1280*2)-1)/2
+	{OV5640_TIMING_HOFFSET_L, OV5640_H_OFFSET_L(31) },
+	{OV5640_TIMING_VOFFSET_H, OV5640_V_OFFSET_H(15) }, // (1951-0-(960*2)-1)/2
+	{OV5640_TIMING_VOFFSET_L, OV5640_V_OFFSET_L(15) },
+	{OV5640_TIMING_X_INC, 0x11 | (3<<4) },
+	{OV5640_TIMING_Y_INC, 0x11 | (3<<4) },
+	{OV5640_TIMING_REG20, 0x40},
+	{OV5640_TIMING_REG21, REG21_BINNING_EN},
+
+        /* magic registers */
 	{0x3612, 0x29},
+	{0x3618, 0x00},
 	{0x3708, 0x62},
 	{0x3709, 0x52},
 	{0x370c, 0x03},
-	{0x3a02, 0x03},
-	{0x3a03, 0xd8},
-	{0x3a08, 0x01},
-	{0x3a09, 0x27},
-	{0x3a0a, 0x00},
-	{0x3a0b, 0xf6},
-	{0x3a0e, 0x03},
-	{0x3a0d, 0x04},
-	{0x3a14, 0x03},
-	{0x3a15, 0xd8},
-	{0x4001, 0x02},
-	{0x4004, 0x02},
-	{0x3000, 0x00},
-	{0x3002, 0x1c},
-	{0x3004, 0xff},
-	{0x3006, 0xc3},
-	{0x300e, 0x45},
-	{0x302e, 0x08},
-	{0x4300, 0x32},
-	{0x501f, 0x00},
-	{0x4713, 0x02},
-	{0x4407, 0x04},
-	{0x440e, 0x00},
-	{0x460b, 0x37},
-	{0x460c, 0x20},
-	{0x4800, 0x4},
-	{0x4837, 0x10},
-	{0x3824, 0x04},
-	{0x5000, 0xa7},
-	{0x5001, 0x83},
-	{0x5180, 0xff},
-	{0x5181, 0xf2},
-	{0x5182, 0x00},
-	{0x5183, 0x14},
-	{0x5184, 0x25},
-	{0x5185, 0x24},
-	{0x5186, 0x09},
-	{0x5187, 0x09},
-	{0x5188, 0x09},
-	{0x5189, 0x75},
-	{0x518a, 0x54},
-	{0x518b, 0xe0},
-	{0x518c, 0xb2},
-	{0x518d, 0x42},
-	{0x518e, 0x3d},
-	{0x518f, 0x56},
-	{0x5190, 0x46},
-	{0x5191, 0xf8},
-	{0x5192, 0x04},
-	{0x5193, 0x70},
-	{0x5194, 0xf0},
-	{0x5195, 0xf0},
-	{0x5196, 0x03},
-	{0x5197, 0x01},
-	{0x5198, 0x04},
-	{0x5199, 0x12},
-	{0x519a, 0x04},
-	{0x519b, 0x00},
-	{0x519c, 0x06},
-	{0x519d, 0x82},
-	{0x519e, 0x38},
-	{0x5381, 0x1e},
-	{0x5382, 0x5b},
-	{0x5383, 0x08},
-	{0x5384, 0x0a},
-	{0x5385, 0x7e},
-	{0x5386, 0x88},
-	{0x5387, 0x7c},
-	{0x5388, 0x6c},
-	{0x5389, 0x10},
-	{0x538a, 0x01},
-	{0x538b, 0x98},
-	{0x5300, 0x08},
-	{0x5301, 0x30},
-	{0x5302, 0x10},
-	{0x5303, 0x00},
-	{0x5304, 0x08},
-	{0x5305, 0x30},
-	{0x5306, 0x08},
-	{0x5307, 0x16},
-	{0x5309, 0x08},
-	{0x530a, 0x30},
-	{0x530b, 0x04},
-	{0x530c, 0x06},
-	{0x5480, 0x01},
-	{0x5481, 0x08},
-	{0x5482, 0x14},
-	{0x5483, 0x28},
-	{0x5484, 0x51},
-	{0x5485, 0x65},
-	{0x5486, 0x71},
-	{0x5487, 0x7d},
-	{0x5488, 0x87},
-	{0x5489, 0x91},
-	{0x548a, 0x9a},
-	{0x548b, 0xaa},
-	{0x548c, 0xb8},
-	{0x548d, 0xcd},
-	{0x548e, 0xdd},
-	{0x548f, 0xea},
-	{0x5490, 0x1d},
-	{0x5580, 0x02},
-	{0x5583, 0x40},
-	{0x5584, 0x10},
-	{0x5589, 0x10},
-	{0x558a, 0x00},
-	{0x558b, 0xf8},
-	{0x5800, 0x23},
-	{0x5801, 0x14},
-	{0x5802, 0x0f},
-	{0x5803, 0x0f},
-	{0x5804, 0x12},
-	{0x5805, 0x26},
-	{0x5806, 0x0c},
-	{0x5807, 0x08},
-	{0x5808, 0x05},
-	{0x5809, 0x05},
-	{0x580a, 0x08},
-	{0x580b, 0x0d},
-	{0x580c, 0x08},
-	{0x580d, 0x03},
-	{0x580e, 0x00},
-	{0x580f, 0x00},
-	{0x5810, 0x03},
-	{0x5811, 0x09},
-	{0x5812, 0x07},
-	{0x5813, 0x03},
-	{0x5814, 0x00},
-	{0x5815, 0x01},
-	{0x5816, 0x03},
-	{0x5817, 0x08},
-	{0x5818, 0x0d},
-	{0x5819, 0x08},
-	{0x581a, 0x05},
-	{0x581b, 0x06},
-	{0x581c, 0x08},
-	{0x581d, 0x0e},
-	{0x581e, 0x29},
-	{0x581f, 0x17},
-	{0x5820, 0x11},
-	{0x5821, 0x11},
-	{0x5822, 0x15},
-	{0x5823, 0x28},
-	{0x5824, 0x46},
-	{0x5825, 0x26},
-	{0x5826, 0x08},
-	{0x5827, 0x26},
-	{0x5828, 0x64},
-	{0x5829, 0x26},
-	{0x582a, 0x24},
-	{0x582b, 0x22},
-	{0x582c, 0x24},
-	{0x582d, 0x24},
-	{0x582e, 0x06},
-	{0x582f, 0x22},
-	{0x5830, 0x40},
-	{0x5831, 0x42},
-	{0x5832, 0x24},
-	{0x5833, 0x26},
-	{0x5834, 0x24},
-	{0x5835, 0x22},
-	{0x5836, 0x22},
-	{0x5837, 0x26},
-	{0x5838, 0x44},
-	{0x5839, 0x24},
-	{0x583a, 0x26},
-	{0x583b, 0x28},
-	{0x583c, 0x42},
-	{0x583d, 0xce},
-	{0x5025, 0x00},
-	{0x3a0f, 0x30},
-	{0x3a10, 0x28},
-	{0x3a1b, 0x30},
-	{0x3a1e, 0x26},
-	{0x3a11, 0x60},
-	{0x3a1f, 0x14},
-	{0x3008, 0x02},
+
+	/* AEC/AGC Power Down Domain Control */
+	{OV5640_AEC_MAX_EXPO60_H, 0x03},
+	{OV5640_AEC_MAX_EXPO60_L, 0xd8},
+	{OV5640_AEC_B50_STEP_H, 0x01},
+	{OV5640_AEC_B50_STEP_L, 0x27},
+	{OV5640_AEC_B60_STEP_H, 0x00},
+	{OV5640_AEC_B60_STEP_L, 0xf6},
+	{OV5640_AEC_CTRL_0E, 0x03},
+	{OV5640_AEC_CTRL_0D, 0x04},
+	{OV5640_AEC_MAX_EXPO_H, 0x03},
+	{OV5640_AEC_MAX_EXPO_L, 0xd8},
+	{OV5640_AEC_CTRL_13, 0x43},
+	{OV5640_AEC_GAIN_CEILING_0, 0x00},
+	{OV5640_AEC_GAIN_CEILING_1, 0xf8},
+	{OV5640_AEC_CTRL_0F, 0x30},
+	{OV5640_AEC_CTRL_10, 0x28},
+	{OV5640_AEC_CTRL_1B, 0x30},
+	{OV5640_AEC_CTRL_1E, 0x26},
+	{OV5640_AEC_CTRL_11, 0x60},
+	{OV5640_AEC_CTRL_1F, 0x14},
+
+	{OV5640_SYSTEM_CTRL, 0x02},
 	{OV5640_TABLE_END, 0x0000}
 };
 
 static struct ov5640_reg mode_640x480[] = {
-	{0x3103, 0x11},
-	{0x3008, 0x82},
-	{OV5640_TABLE_WAIT_MS, 5},
-	{0x3008, 0x42},
-	{0x3103, 0x03},
-	{0x3017, 0x00},
-	{0x3018, 0x00},
-	{0x3034, 0x18},
-	{0x3035, 0x14},
-	{0x3036, 0x70},
-	{0x3037, 0x13},
-	{0x4800, 0x04}, /* continuous clock */
-	{0x3108, 0x01},
-	{0x3630, 0x36},
-	{0x3631, 0x0e},
-	{0x3632, 0xe2},
-	{0x3633, 0x12},
-	{0x3621, 0xe0},
-	{0x3704, 0xa0},
-	{0x3703, 0x5a},
-	{0x3715, 0x78},
-	{0x3717, 0x01},
-	{0x370b, 0x60},
-	{0x3705, 0x1a},
-	{0x3905, 0x02},
-	{0x3906, 0x10},
-	{0x3901, 0x0a},
-	{0x3731, 0x12},
-	{0x3600, 0x08},
-	{0x3601, 0x33},
-	{0x302d, 0x60},
-	{0x3620, 0x52},
-	{0x371b, 0x20},
-	{0x471c, 0x50},
-	{0x3a13, 0x43},
-	{0x3a18, 0x00},
-	{0x3a19, 0xf8},
-	{0x3635, 0x13},
-	{0x3636, 0x03},
-	{0x3634, 0x40},
-	{0x3622, 0x01},
-	{0x3c01, 0x34},
-	{0x3c04, 0x28},
-	{0x3c05, 0x98},
-	{0x3c06, 0x00},
-	{0x3c07, 0x08},
-	{0x3c08, 0x00},
-	{0x3c09, 0x1c},
-	{0x3c0a, 0x9c},
-	{0x3c0b, 0x40},
-	{0x3820, 0x41},
-	{0x3821, 0x07},
-	{0x3814, 0x31},
-	{0x3815, 0x31},
-	{0x3800, 0x00},
-	{0x3801, 0x00},
-	{0x3802, 0x00},
-	{0x3803, 0x04},
-	{0x3804, 0x0a},
-	{0x3805, 0x3f},
-	{0x3806, 0x07},
-	{0x3807, 0x9b},
-	{0x3808, 0x02},
-	{0x3809, 0x80},
-	{0x380a, 0x01},
-	{0x380b, 0xe0},
-	{0x380c, 0x07},
-	{0x380d, 0x68},
-	{0x380e, 0x03},
-	{0x380f, 0xd8},
-	{0x3810, 0x00},
-	{0x3811, 0x10},
-	{0x3812, 0x00},
-	{0x3813, 0x06},
-	{0x3618, 0x00},
+	/* PLL Control MIPI bit rate/lane = ?MHz, 16-bit mode.
+	 * Output size: 640x480 (0, 4) - (2623, 1951),
+	 * Line Length = 1896, Frame Length = 984.
+         * Scaling method: subsampling from 1280x960
+         * 648x484 with dummy
+         * supports 2x2 binning
+	 */
+
+	{OV5640_SC_PLL_CTRL0, 0x10 | MIPI_MODE_8BIT },
+	{OV5640_SC_PLL_CTRL1, 0x14},
+	{OV5640_SC_PLL_CTRL2, 0x70},            /* default 0x69  PLL multipier */
+	{OV5640_SC_PLL_CTRL3, 0x03 | (1<<4) },  /* default 0x03  PLL divided by 2 */
+
+	{OV5640_MIPI_CTRL_00, 0x04},
+	{OV5640_MIPI_PCLK_PERIOD, 0x44},
+
+	{OV5640_ISP_CTRL_00, 0xa7},
+	{OV5640_ISP_CTRL_01, 0x83 | ISP_SCALE_EN},
+	{OV5640_ISP_MUX_CTRL, 0x00},
+
+        /* Timing Control */
+	{OV5640_TIMING_HS_H, OV5640_ADDR_H(0) },
+	{OV5640_TIMING_HS_L, OV5640_ADDR_L(0) },
+	{OV5640_TIMING_VS_H, OV5640_ADDR_H(0) },
+	{OV5640_TIMING_VS_L, OV5640_ADDR_L(4) },
+	{OV5640_TIMING_HW_H, OV5640_ADDR_H(2623) },
+	{OV5640_TIMING_HW_L, OV5640_ADDR_L(2623) },
+	{OV5640_TIMING_VH_H, OV5640_ADDR_H(1947) },
+	{OV5640_TIMING_VH_L, OV5640_ADDR_L(1947) },
+	{OV5640_TIMING_DVPHO_H, OV5640_WIDTH_H(640) },
+	{OV5640_TIMING_DVPHO_L, OV5640_WIDTH_L(640) },
+	{OV5640_TIMING_DVPVO_H, OV5640_HEIGHT_H(480) },
+	{OV5640_TIMING_DVPVO_L, OV5640_HEIGHT_L(480) },
+	{OV5640_TIMING_HTS_H, OV5640_HTS_H(1896) },
+	{OV5640_TIMING_HTS_L, OV5640_HTS_L(1896) },
+	{OV5640_TIMING_VTS_H, OV5640_VTS_H(984) },
+	{OV5640_TIMING_VTS_L, OV5640_VTS_L(984) },
+	{OV5640_TIMING_HOFFSET_H, OV5640_H_OFFSET_H(31) }, // (2623-0-(640*2*2)-1)/2
+	{OV5640_TIMING_HOFFSET_L, OV5640_H_OFFSET_L(31) },
+	{OV5640_TIMING_VOFFSET_H, OV5640_V_OFFSET_H(11) }, // (1947-4-(480*2*2)-1)/2
+	{OV5640_TIMING_VOFFSET_L, OV5640_V_OFFSET_L(11) },
+	{OV5640_TIMING_X_INC, 0x11 | (3<<4) },
+	{OV5640_TIMING_Y_INC, 0x11 | (3<<4) },
+	{OV5640_TIMING_REG20, 0x40},
+	{OV5640_TIMING_REG21, REG21_BINNING_EN},
+
+        /* magic registers */
 	{0x3612, 0x29},
+	{0x3618, 0x00},
 	{0x3708, 0x64},
 	{0x3709, 0x52},
 	{0x370c, 0x03},
 
 	/* AEC/AGC Power Down Domain Control */
-	{0x3a02, 0x03},
-	{0x3a03, 0xd8},
-	{0x3a08, 0x01},
-	{0x3a09, 0x27},
-	{0x3a0a, 0x00},
-	{0x3a0b, 0xf6},
-	{0x3a0e, 0x03},
-	{0x3a0d, 0x04},
-	{0x3a14, 0x03},
-	{0x3a15, 0xd8},
-
-	{0x4001, 0x02},
-	{0x4004, 0x02},
-	{0x3000, 0x00},
-	{0x3002, 0x1c},
-	{0x3004, 0xff},
-	{0x3006, 0xc3},
-	{0x300e, 0x45},
-	{0x302e, 0x08},
-	/* org:30 bit[3:0]
-	   0x0:YUYV 0x1:YVYU 0x2:UYVY
-	   0x3:VYUY 0xF:UYVY 0x4~0xE:Not-allowed
-	 */
-	{0x4300, 0x32},
-	{0x501f, 0x00},
-	{0x4713, 0x03},
-	{0x4407, 0x04},
-	{0x440e, 0x00},
-	{0x460b, 0x35},
-	{0x460c, 0x22},
-	{0x4837, 0x44},
-	{0x3824, 0x02},
-	{0x5000, 0xa7},
-	{0x5001, 0xa3},
+	{OV5640_AEC_MAX_EXPO60_H, 0x03},
+	{OV5640_AEC_MAX_EXPO60_L, 0xd8},
+	{OV5640_AEC_B50_STEP_H, 0x01},
+	{OV5640_AEC_B50_STEP_L, 0x27},
+	{OV5640_AEC_B60_STEP_H, 0x00},
+	{OV5640_AEC_B60_STEP_L, 0xf6},
+	{OV5640_AEC_CTRL_0E, 0x03},
+	{OV5640_AEC_CTRL_0D, 0x04},
+	{OV5640_AEC_MAX_EXPO_H, 0x03},
+	{OV5640_AEC_MAX_EXPO_L, 0xd8},
+	{OV5640_AEC_CTRL_13, 0x43},
+	{OV5640_AEC_GAIN_CEILING_0, 0x00},
+	{OV5640_AEC_GAIN_CEILING_1, 0xf8},
+	{OV5640_AEC_CTRL_0F, 0x30},
+	{OV5640_AEC_CTRL_10, 0x28},
+	{OV5640_AEC_CTRL_1B, 0x30},
+	{OV5640_AEC_CTRL_1E, 0x26},
+	{OV5640_AEC_CTRL_11, 0x60},
+	{OV5640_AEC_CTRL_1F, 0x14},
+
+	{OV5640_SYSTEM_CTRL, 0x02},
+	{OV5640_TABLE_END, 0x0000},
+};
+
+static struct ov5640_reg mode_common_registers[] = {
+
+        /* SCCB Control */
+	{OV5640_SCCB_SYSTEM_CTRL, 0x03},                   /* Clock from PLL */
+	{OV5640_SCCB_SCLK, 0x01},                          /* PCLK = pll_clki, SCLK = pll_clki/2 */
+
+        /* System Control */
+	{OV5640_SYSTEM_CTRL, 0x02 | SYSTEM_CTRL_SRST },    /* Software reset */
+	{OV5640_TABLE_WAIT_MS, 5},
+	{OV5640_SYSTEM_CTRL, 0x02 | SYSTEM_CTRL_PDOWN },   /* Software power down */
+	{OV5640_SYSTEM_RESET_00, 0x00},
+	{OV5640_SYSTEM_RESET_01, 0x00},
+	{OV5640_SYSTEM_RESET_02, 0x1c},
+	{OV5640_SYSTEM_CLK_EN_00, 0xff},
+	{OV5640_SYSTEM_CLK_EN_02, 0xc3},
+	{OV5640_SYSTEM_MIPI_CTRL, 0x45},
+
+	{OV5640_SYSTEM_CTRL_2D, 0x60},  /* magic values */
+	{OV5640_SYSTEM_CTRL_2E, 0x08},  /* magic values */
+
+        /* Format Control */
+	{FMT_CTRL_00, FMT_YUV422 | OFMT_UYVY },
+
+        /* VCM Control */
+/*	{OV5640_VCM_DEBUG_MODE_0, 0x08},*/
+/*	{OV5640_VCM_DEBUG_MODE_1, 0x33},*/
+
+        /* 50/60Hz detector control */
+	{OV5640_5060_CTRL_01, 0x34},
+	{OV5640_5060_CTRL_04, 0x28},
+	{OV5640_5060_CTRL_05, 0x98},
+	{OV5640_5060_THRESHOLD_1_H, 0x00},
+	{OV5640_5060_THRESHOLD_1_L, 0x07},
+	{OV5640_5060_THRESHOLD_2_H, 0x00},
+	{OV5640_5060_THRESHOLD_2_L, 0x1c},
+	{OV5640_5060_SAMPLE_NUM_H, 0x9c},
+	{OV5640_5060_SAMPLE_NUM_L, 0x40},
+
+        /* BLC Control */
+	{OV5640_BLC_CTRL_01, 0x02},
+	{OV5640_BLC_CTRL_04, 0x06},
 
 	/* AWB Control */
-	{0x5180, 0xff},
-	{0x5181, 0xf2},
-	{0x5182, 0x00},
-	{0x5183, 0x14},
-	{0x5184, 0x25},
-	{0x5185, 0x24},
-	{0x5186, 0x09},
-	{0x5187, 0x09},
-	{0x5188, 0x09},
-	{0x5189, 0x75},
-	{0x518a, 0x54},
-	{0x518b, 0xe0},
-	{0x518c, 0xb2},
-	{0x518d, 0x42},
-	{0x518e, 0x3d},
-	{0x518d, 0x56},
-	{0x5190, 0x46},
-	{0x5191, 0xf8},
-	{0x5192, 0x04},
-	{0x5193, 0x70},
-	{0x5194, 0xf0},
-	{0x5195, 0xf0},
-	{0x5196, 0x03},
-	{0x5197, 0x01},
-	{0x5198, 0x04},
-	{0x5199, 0x12},
-	{0x519a, 0x04},
-	{0x519b, 0x00},
-	{0x519c, 0x06},
-	{0x519d, 0x82},
-	{0x519e, 0x38},
+	{OV5640_AWB_CTRL_00, 0xff},
+	{OV5640_AWB_CTRL_01, 0xf2},
+	{OV5640_AWB_CTRL_02, 0x00},
+	{OV5640_AWB_CTRL_03, 0x14},
+	{OV5640_AWB_CTRL_04, 0x25},
+	{OV5640_AWB_CTRL_05, 0x24},
+	{OV5640_AWB_CTRL_06, 0x09},
+	{OV5640_AWB_CTRL_07, 0x09},
+	{OV5640_AWB_CTRL_08, 0x09},
+	{OV5640_AWB_CTRL_09, 0x75},
+	{OV5640_AWB_CTRL_10, 0x54},
+	{OV5640_AWB_CTRL_11, 0xe0},
+	{OV5640_AWB_CTRL_12, 0xb2},
+	{OV5640_AWB_CTRL_13, 0x42},
+	{OV5640_AWB_CTRL_14, 0x3d},
+	{OV5640_AWB_CTRL_15, 0x56},
+	{OV5640_AWB_CTRL_16, 0x46},
+	{OV5640_AWB_CTRL_17, 0xf8},
+	{OV5640_AWB_CTRL_18, 0x04},
+	{OV5640_AWB_CTRL_19, 0x70},
+	{OV5640_AWB_CTRL_20, 0xf0},
+	{OV5640_AWB_CTRL_21, 0xf0},
+	{OV5640_AWB_CTRL_22, 0x03},
+	{OV5640_AWB_CTRL_23, 0x01},
+	{OV5640_AWB_CTRL_24, 0x04},
+	{OV5640_AWB_CTRL_25, 0x12},
+	{OV5640_AWB_CTRL_26, 0x04},
+	{OV5640_AWB_CTRL_27, 0x00},
+	{OV5640_AWB_CTRL_28, 0x06},
+	{OV5640_AWB_CTRL_29, 0x82},
+	{OV5640_AWB_CTRL_30, 0x38},
 
 	/* CMX Control */
-	{0x5381, 0x1e},
-	{0x5382, 0x5b},
-	{0x5383, 0x08},
-	{0x5384, 0x0a},
-	{0x5385, 0x7e},
-	{0x5386, 0x88},
-	{0x5387, 0x7c},
-	{0x5388, 0x6c},
-	{0x5389, 0x10},
-	{0x538a, 0x01},
-	{0x538b, 0x98},
+	{OV5640_CMX1, 0x1e},
+	{OV5640_CMX2, 0x5b},
+	{OV5640_CMX3, 0x08},
+	{OV5640_CMX4, 0x0a},
+	{OV5640_CMX5, 0x7e},
+	{OV5640_CMX6, 0x88},
+	{OV5640_CMX7, 0x7c},
+	{OV5640_CMX8, 0x6c},
+	{OV5640_CMX9, 0x10},
+	{OV5640_CMX_SIGN_0, 0x01},
+	{OV5640_CMX_SIGN_1, 0x98},
 
 	/* CIP Control */
-	{0x5300, 0x08},
-	{0x5301, 0x30},
-	{0x5302, 0x10},
-	{0x5303, 0x00},
-	{0x5304, 0x08},
-	{0x5305, 0x30},
-	{0x5306, 0x08},
-	{0x5307, 0x16},
-	{0x5309, 0x08},
-	{0x530a, 0x30},
-	{0x530b, 0x04},
-	{0x530c, 0x06},
+	{OV5640_CIP_SH_MT_THRES_1, 0x08},
+	{OV5640_CIP_SH_MT_THRES_2, 0x30},
+	{OV5640_CIP_SH_MT_OFFSET_1, 0x10},
+	{OV5640_CIP_SH_MT_OFFSET_2, 0x00},
+	{OV5640_CIP_DNS_THRES_1, 0x08},
+	{OV5640_CIP_DNS_THRES_2, 0x30},
+	{OV5640_CIP_DNS_OFFSET_1, 0x08},
+	{OV5640_CIP_DNS_OFFSET_2, 0x16},
+	{OV5640_CIP_SH_TH_THRES_1, 0x08},
+	{OV5640_CIP_SH_TH_THRES_2, 0x30},
+	{OV5640_CIP_SH_TH_OFFSET_1, 0x04},
+	{OV5640_CIP_SH_TH_OFFSET_2, 0x06},
 
 	/* Gamma Control */
-	{0x5480, 0x01},
-	{0x5481, 0x08},
-	{0x5482, 0x14},
-	{0x5483, 0x28},
-	{0x5484, 0x51},
-	{0x5485, 0x65},
-	{0x5486, 0x71},
-	{0x5487, 0x7d},
-	{0x5488, 0x87},
-	{0x5489, 0x91},
-	{0x548a, 0x9a},
-	{0x548b, 0xaa},
-	{0x548c, 0xb8},
-	{0x548d, 0xcd},
-	{0x548e, 0xdd},
-	{0x548f, 0xea},
-	{0x5490, 0x1d},
+	{OV5640_GAMMA_CTRL_00, 0x01},
+	{OV5640_GAMMA_YST_00, 0x08},
+	{OV5640_GAMMA_YST_01, 0x14},
+	{OV5640_GAMMA_YST_02, 0x28},
+	{OV5640_GAMMA_YST_03, 0x51},
+	{OV5640_GAMMA_YST_04, 0x65},
+	{OV5640_GAMMA_YST_05, 0x71},
+	{OV5640_GAMMA_YST_06, 0x7d},
+	{OV5640_GAMMA_YST_07, 0x87},
+	{OV5640_GAMMA_YST_08, 0x91},
+	{OV5640_GAMMA_YST_09, 0x9a},
+	{OV5640_GAMMA_YST_0A, 0xaa},
+	{OV5640_GAMMA_YST_0B, 0xb8},
+	{OV5640_GAMMA_YST_0C, 0xcd},
+	{OV5640_GAMMA_YST_0D, 0xdd},
+	{OV5640_GAMMA_YST_0E, 0xea},
+	{OV5640_GAMMA_YST_0F, 0x1d},
 
 	/* SDE Control */
-	{0x5580, 0x02},
-	{0x5583, 0x40},
-	{0x5584, 0x10},
-	{0x5589, 0x10},
-	{0x558a, 0x00},
-	{0x558b, 0xf8},
+	{OV5640_SDE_CTRL_0, 0x02},
+	{OV5640_SDE_CTRL_3, 0x40},
+	{OV5640_SDE_CTRL_4, 0x10},
+	{OV5640_SDE_CTRL_9, 0x10},
+	{OV5640_SDE_CTRL_10, 0x00},
+	{OV5640_SDE_CTRL_11, 0xf8},
 
 	/* LENC Control */
-	{0x5800, 0x23},
-	{0x5801, 0x14},
-	{0x5802, 0x0f},
-	{0x5803, 0x0f},
-	{0x5804, 0x12},
-	{0x5805, 0x26},
-	{0x5806, 0x0c},
-	{0x5807, 0x08},
-	{0x5808, 0x05},
-	{0x5809, 0x05},
-	{0x580a, 0x08},
-	{0x580b, 0x0d},
-	{0x580c, 0x08},
-	{0x580d, 0x03},
-	{0x580e, 0x00},
-	{0x580f, 0x00},
-	{0x5810, 0x03},
-	{0x5811, 0x09},
-	{0x5812, 0x07},
-	{0x5813, 0x03},
-	{0x5814, 0x00},
-	{0x5815, 0x01},
-	{0x5816, 0x03},
-	{0x5817, 0x08},
-	{0x5818, 0x0d},
-	{0x5819, 0x08},
-	{0x581a, 0x05},
-	{0x581b, 0x06},
-	{0x581c, 0x08},
-	{0x581d, 0x0e},
-	{0x581e, 0x29},
-	{0x581f, 0x17},
-	{0x5820, 0x11},
-	{0x5821, 0x11},
-	{0x5822, 0x15},
-	{0x5823, 0x28},
-	{0x5824, 0x46},
-	{0x5825, 0x26},
-	{0x5826, 0x08},
-	{0x5827, 0x26},
-	{0x5828, 0x64},
-	{0x5829, 0x26},
-	{0x582a, 0x24},
-	{0x582b, 0x22},
-	{0x582c, 0x24},
-	{0x582d, 0x24},
-	{0x582e, 0x06},
-	{0x582f, 0x22},
-	{0x5830, 0x40},
-	{0x5831, 0x42},
-	{0x5832, 0x24},
-	{0x5833, 0x26},
-	{0x5834, 0x24},
-	{0x5835, 0x22},
-	{0x5836, 0x22},
-	{0x5837, 0x26},
-	{0x5838, 0x44},
-	{0x5839, 0x24},
-	{0x583a, 0x26},
-	{0x583b, 0x28},
-	{0x583c, 0x42},
-	{0x583d, 0xce},
-
-	{0x5025, 0x00},
-	{0x3a0f, 0x30},
-	{0x3a10, 0x28},
-	{0x3a1b, 0x30},
-	{0x3a1e, 0x26},
-	{0x3a11, 0x60},
-	{0x3a1f, 0x14},
-	{0x3008, 0x02},
+	{OV5640_LENC_GMTRX_00, 0x23},
+	{OV5640_LENC_GMTRX_01, 0x14},
+	{OV5640_LENC_GMTRX_02, 0x0f},
+	{OV5640_LENC_GMTRX_03, 0x0f},
+	{OV5640_LENC_GMTRX_04, 0x12},
+	{OV5640_LENC_GMTRX_05, 0x26},
+	{OV5640_LENC_GMTRX_10, 0x0c},
+	{OV5640_LENC_GMTRX_11, 0x08},
+	{OV5640_LENC_GMTRX_12, 0x05},
+	{OV5640_LENC_GMTRX_13, 0x05},
+	{OV5640_LENC_GMTRX_14, 0x08},
+	{OV5640_LENC_GMTRX_15, 0x0d},
+	{OV5640_LENC_GMTRX_20, 0x08},
+	{OV5640_LENC_GMTRX_21, 0x03},
+	{OV5640_LENC_GMTRX_22, 0x00},
+	{OV5640_LENC_GMTRX_23, 0x00},
+	{OV5640_LENC_GMTRX_24, 0x03},
+	{OV5640_LENC_GMTRX_25, 0x09},
+	{OV5640_LENC_GMTRX_30, 0x07},
+	{OV5640_LENC_GMTRX_31, 0x03},
+	{OV5640_LENC_GMTRX_32, 0x00},
+	{OV5640_LENC_GMTRX_33, 0x01},
+	{OV5640_LENC_GMTRX_34, 0x03},
+	{OV5640_LENC_GMTRX_35, 0x08},
+	{OV5640_LENC_GMTRX_40, 0x0d},
+	{OV5640_LENC_GMTRX_41, 0x08},
+	{OV5640_LENC_GMTRX_42, 0x05},
+	{OV5640_LENC_GMTRX_43, 0x06},
+	{OV5640_LENC_GMTRX_44, 0x08},
+	{OV5640_LENC_GMTRX_45, 0x0e},
+	{OV5640_LENC_GMTRX_50, 0x29},
+	{OV5640_LENC_GMTRX_51, 0x17},
+	{OV5640_LENC_GMTRX_52, 0x11},
+	{OV5640_LENC_GMTRX_53, 0x11},
+	{OV5640_LENC_GMTRX_54, 0x15},
+	{OV5640_LENC_GMTRX_55, 0x28},
+	{OV5640_LENC_BRMATRX_00, 0x46},
+	{OV5640_LENC_BRMATRX_01, 0x26},
+	{OV5640_LENC_BRMATRX_02, 0x08},
+	{OV5640_LENC_BRMATRX_03, 0x26},
+	{OV5640_LENC_BRMATRX_04, 0x64},
+	{OV5640_LENC_BRMATRX_05, 0x26},
+	{OV5640_LENC_BRMATRX_06, 0x24},
+	{OV5640_LENC_BRMATRX_07, 0x22},
+	{OV5640_LENC_BRMATRX_08, 0x24},
+	{OV5640_LENC_BRMATRX_09, 0x24},
+	{OV5640_LENC_BRMATRX_20, 0x06},
+	{OV5640_LENC_BRMATRX_21, 0x22},
+	{OV5640_LENC_BRMATRX_22, 0x40},
+	{OV5640_LENC_BRMATRX_23, 0x42},
+	{OV5640_LENC_BRMATRX_24, 0x24},
+	{OV5640_LENC_BRMATRX_30, 0x26},
+	{OV5640_LENC_BRMATRX_31, 0x24},
+	{OV5640_LENC_BRMATRX_32, 0x22},
+	{OV5640_LENC_BRMATRX_33, 0x22},
+	{OV5640_LENC_BRMATRX_34, 0x26},
+	{OV5640_LENC_BRMATRX_40, 0x44},
+	{OV5640_LENC_BRMATRX_41, 0x24},
+	{OV5640_LENC_BRMATRX_42, 0x26},
+	{OV5640_LENC_BRMATRX_43, 0x28},
+	{OV5640_LENC_BRMATRX_44, 0x42},
+	{OV5640_LENC_BR_OFFSET, 0xce},
+
+        /* magic registers */
+	{0x3620, 0x52},
+	{0x3621, 0xe0},
+	{0x3622, 0x01},
+	{0x3630, 0x36},
+	{0x3631, 0x0e},
+	{0x3632, 0xe2},
+	{0x3633, 0x12},
+	{0x3634, 0x40},
+	{0x3635, 0x13},
+	{0x3636, 0x03},
+	{0x3703, 0x5a},
+	{0x3704, 0xa0},
+	{0x3705, 0x1a},
+	{0x370b, 0x60},
+	{0x3715, 0x78},
+	{0x3717, 0x01},
+	{0x371b, 0x20},
+	{0x3731, 0x12},
+	{0x3901, 0x0a},
+	{0x3905, 0x02},
+        {0x3906, 0x10},
+        {0x471c, 0x50},
+
 	{OV5640_TABLE_END, 0x0000},
 };
 
 enum {
 	OV5640_MODE_640x480,
-	OV5640_MODE_1296x972,
+	OV5640_MODE_1280x960,
 	OV5640_MODE_1920x1080,
 	OV5640_MODE_2592x1944,
 	OV5640_SIZE_LAST,
@@ -1104,7 +885,7 @@ enum {
 
 static struct ov5640_reg *mode_table[] = {
 	[OV5640_MODE_640x480] = mode_640x480,
-	[OV5640_MODE_1296x972] = mode_1296x972,
+	[OV5640_MODE_1280x960] = mode_1280x960,
 	[OV5640_MODE_1920x1080] = mode_1920x1080,
 	[OV5640_MODE_2592x1944] = mode_2592x1944,
 };
@@ -1113,9 +894,9 @@ static int test_pattern;
 module_param(test_pattern, int, 0644);
 
 static struct ov5640_reg tp_cbars[] = {
-	{0x503D, 0x80},
-	{0x503E, 0x00},
-	{0x5046, 0x01},
+	{OV5640_ISP_TEST, ISP_TEST_EN | ISP_TEST_00 | ISP_TEST_TRANSPARENT | ISP_TEST_ROLLING },
+	{OV5640_ISP_DEBUG_3E, 0x00},
+	{OV5640_ISP_DEBUG_46, 0x01},
 	{OV5640_TABLE_END, 0x0000}
 };
 
@@ -1143,7 +924,7 @@ static enum v4l2_mbus_pixelcode ov5640_codes[] = {
 
 static const struct v4l2_frmsize_discrete ov5640_frmsizes[OV5640_SIZE_LAST] = {
 	{640, 480},
-	{1296, 972},
+	{1280, 960},
 	{1920, 1080},
 	{2592, 1944},
 };
@@ -1315,6 +1096,10 @@ static int ov5640_s_stream(struct v4l2_subdev *sd, int enable)
 		return 0;
 	}
 
+	ret = ov5640_write_table(priv, mode_common_registers);
+	if (ret)
+		return ret;
+
 	ret = ov5640_write_table(priv, mode_table[priv->mode]);
 	if (ret)
 		return ret;
@@ -1521,13 +1306,13 @@ static int ov5640_probe(struct i2c_client *client,
 	 * check and show product ID and manufacturer ID
 	 */
 	soc_camera_power_on(&client->dev, scsd);
-	ret = ov5640_read_reg(client, 0x300A, &chip_id_hi);
+	ret = ov5640_read_reg(client, OV5640_CHIP_ID_H, &chip_id_hi);
 	if (ret < 0) {
 		dev_err(&client->dev, "Failure to read Chip ID (high byte)\n");
 		return ret;
 	}
 
-	ret = ov5640_read_reg(client, 0x300B, &chip_id_lo);
+	ret = ov5640_read_reg(client, OV5640_CHIP_ID_L, &chip_id_lo);
 	if (ret < 0) {
 		dev_err(&client->dev, "Failure to read Chip ID (low byte)\n");
 		return ret;