diff mbox series

[v3] media: ov5640: add support of 160x120 resolution

Message ID 1602145756-4354-1-git-send-email-hugues.fruchet@st.com (mailing list archive)
State New, archived
Headers show
Series [v3] media: ov5640: add support of 160x120 resolution | expand

Commit Message

Hugues FRUCHET Oct. 8, 2020, 8:29 a.m. UTC 
Add support of 160x120 resolution.

Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
---
version 3:
  - fix wrong array affectation

version 2:
  - fix missing max framerate

 drivers/media/i2c/ov5640.c | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

Comments

Jacopo Mondi Oct. 12, 2020, 3:36 p.m. UTC | #1 
Hi Hugues,

On Thu, Oct 08, 2020 at 10:29:16AM +0200, Hugues Fruchet wrote:
> Add support of 160x120 resolution.
>
> Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>

Looks good, the new mode works for me on a CSI-2 2 lanes setup

Tested-by: Jacopo Mondi <jacopo+renesas@jmondi.org>

> ---
> version 3:
>   - fix wrong array affectation
>
> version 2:
>   - fix missing max framerate
>
>  drivers/media/i2c/ov5640.c | 26 +++++++++++++++++++++++++-
>  1 file changed, 25 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
> index 8d0254d..40d6983 100644
> --- a/drivers/media/i2c/ov5640.c
> +++ b/drivers/media/i2c/ov5640.c
> @@ -98,7 +98,8 @@
>  #define OV5640_REG_AVG_READOUT		0x56a1
>
>  enum ov5640_mode_id {
> -	OV5640_MODE_QCIF_176_144 = 0,
> +	OV5640_MODE_QQVGA_160_120 = 0,
> +	OV5640_MODE_QCIF_176_144,
>  	OV5640_MODE_QVGA_320_240,
>  	OV5640_MODE_VGA_640_480,
>  	OV5640_MODE_NTSC_720_480,
> @@ -416,6 +417,24 @@ static const struct reg_value ov5640_setting_QVGA_320_240[] = {
>  	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},
>  };
>
> +static const struct reg_value ov5640_setting_QQVGA_160_120[] = {
> +	{0x3c07, 0x08, 0, 0},
> +	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},
> +	{0x3814, 0x31, 0, 0},
> +	{0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0},
> +	{0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0},
> +	{0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0},
> +	{0x3810, 0x00, 0, 0},
> +	{0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0},
> +	{0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0},
> +	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0},
> +	{0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0},
> +	{0x3a0a, 0x00, 0, 0}, {0x3a0b, 0xf6, 0, 0}, {0x3a0e, 0x03, 0, 0},
> +	{0x3a0d, 0x04, 0, 0}, {0x3a14, 0x03, 0, 0}, {0x3a15, 0xd8, 0, 0},
> +	{0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0},
> +	{0x4407, 0x04, 0, 0}, {0x5001, 0xa3, 0, 0},
> +};
> +
>  static const struct reg_value ov5640_setting_QCIF_176_144[] = {
>  	{0x3c07, 0x08, 0, 0},
>  	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},
> @@ -552,6 +571,11 @@ static const struct ov5640_mode_info ov5640_mode_init_data = {
>
>  static const struct ov5640_mode_info
>  ov5640_mode_data[OV5640_NUM_MODES] = {
> +	{OV5640_MODE_QQVGA_160_120, SUBSAMPLING,
> +	 160, 1896, 120, 984,

These values do not match what's actually applied on the sensor, but
this is not only related to this patch.

See ff66ea3a-bd2e-9bd6-894c-bf372de69a31@ti.com
I should try to re-submit Tomi's patch and the on-top clock rework.

You have a CSI-2 setup too, right ?

Thanks
  j

> +	 ov5640_setting_QQVGA_160_120,
> +	 ARRAY_SIZE(ov5640_setting_QQVGA_160_120),
> +	 OV5640_30_FPS},
>  	{OV5640_MODE_QCIF_176_144, SUBSAMPLING,
>  	 176, 1896, 144, 984,
>  	 ov5640_setting_QCIF_176_144,
> --
> 2.7.4
>
Hugues FRUCHET Oct. 13, 2020, 8:48 a.m. UTC | #2 
Hi Jacopo,

On 10/12/20 5:36 PM, Jacopo Mondi wrote:
> Hi Hugues,
> 
> On Thu, Oct 08, 2020 at 10:29:16AM +0200, Hugues Fruchet wrote:
>> Add support of 160x120 resolution.
>>
>> Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
> 
> Looks good, the new mode works for me on a CSI-2 2 lanes setup
> 
> Tested-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
> 
>> ---
>> version 3:
>>    - fix wrong array affectation
>>
>> version 2:
>>    - fix missing max framerate
>>
>>   drivers/media/i2c/ov5640.c | 26 +++++++++++++++++++++++++-
>>   1 file changed, 25 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
>> index 8d0254d..40d6983 100644
>> --- a/drivers/media/i2c/ov5640.c
>> +++ b/drivers/media/i2c/ov5640.c
>> @@ -98,7 +98,8 @@
>>   #define OV5640_REG_AVG_READOUT		0x56a1
>>
>>   enum ov5640_mode_id {
>> -	OV5640_MODE_QCIF_176_144 = 0,
>> +	OV5640_MODE_QQVGA_160_120 = 0,
>> +	OV5640_MODE_QCIF_176_144,
>>   	OV5640_MODE_QVGA_320_240,
>>   	OV5640_MODE_VGA_640_480,
>>   	OV5640_MODE_NTSC_720_480,
>> @@ -416,6 +417,24 @@ static const struct reg_value ov5640_setting_QVGA_320_240[] = {
>>   	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},
>>   };
>>
>> +static const struct reg_value ov5640_setting_QQVGA_160_120[] = {
>> +	{0x3c07, 0x08, 0, 0},
>> +	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},
>> +	{0x3814, 0x31, 0, 0},
>> +	{0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0},
>> +	{0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0},
>> +	{0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0},
>> +	{0x3810, 0x00, 0, 0},
>> +	{0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0},
>> +	{0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0},
>> +	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0},
>> +	{0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0},
>> +	{0x3a0a, 0x00, 0, 0}, {0x3a0b, 0xf6, 0, 0}, {0x3a0e, 0x03, 0, 0},
>> +	{0x3a0d, 0x04, 0, 0}, {0x3a14, 0x03, 0, 0}, {0x3a15, 0xd8, 0, 0},
>> +	{0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0},
>> +	{0x4407, 0x04, 0, 0}, {0x5001, 0xa3, 0, 0},
>> +};
>> +
>>   static const struct reg_value ov5640_setting_QCIF_176_144[] = {
>>   	{0x3c07, 0x08, 0, 0},
>>   	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},
>> @@ -552,6 +571,11 @@ static const struct ov5640_mode_info ov5640_mode_init_data = {
>>
>>   static const struct ov5640_mode_info
>>   ov5640_mode_data[OV5640_NUM_MODES] = {
>> +	{OV5640_MODE_QQVGA_160_120, SUBSAMPLING,
>> +	 160, 1896, 120, 984,
> 
> These values do not match what's actually applied on the sensor, but
> this is not only related to this patch.
> 
> See ff66ea3a-bd2e-9bd6-894c-bf372de69a31@ti.com
> I should try to re-submit Tomi's patch and the on-top clock rework.

Thanks Jacopo, but there is a problem with link above about Tomi's patch.

> 
> You have a CSI-2 setup too, right ?
Yes I have, it's an Avenger 96board running STM32MP1 & an ST MIPID02 
bridge with D3 engineering OV5640 CSI-2 mezzanine.

> 
> Thanks
>    j
> 
>> +	 ov5640_setting_QQVGA_160_120,
>> +	 ARRAY_SIZE(ov5640_setting_QQVGA_160_120),
>> +	 OV5640_30_FPS},
>>   	{OV5640_MODE_QCIF_176_144, SUBSAMPLING,
>>   	 176, 1896, 144, 984,
>>   	 ov5640_setting_QCIF_176_144,
>> --
>> 2.7.4
>>

BR,
Hugues.
Jacopo Mondi Oct. 13, 2020, 9:17 a.m. UTC | #3 
Hi Hugues,

On Tue, Oct 13, 2020 at 08:48:41AM +0000, Hugues FRUCHET wrote:
> Hi Jacopo,
>
> On 10/12/20 5:36 PM, Jacopo Mondi wrote:
> > Hi Hugues,
> >
> > On Thu, Oct 08, 2020 at 10:29:16AM +0200, Hugues Fruchet wrote:
> >> Add support of 160x120 resolution.
> >>
> >> Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
> >
> > Looks good, the new mode works for me on a CSI-2 2 lanes setup
> >
> > Tested-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
> >
> >> ---
> >> version 3:
> >>    - fix wrong array affectation
> >>
> >> version 2:
> >>    - fix missing max framerate
> >>
> >>   drivers/media/i2c/ov5640.c | 26 +++++++++++++++++++++++++-
> >>   1 file changed, 25 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
> >> index 8d0254d..40d6983 100644
> >> --- a/drivers/media/i2c/ov5640.c
> >> +++ b/drivers/media/i2c/ov5640.c
> >> @@ -98,7 +98,8 @@
> >>   #define OV5640_REG_AVG_READOUT		0x56a1
> >>
> >>   enum ov5640_mode_id {
> >> -	OV5640_MODE_QCIF_176_144 = 0,
> >> +	OV5640_MODE_QQVGA_160_120 = 0,
> >> +	OV5640_MODE_QCIF_176_144,
> >>   	OV5640_MODE_QVGA_320_240,
> >>   	OV5640_MODE_VGA_640_480,
> >>   	OV5640_MODE_NTSC_720_480,
> >> @@ -416,6 +417,24 @@ static const struct reg_value ov5640_setting_QVGA_320_240[] = {
> >>   	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},
> >>   };
> >>
> >> +static const struct reg_value ov5640_setting_QQVGA_160_120[] = {
> >> +	{0x3c07, 0x08, 0, 0},
> >> +	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},
> >> +	{0x3814, 0x31, 0, 0},
> >> +	{0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0},
> >> +	{0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0},
> >> +	{0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0},
> >> +	{0x3810, 0x00, 0, 0},
> >> +	{0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0},
> >> +	{0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0},
> >> +	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0},
> >> +	{0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0},
> >> +	{0x3a0a, 0x00, 0, 0}, {0x3a0b, 0xf6, 0, 0}, {0x3a0e, 0x03, 0, 0},
> >> +	{0x3a0d, 0x04, 0, 0}, {0x3a14, 0x03, 0, 0}, {0x3a15, 0xd8, 0, 0},
> >> +	{0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0},
> >> +	{0x4407, 0x04, 0, 0}, {0x5001, 0xa3, 0, 0},
> >> +};
> >> +
> >>   static const struct reg_value ov5640_setting_QCIF_176_144[] = {
> >>   	{0x3c07, 0x08, 0, 0},
> >>   	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},
> >> @@ -552,6 +571,11 @@ static const struct ov5640_mode_info ov5640_mode_init_data = {
> >>
> >>   static const struct ov5640_mode_info
> >>   ov5640_mode_data[OV5640_NUM_MODES] = {
> >> +	{OV5640_MODE_QQVGA_160_120, SUBSAMPLING,
> >> +	 160, 1896, 120, 984,
> >
> > These values do not match what's actually applied on the sensor, but
> > this is not only related to this patch.
> >
> > See ff66ea3a-bd2e-9bd6-894c-bf372de69a31@ti.com
> > I should try to re-submit Tomi's patch and the on-top clock rework.
>
> Thanks Jacopo, but there is a problem with link above about Tomi's patch.

Yeah, that's the message-id not a link, a link would be more useful I
agree:
https://lore.kernel.org/linux-media/d0510b81-9ae1-9b6f-02c5-f4eb08e67bfa@ti.com/

Thanks
  j
diff mbox series

Patch

diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index 8d0254d..40d6983 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -98,7 +98,8 @@ 
 #define OV5640_REG_AVG_READOUT		0x56a1
 
 enum ov5640_mode_id {
-	OV5640_MODE_QCIF_176_144 = 0,
+	OV5640_MODE_QQVGA_160_120 = 0,
+	OV5640_MODE_QCIF_176_144,
 	OV5640_MODE_QVGA_320_240,
 	OV5640_MODE_VGA_640_480,
 	OV5640_MODE_NTSC_720_480,
@@ -416,6 +417,24 @@  static const struct reg_value ov5640_setting_QVGA_320_240[] = {
 	{0x3824, 0x02, 0, 0}, {0x5001, 0xa3, 0, 0},
 };
 
+static const struct reg_value ov5640_setting_QQVGA_160_120[] = {
+	{0x3c07, 0x08, 0, 0},
+	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},
+	{0x3814, 0x31, 0, 0},
+	{0x3815, 0x31, 0, 0}, {0x3800, 0x00, 0, 0}, {0x3801, 0x00, 0, 0},
+	{0x3802, 0x00, 0, 0}, {0x3803, 0x04, 0, 0}, {0x3804, 0x0a, 0, 0},
+	{0x3805, 0x3f, 0, 0}, {0x3806, 0x07, 0, 0}, {0x3807, 0x9b, 0, 0},
+	{0x3810, 0x00, 0, 0},
+	{0x3811, 0x10, 0, 0}, {0x3812, 0x00, 0, 0}, {0x3813, 0x06, 0, 0},
+	{0x3618, 0x00, 0, 0}, {0x3612, 0x29, 0, 0}, {0x3708, 0x64, 0, 0},
+	{0x3709, 0x52, 0, 0}, {0x370c, 0x03, 0, 0}, {0x3a02, 0x03, 0, 0},
+	{0x3a03, 0xd8, 0, 0}, {0x3a08, 0x01, 0, 0}, {0x3a09, 0x27, 0, 0},
+	{0x3a0a, 0x00, 0, 0}, {0x3a0b, 0xf6, 0, 0}, {0x3a0e, 0x03, 0, 0},
+	{0x3a0d, 0x04, 0, 0}, {0x3a14, 0x03, 0, 0}, {0x3a15, 0xd8, 0, 0},
+	{0x4001, 0x02, 0, 0}, {0x4004, 0x02, 0, 0},
+	{0x4407, 0x04, 0, 0}, {0x5001, 0xa3, 0, 0},
+};
+
 static const struct reg_value ov5640_setting_QCIF_176_144[] = {
 	{0x3c07, 0x08, 0, 0},
 	{0x3c09, 0x1c, 0, 0}, {0x3c0a, 0x9c, 0, 0}, {0x3c0b, 0x40, 0, 0},
@@ -552,6 +571,11 @@  static const struct ov5640_mode_info ov5640_mode_init_data = {
 
 static const struct ov5640_mode_info
 ov5640_mode_data[OV5640_NUM_MODES] = {
+	{OV5640_MODE_QQVGA_160_120, SUBSAMPLING,
+	 160, 1896, 120, 984,
+	 ov5640_setting_QQVGA_160_120,
+	 ARRAY_SIZE(ov5640_setting_QQVGA_160_120),
+	 OV5640_30_FPS},
 	{OV5640_MODE_QCIF_176_144, SUBSAMPLING,
 	 176, 1896, 144, 984,
 	 ov5640_setting_QCIF_176_144,