1. Patchew
  2. linux
  3. View series

[PATCH v2] media: mt9p031: Refactor format handling for different sensor models

Tarang Raval posted 1 patch 1 year, 3 months ago
There is a newer version of this series
drivers/media/i2c/mt9p031.c | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
[PATCH v2] media: mt9p031: Refactor format handling for different sensor models
Posted by Tarang Raval 1 year, 3 months ago 
Add new structure 'mt9p031_model_info' to encapsulate format codes for
the mt9p031 camera sensor family. This approach enhances code clarity
and maintainability.

Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io>
---
 drivers/media/i2c/mt9p031.c | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c
index f2f52f484044..3576d3066738 100644
--- a/drivers/media/i2c/mt9p031.c
+++ b/drivers/media/i2c/mt9p031.c
@@ -112,6 +112,24 @@
 #define MT9P031_TEST_PATTERN_RED			0xa2
 #define MT9P031_TEST_PATTERN_BLUE			0xa3
 
+struct mt9p031_model_info {
+	u32 code;
+};
+
+enum mt9p031_model {
+	MT9P031_MODEL_BAYER,
+	MT9P031_MODEL_MONO,
+};
+
+static const struct mt9p031_model_info mt9p031_models[] = {
+	[MT9P031_MODEL_BAYER] = {
+		.code = MEDIA_BUS_FMT_SGRBG12_1X12,
+	},
+	[MT9P031_MODEL_MONO] = {
+		.code = MEDIA_BUS_FMT_Y12_1X12,
+	},
+};
+
 struct mt9p031 {
 	struct v4l2_subdev subdev;
 	struct media_pad pad;
@@ -1209,9 +1227,16 @@ static void mt9p031_remove(struct i2c_client *client)
 }
 
 static const struct of_device_id mt9p031_of_match[] = {
-	{ .compatible = "aptina,mt9p006", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 },
-	{ .compatible = "aptina,mt9p031", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 },
-	{ .compatible = "aptina,mt9p031m", .data = (void *)MEDIA_BUS_FMT_Y12_1X12 },
+	{
+		.compatible = "aptina,mt9p006",
+		.data = &mt9p031_models[MT9P031_MODEL_BAYER]
+	}, {
+		.compatible = "aptina,mt9p031",
+		.data = &mt9p031_models[MT9P031_MODEL_BAYER]
+	}, {
+		.compatible = "aptina,mt9p031m",
+		.data = &mt9p031_models[MT9P031_MODEL_MONO]
+	},
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, mt9p031_of_match);
-- 
2.43.0
Re: [PATCH v2] media: mt9p031: Refactor format handling for different sensor models
Posted by Sakari Ailus 1 year, 3 months ago 
Hi Tarang,

