v4l2: add macor and ov4689 4dlane configure

Signed-off-by: changhuang.liang <changhuang.liang@starfivetech.com>

diff --git a/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c b/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c
index 5a97801..9367d02 100755 (executable)
--- a/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c
+++ b/drivers/media/platform/starfive/v4l2_driver/ov4689_mipi.c
@@ -206,7 +206,258 @@ static inline struct v4l2_subdev *ctrl_to_sd(struct v4l2_ctrl *ctrl)
 
 /* ov4689 initial register */
 static const struct reg_value ov4689_init_setting_30fps_1080P[] = {
-
+/* ov4689_1080p_30fps_4d */
+       {0x0103, 0x01, 0, 0},
+       {0x3638, 0x00, 0, 0},
+       {0x0300, 0x02, 0, 0},
+       {0x0302, 0x32, 0, 0},
+       {0x0303, 0x00, 0, 0},
+       {0x0304, 0x03, 0, 0},
+       {0x030b, 0x00, 0, 0},
+       {0x030d, 0x1e, 0, 0},
+       {0x030e, 0x04, 0, 0},
+       {0x030f, 0x01, 0, 0},
+       {0x0312, 0x01, 0, 0},
+       {0x031e, 0x00, 0, 0},
+       {0x3000, 0x20, 0, 0},
+       {0x3002, 0x00, 0, 0},
+       {0x3018, 0x72, 0, 0},
+       {0x3020, 0x93, 0, 0},
+       {0x3021, 0x03, 0, 0},
+       {0x3022, 0x01, 0, 0},
+       {0x3031, 0x0a, 0, 0},
+       {0x3305, 0xf1, 0, 0},
+       {0x3307, 0x04, 0, 0},
+       {0x3309, 0x29, 0, 0},
+       {0x3500, 0x00, 0, 0},
+       {0x3501, 0x4c, 0, 0},
+       {0x3502, 0x00, 0, 0},
+       {0x3503, 0x04, 0, 0},
+       {0x3504, 0x00, 0, 0},
+       {0x3505, 0x00, 0, 0},
+       {0x3506, 0x00, 0, 0},
+       {0x3507, 0x00, 0, 0},
+       {0x3508, 0x00, 0, 0},
+       {0x3509, 0x80, 0, 0},
+       {0x350a, 0x00, 0, 0},
+       {0x350b, 0x00, 0, 0},
+       {0x350c, 0x00, 0, 0},
+       {0x350d, 0x00, 0, 0},
+       {0x350e, 0x00, 0, 0},
+       {0x350f, 0x80, 0, 0},
+       {0x3510, 0x00, 0, 0},
+       {0x3511, 0x00, 0, 0},
+       {0x3512, 0x00, 0, 0},
+       {0x3513, 0x00, 0, 0},
+       {0x3514, 0x00, 0, 0},
+       {0x3515, 0x80, 0, 0},
+       {0x3516, 0x00, 0, 0},
+       {0x3517, 0x00, 0, 0},
+       {0x3518, 0x00, 0, 0},
+       {0x3519, 0x00, 0, 0},
+       {0x351a, 0x00, 0, 0},
+       {0x351b, 0x80, 0, 0},
+       {0x351c, 0x00, 0, 0},
+       {0x351d, 0x00, 0, 0},
+       {0x351e, 0x00, 0, 0},
+       {0x351f, 0x00, 0, 0},
+       {0x3520, 0x00, 0, 0},
+       {0x3521, 0x80, 0, 0},
+       {0x3522, 0x08, 0, 0},
+       {0x3524, 0x08, 0, 0},
+       {0x3526, 0x08, 0, 0},
+       {0x3528, 0x08, 0, 0},
+       {0x352a, 0x08, 0, 0},
+       {0x3602, 0x00, 0, 0},
+       {0x3603, 0x40, 0, 0},
+       {0x3604, 0x02, 0, 0},
+       {0x3605, 0x00, 0, 0},
+       {0x3606, 0x00, 0, 0},
+       {0x3607, 0x00, 0, 0},
+       {0x3609, 0x12, 0, 0},
+       {0x360a, 0x40, 0, 0},
+       {0x360c, 0x08, 0, 0},
+       {0x360f, 0xe5, 0, 0},
+       {0x3608, 0x8f, 0, 0},
+       {0x3611, 0x00, 0, 0},
+       {0x3613, 0xf7, 0, 0},
+       {0x3616, 0x58, 0, 0},
+       {0x3619, 0x99, 0, 0},
+       {0x361b, 0x60, 0, 0},
+       {0x361c, 0x7a, 0, 0},
+       {0x361e, 0x79, 0, 0},
+       {0x361f, 0x02, 0, 0},
+       {0x3632, 0x00, 0, 0},
+       {0x3633, 0x10, 0, 0},
+       {0x3634, 0x10, 0, 0},
+       {0x3635, 0x10, 0, 0},
+       {0x3636, 0x15, 0, 0},
+       {0x3646, 0x86, 0, 0},
+       {0x364a, 0x0b, 0, 0},
+       {0x3700, 0x17, 0, 0},
+       {0x3701, 0x22, 0, 0},
+       {0x3703, 0x10, 0, 0},
+       {0x370a, 0x37, 0, 0},
+       {0x3705, 0x00, 0, 0},
+       {0x3706, 0x63, 0, 0},
+       {0x3709, 0x3c, 0, 0},
+       {0x370b, 0x01, 0, 0},
+       {0x370c, 0x30, 0, 0},
+       {0x3710, 0x24, 0, 0},
+       {0x3711, 0x0c, 0, 0},
+       {0x3716, 0x00, 0, 0},
+       {0x3720, 0x28, 0, 0},
+       {0x3729, 0x7b, 0, 0},
+       {0x372a, 0x84, 0, 0},
+       {0x372b, 0xbd, 0, 0},
+       {0x372c, 0xbc, 0, 0},
+       {0x372e, 0x52, 0, 0},
+       {0x373c, 0x0e, 0, 0},
+       {0x373e, 0x33, 0, 0},
+       {0x3743, 0x10, 0, 0},
+       {0x3744, 0x88, 0, 0},
+       {0x3745, 0xc0, 0, 0},
+       {0x374a, 0x43, 0, 0},
+       {0x374c, 0x00, 0, 0},
+       {0x374e, 0x23, 0, 0},
+       {0x3751, 0x7b, 0, 0},
+       {0x3752, 0x84, 0, 0},
+       {0x3753, 0xbd, 0, 0},
+       {0x3754, 0xbc, 0, 0},
+       {0x3756, 0x52, 0, 0},
+       {0x375c, 0x00, 0, 0},
+       {0x3760, 0x00, 0, 0},
+       {0x3761, 0x00, 0, 0},
+       {0x3762, 0x00, 0, 0},
+       {0x3763, 0x00, 0, 0},
+       {0x3764, 0x00, 0, 0},
+       {0x3767, 0x04, 0, 0},
+       {0x3768, 0x04, 0, 0},
+       {0x3769, 0x08, 0, 0},
+       {0x376a, 0x08, 0, 0},
+       {0x376b, 0x20, 0, 0},
+       {0x376c, 0x00, 0, 0},
+       {0x376d, 0x00, 0, 0},
+       {0x376e, 0x00, 0, 0},
+       {0x3773, 0x00, 0, 0},
+       {0x3774, 0x51, 0, 0},
+       {0x3776, 0xbd, 0, 0},
+       {0x3777, 0xbd, 0, 0},
+       {0x3781, 0x18, 0, 0},
+       {0x3783, 0x25, 0, 0},
+       {0x3798, 0x1b, 0, 0},
+       {0x3800, 0x01, 0, 0},
+       {0x3801, 0x88, 0, 0},
+       {0x3802, 0x00, 0, 0},
+       {0x3803, 0xe0, 0, 0},
+       {0x3804, 0x09, 0, 0},
+       {0x3805, 0x17, 0, 0},
+       {0x3806, 0x05, 0, 0},
+       {0x3807, 0x1f, 0, 0},
+       {0x3808, 0x07, 0, 0},
+       {0x3809, 0x80, 0, 0},
+       {0x380a, 0x04, 0, 0},
+       {0x380b, 0x38, 0, 0},
+       {0x380c, 0x0d, 0, 0},
+       {0x380d, 0x70, 0, 0},
+       {0x380e, 0x04, 0, 0},
+       {0x380f, 0x8A, 0, 0},
+       {0x3810, 0x00, 0, 0},
+       {0x3811, 0x08, 0, 0},
+       {0x3812, 0x00, 0, 0},
+       {0x3813, 0x04, 0, 0},
+       {0x3814, 0x01, 0, 0},
+       {0x3815, 0x01, 0, 0},
+       {0x3819, 0x01, 0, 0},
+       {0x3820, 0x06, 0, 0},
+       {0x3821, 0x00, 0, 0},
+       {0x3829, 0x00, 0, 0},
+       {0x382a, 0x01, 0, 0},
+       {0x382b, 0x01, 0, 0},
+       {0x382d, 0x7f, 0, 0},
+       {0x3830, 0x04, 0, 0},
+       {0x3836, 0x01, 0, 0},
+       {0x3837, 0x00, 0, 0},
+       {0x3841, 0x02, 0, 0},
+       {0x3846, 0x08, 0, 0},
+       {0x3847, 0x07, 0, 0},
+       {0x3d85, 0x36, 0, 0},
+       {0x3d8c, 0x71, 0, 0},
+       {0x3d8d, 0xcb, 0, 0},
+       {0x3f0a, 0x00, 0, 0},
+       {0x4000, 0xf1, 0, 0},
+       {0x4001, 0x40, 0, 0},
+       {0x4002, 0x04, 0, 0},
+       {0x4003, 0x14, 0, 0},
+       {0x400e, 0x00, 0, 0},
+       {0x4011, 0x00, 0, 0},
+       {0x401a, 0x00, 0, 0},
+       {0x401b, 0x00, 0, 0},
+       {0x401c, 0x00, 0, 0},
+       {0x401d, 0x00, 0, 0},
+       {0x401f, 0x00, 0, 0},
+       {0x4020, 0x00, 0, 0},
+       {0x4021, 0x10, 0, 0},
+       {0x4022, 0x06, 0, 0},
+       {0x4023, 0x13, 0, 0},
+       {0x4024, 0x07, 0, 0},
+       {0x4025, 0x40, 0, 0},
+       {0x4026, 0x07, 0, 0},
+       {0x4027, 0x50, 0, 0},
+       {0x4028, 0x00, 0, 0},
+       {0x4029, 0x02, 0, 0},
+       {0x402a, 0x06, 0, 0},
+       {0x402b, 0x04, 0, 0},
+       {0x402c, 0x02, 0, 0},
+       {0x402d, 0x02, 0, 0},
+       {0x402e, 0x0e, 0, 0},
+       {0x402f, 0x04, 0, 0},
+       {0x4302, 0xff, 0, 0},
+       {0x4303, 0xff, 0, 0},
+       {0x4304, 0x00, 0, 0},
+       {0x4305, 0x00, 0, 0},
+       {0x4306, 0x00, 0, 0},
+       {0x4308, 0x02, 0, 0},
+       {0x4500, 0x6c, 0, 0},
+       {0x4501, 0xc4, 0, 0},
+       {0x4502, 0x40, 0, 0},
+       {0x4503, 0x01, 0, 0},
+       {0x4601, 0x77, 0, 0},
+       {0x4800, 0x04, 0, 0},
+       {0x4813, 0x08, 0, 0},
+       {0x481f, 0x40, 0, 0},
+       {0x4829, 0x78, 0, 0},
+       {0x4837, 0x10, 0, 0},
+       {0x4b00, 0x2a, 0, 0},
+       {0x4b0d, 0x00, 0, 0},
+       {0x4d00, 0x04, 0, 0},
+       {0x4d01, 0x42, 0, 0},
+       {0x4d02, 0xd1, 0, 0},
+       {0x4d03, 0x93, 0, 0},
+       {0x4d04, 0xf5, 0, 0},
+       {0x4d05, 0xc1, 0, 0},
+       {0x5000, 0xf3, 0, 0},
+       {0x5001, 0x11, 0, 0},
+       {0x5004, 0x00, 0, 0},
+       {0x500a, 0x00, 0, 0},
+       {0x500b, 0x00, 0, 0},
+       {0x5032, 0x00, 0, 0},
+       {0x5040, 0x00, 0, 0},
+       {0x5050, 0x0c, 0, 0},
+       {0x5500, 0x00, 0, 0},
+       {0x5501, 0x10, 0, 0},
+       {0x5502, 0x01, 0, 0},
+       {0x5503, 0x0f, 0, 0},
+       {0x8000, 0x00, 0, 0},
+       {0x8001, 0x00, 0, 0},
+       {0x8002, 0x00, 0, 0},
+       {0x8003, 0x00, 0, 0},
+       {0x8004, 0x00, 0, 0},
+       {0x8005, 0x00, 0, 0},
+       {0x8006, 0x00, 0, 0},
+       {0x8007, 0x00, 0, 0},
+       {0x8008, 0x00, 0, 0},
+       {0x3638, 0x00, 0, 0},
 };
 
 static const struct reg_value ov4689_setting_VGA_640_480[] = {
@@ -1291,21 +1542,21 @@ static const struct ov4689_mode_info ov4689_mode_init_data = {
 
 static const struct ov4689_mode_info
 ov4689_mode_data[OV4689_NUM_MODES] = {
-       {OV4689_MODE_720P_1280_720, SUBSAMPLING,
-        1280, 0x408, 720, 0x305,
-        ov4689_setting_720P_1280_720,
-        ARRAY_SIZE(ov4689_setting_720P_1280_720),
-        OV4689_150_FPS},
-       {OV4689_MODE_1080P_1920_1080, SCALING,
-        1920, 0x6e0, 1080, 0x470,
-        ov4689_setting_1080P_1920_1080,
-        ARRAY_SIZE(ov4689_setting_1080P_1920_1080),
-        OV4689_60_FPS},
-       {OV4689_MODE_4M_2688_1520, SCALING,
-        2688, 0xa0a, 1520, 0x612,
-        ov4689_setting_4M_2688_1520,
-        ARRAY_SIZE(ov4689_setting_4M_2688_1520),
-        OV4689_60_FPS},
+       // {OV4689_MODE_720P_1280_720, SUBSAMPLING,
+       //  1280, 0x408, 720, 0x305,
+       //  ov4689_setting_720P_1280_720,
+       //  ARRAY_SIZE(ov4689_setting_720P_1280_720),
+       //  OV4689_150_FPS},
+       // {OV4689_MODE_1080P_1920_1080, SCALING,
+       //  1920, 0x6e0, 1080, 0x470,
+       //  ov4689_setting_1080P_1920_1080,
+       //  ARRAY_SIZE(ov4689_setting_1080P_1920_1080),
+       //  OV4689_60_FPS},
+       // {OV4689_MODE_4M_2688_1520, SCALING,
+       //  2688, 0xa0a, 1520, 0x612,
+       //  ov4689_setting_4M_2688_1520,
+       //  ARRAY_SIZE(ov4689_setting_4M_2688_1520),
+       //  OV4689_60_FPS},
 };
 
 static int ov4689_write_reg(struct ov4689_dev *sensor, u16 reg, u8 val)

diff --git a/include/video/stf-vin.h b/include/video/stf-vin.h
index 3a1209d..843e26f 100755 (executable)
--- a/include/video/stf-vin.h
+++ b/include/video/stf-vin.h
@@ -104,8 +104,44 @@
 
 #define CLK_POLARITY                           (0x1<<30)
 
-
-
+#define M31DPHY_APBCFGSAIF__SYSCFG_0   0x0
+#define M31DPHY_APBCFGSAIF__SYSCFG_4   0x4
+#define M31DPHY_APBCFGSAIF__SYSCFG_8   0x8
+#define M31DPHY_APBCFGSAIF__SYSCFG_12  0xc
+#define M31DPHY_APBCFGSAIF__SYSCFG_16  0x10
+#define M31DPHY_APBCFGSAIF__SYSCFG_20  0x14
+#define M31DPHY_APBCFGSAIF__SYSCFG_24  0x18
+#define M31DPHY_APBCFGSAIF__SYSCFG_28  0x1c
+#define M31DPHY_APBCFGSAIF__SYSCFG_32  0x20
+#define M31DPHY_APBCFGSAIF__SYSCFG_36  0x24
+#define M31DPHY_APBCFGSAIF__SYSCFG_40  0x28
+#define M31DPHY_APBCFGSAIF__SYSCFG_44  0x2c
+#define M31DPHY_APBCFGSAIF__SYSCFG_48  0x30
+#define M31DPHY_APBCFGSAIF__SYSCFG_52  0x34
+#define M31DPHY_APBCFGSAIF__SYSCFG_56  0x38
+#define M31DPHY_APBCFGSAIF__SYSCFG_60  0x3c
+#define M31DPHY_APBCFGSAIF__SYSCFG_64  0x40
+#define M31DPHY_APBCFGSAIF__SYSCFG_68  0x44
+#define M31DPHY_APBCFGSAIF__SYSCFG_72  0x48
+#define M31DPHY_APBCFGSAIF__SYSCFG_76  0x4c
+#define M31DPHY_APBCFGSAIF__SYSCFG_80  0x50
+#define M31DPHY_APBCFGSAIF__SYSCFG_84  0x54
+#define M31DPHY_APBCFGSAIF__SYSCFG_88  0x58
+#define M31DPHY_APBCFGSAIF__SYSCFG_92  0x5c
+#define M31DPHY_APBCFGSAIF__SYSCFG_96  0x60
+#define M31DPHY_APBCFGSAIF__SYSCFG_100 0x64
+#define M31DPHY_APBCFGSAIF__SYSCFG_104 0x68
+#define M31DPHY_APBCFGSAIF__SYSCFG_108 0x6c
+#define M31DPHY_APBCFGSAIF__SYSCFG_112 0x70
+#define M31DPHY_APBCFGSAIF__SYSCFG_116 0x74
+#define M31DPHY_APBCFGSAIF__SYSCFG_120 0x78
+#define M31DPHY_APBCFGSAIF__SYSCFG_124 0x7c
+#define M31DPHY_APBCFGSAIF__SYSCFG_128 0x80
+#define M31DPHY_APBCFGSAIF__SYSCFG_132 0x84
+#define M31DPHY_APBCFGSAIF__SYSCFG_136 0x88
+#define M31DPHY_APBCFGSAIF__SYSCFG_140 0x8c
+#define M31DPHY_APBCFGSAIF__SYSCFG_144 0x90
+#define M31DPHY_APBCFGSAIF__SYSCFG_184 0xb8
 
 //pmu registers
 #define SW_DEST_POWER_ON                       0x0C