diff mbox series

[4/7] drm: adv7511: Add supply_names and num_supplies variables to struct adv7511_chip_info

Message ID 20230813180512.307418-5-biju.das.jz@bp.renesas.com (mailing list archive)
State New, archived
Headers show
Series ADV7511 driver enhancements | expand

Commit Message

Biju Das Aug. 13, 2023, 6:05 p.m. UTC 
The ADV7511 has 5 power supplies compared to 7 that of ADV75{33,35}. Add
supply_names and num_supplies variables to struct adv7511_chip_info to
handle this difference.

Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
 drivers/gpu/drm/bridge/adv7511/adv7511.h     |  3 +-
 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 29 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

Comments

Laurent Pinchart Aug. 29, 2023, 7:26 a.m. UTC | #1 
Hi Biju,

Thank you for the patch.

On Sun, Aug 13, 2023 at 07:05:09PM +0100, Biju Das wrote:
> The ADV7511 has 5 power supplies compared to 7 that of ADV75{33,35}. Add
> supply_names and num_supplies variables to struct adv7511_chip_info to
> handle this difference.
> 
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> ---
>  drivers/gpu/drm/bridge/adv7511/adv7511.h     |  3 +-
>  drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 29 ++++++++++----------
>  2 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h
> index 0e2c721a856f..b29d11cae932 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h
> @@ -337,6 +337,8 @@ struct adv7511_chip_info {
>  	enum adv7511_type type;
>  	unsigned long max_mode_clock;
>  	unsigned long max_lane_freq;
> +	const char * const *supply_names;
> +	unsigned int num_supplies;
>  };
>  
>  struct adv7511 {
> @@ -375,7 +377,6 @@ struct adv7511 {
>  	struct gpio_desc *gpio_pd;
>  
>  	struct regulator_bulk_data *supplies;
> -	unsigned int num_supplies;
>  
>  	/* ADV7533 DSI RX related params */
>  	struct device_node *host_node;
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> index 29e087e6d721..f6f15c1b0882 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -1004,37 +1004,30 @@ static const char * const adv7533_supply_names[] = {
>  
>  static int adv7511_init_regulators(struct adv7511 *adv)
>  {
> +	const char * const *supply_names = adv->info->supply_names;
> +	unsigned int num_supplies = adv->info->num_supplies;
>  	struct device *dev = &adv->i2c_main->dev;
> -	const char * const *supply_names;
>  	unsigned int i;
>  	int ret;
>  
> -	if (adv->info->type == ADV7511) {
> -		supply_names = adv7511_supply_names;
> -		adv->num_supplies = ARRAY_SIZE(adv7511_supply_names);
> -	} else {
> -		supply_names = adv7533_supply_names;
> -		adv->num_supplies = ARRAY_SIZE(adv7533_supply_names);
> -	}
> -
> -	adv->supplies = devm_kcalloc(dev, adv->num_supplies,
> +	adv->supplies = devm_kcalloc(dev, num_supplies,
>  				     sizeof(*adv->supplies), GFP_KERNEL);
>  	if (!adv->supplies)
>  		return -ENOMEM;
>  
> -	for (i = 0; i < adv->num_supplies; i++)
> +	for (i = 0; i < num_supplies; i++)
>  		adv->supplies[i].supply = supply_names[i];
>  
> -	ret = devm_regulator_bulk_get(dev, adv->num_supplies, adv->supplies);
> +	ret = devm_regulator_bulk_get(dev, num_supplies, adv->supplies);
>  	if (ret)
>  		return ret;
>  
> -	return regulator_bulk_enable(adv->num_supplies, adv->supplies);
> +	return regulator_bulk_enable(num_supplies, adv->supplies);
>  }
>  
>  static void adv7511_uninit_regulators(struct adv7511 *adv)
>  {
> -	regulator_bulk_disable(adv->num_supplies, adv->supplies);
> +	regulator_bulk_disable(adv->info->num_supplies, adv->supplies);
>  }
>  
>  static bool adv7511_cec_register_volatile(struct device *dev, unsigned int reg)
> @@ -1367,19 +1360,25 @@ static void adv7511_remove(struct i2c_client *i2c)
>  }
>  
>  static const struct adv7511_chip_info adv7511_chip_info = {
> -	.type = ADV7511
> +	.type = ADV7511,
> +	.supply_names = adv7511_supply_names,
> +	.num_supplies = ARRAY_SIZE(adv7511_supply_names)

Please add a comma at the end of the line. Same below.

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

>  };
>  
>  static const struct adv7511_chip_info adv7533_chip_info = {
>  	.type = ADV7533,
>  	.max_mode_clock = 80000,
>  	.max_lane_freq = 800000,
> +	.supply_names = adv7533_supply_names,
> +	.num_supplies = ARRAY_SIZE(adv7533_supply_names)
>  };
>  
>  static const struct adv7511_chip_info adv7535_chip_info = {
>  	.type = ADV7535,
>  	.max_mode_clock = 148500,
>  	.max_lane_freq = 891000,
> +	.supply_names = adv7533_supply_names,
> +	.num_supplies = ARRAY_SIZE(adv7533_supply_names)
>  };
>  
>  static const struct i2c_device_id adv7511_i2c_ids[] = {
Biju Das Aug. 29, 2023, 2:06 p.m. UTC | #2 
Hi Laurent,

Thanks for the feedback.

> Subject: Re: [PATCH 4/7] drm: adv7511: Add supply_names and num_supplies
> variables to struct adv7511_chip_info
> 
> Hi Biju,
> 
> Thank you for the patch.
> 
> On Sun, Aug 13, 2023 at 07:05:09PM +0100, Biju Das wrote:
> > The ADV7511 has 5 power supplies compared to 7 that of ADV75{33,35}.
> > Add supply_names and num_supplies variables to struct
> > adv7511_chip_info to handle this difference.
> >
> > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> > ---
> >  drivers/gpu/drm/bridge/adv7511/adv7511.h     |  3 +-
> >  drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 29
> > ++++++++++----------
> >  2 files changed, 16 insertions(+), 16 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h
> > b/drivers/gpu/drm/bridge/adv7511/adv7511.h
> > index 0e2c721a856f..b29d11cae932 100644
> > --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h
> > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h
> > @@ -337,6 +337,8 @@ struct adv7511_chip_info {
> >  	enum adv7511_type type;
> >  	unsigned long max_mode_clock;
> >  	unsigned long max_lane_freq;
> > +	const char * const *supply_names;
> > +	unsigned int num_supplies;
> >  };
> >
> >  struct adv7511 {
> > @@ -375,7 +377,6 @@ struct adv7511 {
> >  	struct gpio_desc *gpio_pd;
> >
> >  	struct regulator_bulk_data *supplies;
> > -	unsigned int num_supplies;
> >
> >  	/* ADV7533 DSI RX related params */
> >  	struct device_node *host_node;
> > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > index 29e087e6d721..f6f15c1b0882 100644
> > --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> > @@ -1004,37 +1004,30 @@ static const char * const
> > adv7533_supply_names[] = {
> >
> >  static int adv7511_init_regulators(struct adv7511 *adv)  {
> > +	const char * const *supply_names = adv->info->supply_names;
> > +	unsigned int num_supplies = adv->info->num_supplies;
> >  	struct device *dev = &adv->i2c_main->dev;
> > -	const char * const *supply_names;
> >  	unsigned int i;
> >  	int ret;
> >
> > -	if (adv->info->type == ADV7511) {
> > -		supply_names = adv7511_supply_names;
> > -		adv->num_supplies = ARRAY_SIZE(adv7511_supply_names);
> > -	} else {
> > -		supply_names = adv7533_supply_names;
> > -		adv->num_supplies = ARRAY_SIZE(adv7533_supply_names);
> > -	}
> > -
> > -	adv->supplies = devm_kcalloc(dev, adv->num_supplies,
> > +	adv->supplies = devm_kcalloc(dev, num_supplies,
> >  				     sizeof(*adv->supplies), GFP_KERNEL);
> >  	if (!adv->supplies)
> >  		return -ENOMEM;
> >
> > -	for (i = 0; i < adv->num_supplies; i++)
> > +	for (i = 0; i < num_supplies; i++)
> >  		adv->supplies[i].supply = supply_names[i];
> >
> > -	ret = devm_regulator_bulk_get(dev, adv->num_supplies, adv->supplies);
> > +	ret = devm_regulator_bulk_get(dev, num_supplies, adv->supplies);
> >  	if (ret)
> >  		return ret;
> >
> > -	return regulator_bulk_enable(adv->num_supplies, adv->supplies);
> > +	return regulator_bulk_enable(num_supplies, adv->supplies);
> >  }
> >
> >  static void adv7511_uninit_regulators(struct adv7511 *adv)  {
> > -	regulator_bulk_disable(adv->num_supplies, adv->supplies);
> > +	regulator_bulk_disable(adv->info->num_supplies, adv->supplies);
> >  }
> >
> >  static bool adv7511_cec_register_volatile(struct device *dev,
> > unsigned int reg) @@ -1367,19 +1360,25 @@ static void
> > adv7511_remove(struct i2c_client *i2c)  }
> >
> >  static const struct adv7511_chip_info adv7511_chip_info = {
> > -	.type = ADV7511
> > +	.type = ADV7511,
> > +	.supply_names = adv7511_supply_names,
> > +	.num_supplies = ARRAY_SIZE(adv7511_supply_names)
> 
> Please add a comma at the end of the line. Same below.

Agreed,

Cheers,
Biju

> 
> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> 
> >  };
> >
> >  static const struct adv7511_chip_info adv7533_chip_info = {
> >  	.type = ADV7533,
> >  	.max_mode_clock = 80000,
> >  	.max_lane_freq = 800000,
> > +	.supply_names = adv7533_supply_names,
> > +	.num_supplies = ARRAY_SIZE(adv7533_supply_names)
> >  };
> >
> >  static const struct adv7511_chip_info adv7535_chip_info = {
> >  	.type = ADV7535,
> >  	.max_mode_clock = 148500,
> >  	.max_lane_freq = 891000,
> > +	.supply_names = adv7533_supply_names,
> > +	.num_supplies = ARRAY_SIZE(adv7533_supply_names)
> >  };
> >
> >  static const struct i2c_device_id adv7511_i2c_ids[] = {
> 
> --
> Regards,
> 
> Laurent Pinchart
diff mbox series

Patch

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h
index 0e2c721a856f..b29d11cae932 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511.h
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h
@@ -337,6 +337,8 @@  struct adv7511_chip_info {
 	enum adv7511_type type;
 	unsigned long max_mode_clock;
 	unsigned long max_lane_freq;
+	const char * const *supply_names;
+	unsigned int num_supplies;
 };
 
 struct adv7511 {
@@ -375,7 +377,6 @@  struct adv7511 {
 	struct gpio_desc *gpio_pd;
 
 	struct regulator_bulk_data *supplies;
-	unsigned int num_supplies;
 
 	/* ADV7533 DSI RX related params */
 	struct device_node *host_node;
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
index 29e087e6d721..f6f15c1b0882 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -1004,37 +1004,30 @@  static const char * const adv7533_supply_names[] = {
 
 static int adv7511_init_regulators(struct adv7511 *adv)
 {
+	const char * const *supply_names = adv->info->supply_names;
+	unsigned int num_supplies = adv->info->num_supplies;
 	struct device *dev = &adv->i2c_main->dev;
-	const char * const *supply_names;
 	unsigned int i;
 	int ret;
 
-	if (adv->info->type == ADV7511) {
-		supply_names = adv7511_supply_names;
-		adv->num_supplies = ARRAY_SIZE(adv7511_supply_names);
-	} else {
-		supply_names = adv7533_supply_names;
-		adv->num_supplies = ARRAY_SIZE(adv7533_supply_names);
-	}
-
-	adv->supplies = devm_kcalloc(dev, adv->num_supplies,
+	adv->supplies = devm_kcalloc(dev, num_supplies,
 				     sizeof(*adv->supplies), GFP_KERNEL);
 	if (!adv->supplies)
 		return -ENOMEM;
 
-	for (i = 0; i < adv->num_supplies; i++)
+	for (i = 0; i < num_supplies; i++)
 		adv->supplies[i].supply = supply_names[i];
 
-	ret = devm_regulator_bulk_get(dev, adv->num_supplies, adv->supplies);
+	ret = devm_regulator_bulk_get(dev, num_supplies, adv->supplies);
 	if (ret)
 		return ret;
 
-	return regulator_bulk_enable(adv->num_supplies, adv->supplies);
+	return regulator_bulk_enable(num_supplies, adv->supplies);
 }
 
 static void adv7511_uninit_regulators(struct adv7511 *adv)
 {
-	regulator_bulk_disable(adv->num_supplies, adv->supplies);
+	regulator_bulk_disable(adv->info->num_supplies, adv->supplies);
 }
 
 static bool adv7511_cec_register_volatile(struct device *dev, unsigned int reg)
@@ -1367,19 +1360,25 @@  static void adv7511_remove(struct i2c_client *i2c)
 }
 
 static const struct adv7511_chip_info adv7511_chip_info = {
-	.type = ADV7511
+	.type = ADV7511,
+	.supply_names = adv7511_supply_names,
+	.num_supplies = ARRAY_SIZE(adv7511_supply_names)
 };
 
 static const struct adv7511_chip_info adv7533_chip_info = {
 	.type = ADV7533,
 	.max_mode_clock = 80000,
 	.max_lane_freq = 800000,
+	.supply_names = adv7533_supply_names,
+	.num_supplies = ARRAY_SIZE(adv7533_supply_names)
 };
 
 static const struct adv7511_chip_info adv7535_chip_info = {
 	.type = ADV7535,
 	.max_mode_clock = 148500,
 	.max_lane_freq = 891000,
+	.supply_names = adv7533_supply_names,
+	.num_supplies = ARRAY_SIZE(adv7533_supply_names)
 };
 
 static const struct i2c_device_id adv7511_i2c_ids[] = {