On Sat, Oct 26, 2024 at 03:45:40AM +0530, Tarang Raval wrote:
> Add new structure 'mt9p031_model_info' to encapsulate format codes for
> the mt9p031 camera sensor family. This approach enhances code clarity
> and maintainability.
> 
> Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io>
> ---
>  drivers/media/i2c/mt9p031.c | 31 ++++++++++++++++++++++++++++---
>  1 file changed, 28 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c
> index f2f52f484044..3576d3066738 100644
> --- a/drivers/media/i2c/mt9p031.c
> +++ b/drivers/media/i2c/mt9p031.c
> @@ -112,6 +112,24 @@
>  #define MT9P031_TEST_PATTERN_RED			0xa2
>  #define MT9P031_TEST_PATTERN_BLUE			0xa3
>  
> +struct mt9p031_model_info {
> +	u32 code;
> +};
> +
> +enum mt9p031_model {
> +	MT9P031_MODEL_BAYER,
> +	MT9P031_MODEL_MONO,
> +};
> +
> +static const struct mt9p031_model_info mt9p031_models[] = {
> +	[MT9P031_MODEL_BAYER] = {
> +		.code = MEDIA_BUS_FMT_SGRBG12_1X12,
> +	},
> +	[MT9P031_MODEL_MONO] = {
> +		.code = MEDIA_BUS_FMT_Y12_1X12,
> +	},
> +};
> +
>  struct mt9p031 {
>  	struct v4l2_subdev subdev;
>  	struct media_pad pad;
> @@ -1209,9 +1227,16 @@ static void mt9p031_remove(struct i2c_client *client)
>  }
>  
>  static const struct of_device_id mt9p031_of_match[] = {
> -	{ .compatible = "aptina,mt9p006", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 },
> -	{ .compatible = "aptina,mt9p031", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 },
> -	{ .compatible = "aptina,mt9p031m", .data = (void *)MEDIA_BUS_FMT_Y12_1X12 },
> +	{
> +		.compatible = "aptina,mt9p006",
> +		.data = &mt9p031_models[MT9P031_MODEL_BAYER]
> +	}, {
> +		.compatible = "aptina,mt9p031",
> +		.data = &mt9p031_models[MT9P031_MODEL_BAYER]
> +	}, {
> +		.compatible = "aptina,mt9p031m",
> +		.data = &mt9p031_models[MT9P031_MODEL_MONO]

Instead using an index into an array, could you add structs for describing
both separately? See e.g. drivers/media/i2c/ccs/ccs-core.c for an example.

> +	},
>  	{ /* sentinel */ }
>  };
>  MODULE_DEVICE_TABLE(of, mt9p031_of_match);

-- 
Kind regards,

Sakari Ailus
Re: [PATCH v2] media: mt9p031: Refactor format handling for different sensor models
Posted by Laurent Pinchart 1 year, 3 months ago 
On Mon, Oct 28, 2024 at 09:44:18AM +0000, Sakari Ailus wrote:
> Hi Tarang,
> 
> On Sat, Oct 26, 2024 at 03:45:40AM +0530, Tarang Raval wrote:
> > Add new structure 'mt9p031_model_info' to encapsulate format codes for
> > the mt9p031 camera sensor family. This approach enhances code clarity
> > and maintainability.
> > 
> > Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io>
> > ---
> >  drivers/media/i2c/mt9p031.c | 31 ++++++++++++++++++++++++++++---
> >  1 file changed, 28 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c
> > index f2f52f484044..3576d3066738 100644
> > --- a/drivers/media/i2c/mt9p031.c
> > +++ b/drivers/media/i2c/mt9p031.c
> > @@ -112,6 +112,24 @@
> >  #define MT9P031_TEST_PATTERN_RED			0xa2
> >  #define MT9P031_TEST_PATTERN_BLUE			0xa3
> >  
> > +struct mt9p031_model_info {
> > +	u32 code;
> > +};
> > +
> > +enum mt9p031_model {
> > +	MT9P031_MODEL_BAYER,
> > +	MT9P031_MODEL_MONO,
> > +};
> > +
> > +static const struct mt9p031_model_info mt9p031_models[] = {
> > +	[MT9P031_MODEL_BAYER] = {
> > +		.code = MEDIA_BUS_FMT_SGRBG12_1X12,
> > +	},
> > +	[MT9P031_MODEL_MONO] = {
> > +		.code = MEDIA_BUS_FMT_Y12_1X12,
> > +	},
> > +};
> > +
> >  struct mt9p031 {
> >  	struct v4l2_subdev subdev;
> >  	struct media_pad pad;
> > @@ -1209,9 +1227,16 @@ static void mt9p031_remove(struct i2c_client *client)
> >  }
> >  
> >  static const struct of_device_id mt9p031_of_match[] = {
> > -	{ .compatible = "aptina,mt9p006", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 },
> > -	{ .compatible = "aptina,mt9p031", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 },
> > -	{ .compatible = "aptina,mt9p031m", .data = (void *)MEDIA_BUS_FMT_Y12_1X12 },
> > +	{
> > +		.compatible = "aptina,mt9p006",
> > +		.data = &mt9p031_models[MT9P031_MODEL_BAYER]
> > +	}, {
> > +		.compatible = "aptina,mt9p031",
> > +		.data = &mt9p031_models[MT9P031_MODEL_BAYER]
> > +	}, {
> > +		.compatible = "aptina,mt9p031m",
> > +		.data = &mt9p031_models[MT9P031_MODEL_MONO]
> 
> Instead using an index into an array, could you add structs for describing
> both separately? See e.g. drivers/media/i2c/ccs/ccs-core.c for an example.

For what it's worth, I prefer the array and indices. I don't care too
much though.

> > +	},
> >  	{ /* sentinel */ }
> >  };
> >  MODULE_DEVICE_TABLE(of, mt9p031_of_match);

