OSDN Git Service

(root) / tomoyo / tomoyo-test1.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e907bd6)
media: ov5647: Add SGGBR10_1X10 modes
authorJacopo Mondi <jacopo@jmondi.org>
Thu, 19 Nov 2020 16:32:36 +0000 (17:32 +0100)
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Tue, 12 Jan 2021 15:16:02 +0000 (16:16 +0100)
Add 4 additional sensor modes in SBGGR10_1X10 format.

Add the following resolutions:
- 2592x1944 full resolution
- 1920x1080 1080p cropped
- 1296x972 2x2 binned
- 640x480 2x2 binned, 2x2 subsampled

The register lists and modes definition have been upported from the
RaspberryPi BSP at revision:
commit 581dfda6d0a62 ("media: i2c: ov5647: Advertise the correct exposure range")

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
drivers/media/i2c/ov5647.c patch | blob | history

diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
index 0234aed..e206656 100644 (file)
--- a/drivers/media/i2c/ov5647.c
+++ b/drivers/media/i2c/ov5647.c
@@ -205,6 +205,367 @@ static const struct regval_list ov5647_640x480_8bpp[] = {
        {0x0100, 0x01},
 };
 
+static struct regval_list ov5647_2592x1944_10bpp[] = {
+       {0x0100, 0x00},
+       {0x0103, 0x01},
+       {0x3034, 0x1a},
+       {0x3035, 0x21},
+       {0x3036, 0x69},
+       {0x303c, 0x11},
+       {0x3106, 0xf5},
+       {0x3821, 0x06},
+       {0x3820, 0x00},
+       {0x3827, 0xec},
+       {0x370c, 0x03},
+       {0x3612, 0x5b},
+       {0x3618, 0x04},
+       {0x5000, 0x06},
+       {0x5002, 0x41},
+       {0x5003, 0x08},
+       {0x5a00, 0x08},
+       {0x3000, 0x00},
+       {0x3001, 0x00},
+       {0x3002, 0x00},
+       {0x3016, 0x08},
+       {0x3017, 0xe0},
+       {0x3018, 0x44},
+       {0x301c, 0xf8},
+       {0x301d, 0xf0},
+       {0x3a18, 0x00},
+       {0x3a19, 0xf8},
+       {0x3c01, 0x80},
+       {0x3b07, 0x0c},
+       {0x380c, 0x0b},
+       {0x380d, 0x1c},
+       {0x3814, 0x11},
+       {0x3815, 0x11},
+       {0x3708, 0x64},
+       {0x3709, 0x12},
+       {0x3808, 0x0a},
+       {0x3809, 0x20},
+       {0x380a, 0x07},
+       {0x380b, 0x98},
+       {0x3800, 0x00},
+       {0x3801, 0x00},
+       {0x3802, 0x00},
+       {0x3803, 0x00},
+       {0x3804, 0x0a},
+       {0x3805, 0x3f},
+       {0x3806, 0x07},
+       {0x3807, 0xa3},
+       {0x3811, 0x10},
+       {0x3813, 0x06},
+       {0x3630, 0x2e},
+       {0x3632, 0xe2},
+       {0x3633, 0x23},
+       {0x3634, 0x44},
+       {0x3636, 0x06},
+       {0x3620, 0x64},
+       {0x3621, 0xe0},
+       {0x3600, 0x37},
+       {0x3704, 0xa0},
+       {0x3703, 0x5a},
+       {0x3715, 0x78},
+       {0x3717, 0x01},
+       {0x3731, 0x02},
+       {0x370b, 0x60},
+       {0x3705, 0x1a},
+       {0x3f05, 0x02},
+       {0x3f06, 0x10},
+       {0x3f01, 0x0a},
+       {0x3a08, 0x01},
+       {0x3a09, 0x28},
+       {0x3a0a, 0x00},
+       {0x3a0b, 0xf6},
+       {0x3a0d, 0x08},
+       {0x3a0e, 0x06},
+       {0x3a0f, 0x58},
+       {0x3a10, 0x50},
+       {0x3a1b, 0x58},
+       {0x3a1e, 0x50},
+       {0x3a11, 0x60},
+       {0x3a1f, 0x28},
+       {0x4001, 0x02},
+       {0x4004, 0x04},
+       {0x4000, 0x09},
+       {0x4837, 0x19},
+       {0x4800, 0x24},
+       {0x3503, 0x03},
+       {0x0100, 0x01},
+};
+
+static struct regval_list ov5647_1080p30_10bpp[] = {
+       {0x0100, 0x00},
+       {0x0103, 0x01},
+       {0x3034, 0x1a},
+       {0x3035, 0x21},
+       {0x3036, 0x62},
+       {0x303c, 0x11},
+       {0x3106, 0xf5},
+       {0x3821, 0x06},
+       {0x3820, 0x00},
+       {0x3827, 0xec},
+       {0x370c, 0x03},
+       {0x3612, 0x5b},
+       {0x3618, 0x04},
+       {0x5000, 0x06},
+       {0x5002, 0x41},
+       {0x5003, 0x08},
+       {0x5a00, 0x08},
+       {0x3000, 0x00},
+       {0x3001, 0x00},
+       {0x3002, 0x00},
+       {0x3016, 0x08},
+       {0x3017, 0xe0},
+       {0x3018, 0x44},
+       {0x301c, 0xf8},
+       {0x301d, 0xf0},
+       {0x3a18, 0x00},
+       {0x3a19, 0xf8},
+       {0x3c01, 0x80},
+       {0x3b07, 0x0c},
+       {0x380c, 0x09},
+       {0x380d, 0x70},
+       {0x3814, 0x11},
+       {0x3815, 0x11},
+       {0x3708, 0x64},
+       {0x3709, 0x12},
+       {0x3808, 0x07},
+       {0x3809, 0x80},
+       {0x380a, 0x04},
+       {0x380b, 0x38},
+       {0x3800, 0x01},
+       {0x3801, 0x5c},
+       {0x3802, 0x01},
+       {0x3803, 0xb2},
+       {0x3804, 0x08},
+       {0x3805, 0xe3},
+       {0x3806, 0x05},
+       {0x3807, 0xf1},
+       {0x3811, 0x04},
+       {0x3813, 0x02},
+       {0x3630, 0x2e},
+       {0x3632, 0xe2},
+       {0x3633, 0x23},
+       {0x3634, 0x44},
+       {0x3636, 0x06},
+       {0x3620, 0x64},
+       {0x3621, 0xe0},
+       {0x3600, 0x37},
+       {0x3704, 0xa0},
+       {0x3703, 0x5a},
+       {0x3715, 0x78},
+       {0x3717, 0x01},
+       {0x3731, 0x02},
+       {0x370b, 0x60},
+       {0x3705, 0x1a},
+       {0x3f05, 0x02},
+       {0x3f06, 0x10},
+       {0x3f01, 0x0a},
+       {0x3a08, 0x01},
+       {0x3a09, 0x4b},
+       {0x3a0a, 0x01},
+       {0x3a0b, 0x13},
+       {0x3a0d, 0x04},
+       {0x3a0e, 0x03},
+       {0x3a0f, 0x58},
+       {0x3a10, 0x50},
+       {0x3a1b, 0x58},
+       {0x3a1e, 0x50},
+       {0x3a11, 0x60},
+       {0x3a1f, 0x28},
+       {0x4001, 0x02},
+       {0x4004, 0x04},
+       {0x4000, 0x09},
+       {0x4837, 0x19},
+       {0x4800, 0x34},
+       {0x3503, 0x03},
+       {0x0100, 0x01},
+};
+
+static struct regval_list ov5647_2x2binned_10bpp[] = {
+       {0x0100, 0x00},
+       {0x0103, 0x01},
+       {0x3034, 0x1a},
+       {0x3035, 0x21},
+       {0x3036, 0x62},
+       {0x303c, 0x11},
+       {0x3106, 0xf5},
+       {0x3827, 0xec},
+       {0x370c, 0x03},
+       {0x3612, 0x59},
+       {0x3618, 0x00},
+       {0x5000, 0x06},
+       {0x5002, 0x41},
+       {0x5003, 0x08},
+       {0x5a00, 0x08},
+       {0x3000, 0x00},
+       {0x3001, 0x00},
+       {0x3002, 0x00},
+       {0x3016, 0x08},
+       {0x3017, 0xe0},
+       {0x3018, 0x44},
+       {0x301c, 0xf8},
+       {0x301d, 0xf0},
+       {0x3a18, 0x00},
+       {0x3a19, 0xf8},
+       {0x3c01, 0x80},
+       {0x3b07, 0x0c},
+       {0x3800, 0x00},
+       {0x3801, 0x00},
+       {0x3802, 0x00},
+       {0x3803, 0x00},
+       {0x3804, 0x0a},
+       {0x3805, 0x3f},
+       {0x3806, 0x07},
+       {0x3807, 0xa3},
+       {0x3808, 0x05},
+       {0x3809, 0x10},
+       {0x380a, 0x03},
+       {0x380b, 0xcc},
+       {0x380c, 0x07},
+       {0x380d, 0x68},
+       {0x3811, 0x0c},
+       {0x3813, 0x06},
+       {0x3814, 0x31},
+       {0x3815, 0x31},
+       {0x3630, 0x2e},
+       {0x3632, 0xe2},
+       {0x3633, 0x23},
+       {0x3634, 0x44},
+       {0x3636, 0x06},
+       {0x3620, 0x64},
+       {0x3621, 0xe0},
+       {0x3600, 0x37},
+       {0x3704, 0xa0},
+       {0x3703, 0x5a},
+       {0x3715, 0x78},
+       {0x3717, 0x01},
+       {0x3731, 0x02},
+       {0x370b, 0x60},
+       {0x3705, 0x1a},
+       {0x3f05, 0x02},
+       {0x3f06, 0x10},
+       {0x3f01, 0x0a},
+       {0x3a08, 0x01},
+       {0x3a09, 0x28},
+       {0x3a0a, 0x00},
+       {0x3a0b, 0xf6},
+       {0x3a0d, 0x08},
+       {0x3a0e, 0x06},
+       {0x3a0f, 0x58},
+       {0x3a10, 0x50},
+       {0x3a1b, 0x58},
+       {0x3a1e, 0x50},
+       {0x3a11, 0x60},
+       {0x3a1f, 0x28},
+       {0x4001, 0x02},
+       {0x4004, 0x04},
+       {0x4000, 0x09},
+       {0x4837, 0x16},
+       {0x4800, 0x24},
+       {0x3503, 0x03},
+       {0x3820, 0x41},
+       {0x3821, 0x07},
+       {0x350a, 0x00},
+       {0x350b, 0x10},
+       {0x3500, 0x00},
+       {0x3501, 0x1a},
+       {0x3502, 0xf0},
+       {0x3212, 0xa0},
+       {0x0100, 0x01},
+};
+
+static struct regval_list ov5647_640x480_10bpp[] = {
+       {0x0100, 0x00},
+       {0x0103, 0x01},
+       {0x3035, 0x11},
+       {0x3036, 0x46},
+       {0x303c, 0x11},
+       {0x3821, 0x07},
+       {0x3820, 0x41},
+       {0x370c, 0x03},
+       {0x3612, 0x59},
+       {0x3618, 0x00},
+       {0x5000, 0x06},
+       {0x5003, 0x08},
+       {0x5a00, 0x08},
+       {0x3000, 0xff},
+       {0x3001, 0xff},
+       {0x3002, 0xff},
+       {0x301d, 0xf0},
+       {0x3a18, 0x00},
+       {0x3a19, 0xf8},
+       {0x3c01, 0x80},
+       {0x3b07, 0x0c},
+       {0x380c, 0x07},
+       {0x380d, 0x3c},
+       {0x3814, 0x35},
+       {0x3815, 0x35},
+       {0x3708, 0x64},
+       {0x3709, 0x52},
+       {0x3808, 0x02},
+       {0x3809, 0x80},
+       {0x380a, 0x01},
+       {0x380b, 0xe0},
+       {0x3800, 0x00},
+       {0x3801, 0x10},
+       {0x3802, 0x00},
+       {0x3803, 0x00},
+       {0x3804, 0x0a},
+       {0x3805, 0x2f},
+       {0x3806, 0x07},
+       {0x3807, 0x9f},
+       {0x3630, 0x2e},
+       {0x3632, 0xe2},
+       {0x3633, 0x23},
+       {0x3634, 0x44},
+       {0x3620, 0x64},
+       {0x3621, 0xe0},
+       {0x3600, 0x37},
+       {0x3704, 0xa0},
+       {0x3703, 0x5a},
+       {0x3715, 0x78},
+       {0x3717, 0x01},
+       {0x3731, 0x02},
+       {0x370b, 0x60},
+       {0x3705, 0x1a},
+       {0x3f05, 0x02},
+       {0x3f06, 0x10},
+       {0x3f01, 0x0a},
+       {0x3a08, 0x01},
+       {0x3a09, 0x2e},
+       {0x3a0a, 0x00},
+       {0x3a0b, 0xfb},
+       {0x3a0d, 0x02},
+       {0x3a0e, 0x01},
+       {0x3a0f, 0x58},
+       {0x3a10, 0x50},
+       {0x3a1b, 0x58},
+       {0x3a1e, 0x50},
+       {0x3a11, 0x60},
+       {0x3a1f, 0x28},
+       {0x4001, 0x02},
+       {0x4004, 0x02},
+       {0x4000, 0x09},
+       {0x3000, 0x00},
+       {0x3001, 0x00},
+       {0x3002, 0x00},
+       {0x3017, 0xe0},
+       {0x301c, 0xfc},
+       {0x3636, 0x06},
+       {0x3016, 0x08},
+       {0x3827, 0xec},
+       {0x3018, 0x44},
+       {0x3035, 0x21},
+       {0x3106, 0xf5},
+       {0x3034, 0x1a},
+       {0x301c, 0xf8},
+       {0x4800, 0x34},
+       {0x3503, 0x03},
+       {0x0100, 0x01},
+};
+
 static const struct ov5647_mode ov5647_8bpp_modes[] = {
        /* 8-bit VGA mode: Uncentred crop 2x2 binned 1296x972 image. */
        {
@@ -226,12 +587,92 @@ static const struct ov5647_mode ov5647_8bpp_modes[] = {
        },
 };
 
+static const struct ov5647_mode ov5647_10bpp_modes[] = {
+       /* 2592x1944 full resolution full FOV 10-bit mode. */
+       {
+               .format = {
+                       .code           = MEDIA_BUS_FMT_SBGGR10_1X10,
+                       .colorspace     = V4L2_COLORSPACE_SRGB,
+                       .field          = V4L2_FIELD_NONE,
+                       .width          = 2592,
+                       .height         = 1944
+               },
+               .crop = {
+                       .left           = OV5647_PIXEL_ARRAY_LEFT,
+                       .top            = OV5647_PIXEL_ARRAY_TOP,
+                       .width          = 2592,
+                       .height         = 1944
+               },
+               .reg_list       = ov5647_2592x1944_10bpp,
+               .num_regs       = ARRAY_SIZE(ov5647_2592x1944_10bpp)
+       },
+       /* 1080p30 10-bit mode. Full resolution centre-cropped down to 1080p. */
+       {
+               .format = {
+                       .code           = MEDIA_BUS_FMT_SBGGR10_1X10,
+                       .colorspace     = V4L2_COLORSPACE_SRGB,
+                       .field          = V4L2_FIELD_NONE,
+                       .width          = 1920,
+                       .height         = 1080
+               },
+               .crop = {
+                       .left           = 348 + OV5647_PIXEL_ARRAY_LEFT,
+                       .top            = 434 + OV5647_PIXEL_ARRAY_TOP,
+                       .width          = 1928,
+                       .height         = 1080,
+               },
+               .reg_list       = ov5647_1080p30_10bpp,
+               .num_regs       = ARRAY_SIZE(ov5647_1080p30_10bpp)
+       },
+       /* 2x2 binned full FOV 10-bit mode. */
+       {
+               .format = {
+                       .code           = MEDIA_BUS_FMT_SBGGR10_1X10,
+                       .colorspace     = V4L2_COLORSPACE_SRGB,
+                       .field          = V4L2_FIELD_NONE,
+                       .width          = 1296,
+                       .height         = 972
+               },
+               .crop = {
+                       .left           = OV5647_PIXEL_ARRAY_LEFT,
+                       .top            = OV5647_PIXEL_ARRAY_TOP,
+                       .width          = 2592,
+                       .height         = 1944,
+               },
+               .reg_list       = ov5647_2x2binned_10bpp,
+               .num_regs       = ARRAY_SIZE(ov5647_2x2binned_10bpp)
+       },
+       /* 10-bit VGA full FOV 60fps. 2x2 binned and subsampled down to VGA. */
+       {
+               .format = {
+                       .code           = MEDIA_BUS_FMT_SBGGR10_1X10,
+                       .colorspace     = V4L2_COLORSPACE_SRGB,
+                       .field          = V4L2_FIELD_NONE,
+                       .width          = 640,
+                       .height         = 480
+               },
+               .crop = {
+                       .left           = 16 + OV5647_PIXEL_ARRAY_LEFT,
+                       .top            = OV5647_PIXEL_ARRAY_TOP,
+                       .width          = 2560,
+                       .height         = 1920,
+               },
+               .reg_list       = ov5647_640x480_10bpp,
+               .num_regs       = ARRAY_SIZE(ov5647_640x480_10bpp)
+       },
+};
+
 static const struct ov5647_format_list ov5647_formats[] = {
        {
                .mbus_code      = MEDIA_BUS_FMT_SBGGR8_1X8,
                .modes          = ov5647_8bpp_modes,
                .num_modes      = ARRAY_SIZE(ov5647_8bpp_modes),
        },
+       {
+               .mbus_code      = MEDIA_BUS_FMT_SBGGR10_1X10,
+               .modes          = ov5647_10bpp_modes,
+               .num_modes      = ARRAY_SIZE(ov5647_10bpp_modes),
+       },
 };
 
 #define OV5647_NUM_FORMATS     (ARRAY_SIZE(ov5647_formats))
This is a test repository.
About OSDN
Find Software
Develop Software
Help