-- 
Regards,

Laurent Pinchart
Re: [PATCH v2] media: mt9p031: Refactor format handling for different sensor models
Posted by Laurent Pinchart 1 year, 3 months ago 
Hi Tarang,

Thank you for the patch.

On Sat, Oct 26, 2024 at 03:45:40AM +0530, Tarang Raval wrote:
> Add new structure 'mt9p031_model_info' to encapsulate format codes for
> the mt9p031 camera sensor family. This approach enhances code clarity
> and maintainability.
> 
> Signed-off-by: Tarang Raval <tarang.raval@siliconsignals.io>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Sakari, this applies on top of "[PATCH 0/2] media: mt9p031: Drop legacy
platform data" (https://lore.kernel.org/r/20241025181708.20648-1-laurent.pinchart@ideasonboard.com).
Tarang, feel free to review that series to accelerate integration of the
patches upstream :-)

> ---
>  drivers/media/i2c/mt9p031.c | 31 ++++++++++++++++++++++++++++---
>  1 file changed, 28 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c
> index f2f52f484044..3576d3066738 100644
> --- a/drivers/media/i2c/mt9p031.c
> +++ b/drivers/media/i2c/mt9p031.c
> @@ -112,6 +112,24 @@
>  #define MT9P031_TEST_PATTERN_RED			0xa2
>  #define MT9P031_TEST_PATTERN_BLUE			0xa3
>  
> +struct mt9p031_model_info {
> +	u32 code;
> +};
> +
> +enum mt9p031_model {
> +	MT9P031_MODEL_BAYER,
> +	MT9P031_MODEL_MONO,
> +};
> +
> +static const struct mt9p031_model_info mt9p031_models[] = {
> +	[MT9P031_MODEL_BAYER] = {
> +		.code = MEDIA_BUS_FMT_SGRBG12_1X12,
> +	},
> +	[MT9P031_MODEL_MONO] = {
> +		.code = MEDIA_BUS_FMT_Y12_1X12,
> +	},
> +};
> +
>  struct mt9p031 {
>  	struct v4l2_subdev subdev;
>  	struct media_pad pad;
> @@ -1209,9 +1227,16 @@ static void mt9p031_remove(struct i2c_client *client)
>  }
>  
>  static const struct of_device_id mt9p031_of_match[] = {
> -	{ .compatible = "aptina,mt9p006", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 },
> -	{ .compatible = "aptina,mt9p031", .data = (void *)MEDIA_BUS_FMT_SGRBG12_1X12 },
> -	{ .compatible = "aptina,mt9p031m", .data = (void *)MEDIA_BUS_FMT_Y12_1X12 },
> +	{
> +		.compatible = "aptina,mt9p006",
> +		.data = &mt9p031_models[MT9P031_MODEL_BAYER]
> +	}, {
> +		.compatible = "aptina,mt9p031",
> +		.data = &mt9p031_models[MT9P031_MODEL_BAYER]
> +	}, {
> +		.compatible = "aptina,mt9p031m",
> +		.data = &mt9p031_models[MT9P031_MODEL_MONO]
> +	},
>  	{ /* sentinel */ }
>  };
>  MODULE_DEVICE_TABLE(of, mt9p031_of_match);

-- 
Regards,

Laurent Pinchart

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.