[PATCH v2 2/4] drm/bridge: adv7511: Initialize regulators

[Laurent Pinchart]

Hi Archit,

Thank you for the patch.

On Friday 23 Sep 2016 14:50:28 Archit Taneja wrote:
> Maintain a table of regulator names expect by ADV7511 and ADV7533.
> Use regulator_bulk_* api to configure these.
> 
> Initialize and enable the regulators during probe itself. Controlling
> these dynamically is left for later.
> 
> Cc: dri-devel at lists.freedesktop.org
> Cc: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> Signed-off-by: Archit Taneja <architt at codeaurora.org>
> ---
> v2:
> - Use regulator_bulk_* API to configure regulators as suggested by Laurent.
> - Set up regulators for ADV7511 too.
> 
>  drivers/gpu/drm/bridge/adv7511/adv7511.h     |  4 ++
>  drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 85 ++++++++++++++++++++++---
>  2 files changed, 80 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h
> b/drivers/gpu/drm/bridge/adv7511/adv7511.h index 161c923..83ebdaa 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h
> @@ -12,6 +12,7 @@
>  #include <linux/hdmi.h>
>  #include <linux/i2c.h>
>  #include <linux/regmap.h>
> +#include <linux/regulator/consumer.h>
> 
>  #include <drm/drm_crtc_helper.h>
>  #include <drm/drm_mipi_dsi.h>
> @@ -327,6 +328,9 @@ struct adv7511 {
> 
>  	struct gpio_desc *gpio_pd;
> 
> +	struct regulator_bulk_data *supplies;
> +	int num_supplies;

num_supplies is always positive, you can make it an unsigned int.

> +
>  	/* ADV7533 DSI RX related params */
>  	struct device_node *host_node;
>  	struct mipi_dsi_device *dsi;
> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 8ed3906..f7e79ed
> 100644
> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
> @@ -839,6 +839,57 @@ static struct drm_bridge_funcs adv7511_bridge_funcs = {
> * Probe & remove
>   */
> 
> +static const char * const adv7511_supply_names[] = {
> +	"avdd",
> +	"dvdd",
> +	"pvdd",
> +	"v3p3",
> +	"bgvdd",
> +};
> +
> +static const char * const adv7533_supply_names[] = {
> +	"avdd",
> +	"dvdd",
> +	"pvdd",
> +	"a2vdd",
> +	"v3p3",
> +	"v1p2",
> +};
> +
> +static int adv7511_init_regulators(struct adv7511 *adv)
> +{
> +	struct device *dev = &adv->i2c_main->dev;
> +	const char * const *supply_names;
> +	int i, ret;

i only takes positive values, you can make it an unsigned int.

Apart from that,

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

> +
> +	if (adv->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,
> +				     sizeof(*adv->supplies), GFP_KERNEL);
> +	if (!adv->supplies)
> +		return -ENOMEM;
> +
> +	for (i = 0; i < adv->num_supplies; i++)
> +		adv->supplies[i].supply = supply_names[i];
> +
> +	ret = devm_regulator_bulk_get(dev, adv->num_supplies, adv->supplies);
> +	if (ret)
> +		return ret;
> +
> +	return regulator_bulk_enable(adv->num_supplies, adv->supplies);
> +}
> +
> +static void adv7511_uninit_regulators(struct adv7511 *adv)
> +{
> +	regulator_bulk_disable(adv->num_supplies, adv->supplies);
> +}
> +
>  static int adv7511_parse_dt(struct device_node *np,
>  			    struct adv7511_link_config *config)
>  {
> @@ -939,6 +990,7 @@ static int adv7511_probe(struct i2c_client *i2c, const
> struct i2c_device_id *id) if (!adv7511)
>  		return -ENOMEM;
> 
> +	adv7511->i2c_main = i2c;
>  	adv7511->powered = false;
>  	adv7511->status = connector_status_disconnected;
> 
> @@ -956,13 +1008,21 @@ static int adv7511_probe(struct i2c_client *i2c,
> const struct i2c_device_id *id)
> 	if (ret)
>  		return ret;
> 
> +	ret = adv7511_init_regulators(adv7511);
> +	if (ret) {
> +		dev_err(dev, "failed to init regulators\n");
> +		return ret;
> +	}
> +
>  	/*
>  	 * The power down GPIO is optional. If present, toggle it from active
>  	 to
>  	 * inactive to wake up the encoder.
>  	 */
>  	adv7511->gpio_pd = devm_gpiod_get_optional(dev, "pd", GPIOD_OUT_HIGH);
> -	if (IS_ERR(adv7511->gpio_pd))
> -		return PTR_ERR(adv7511->gpio_pd);
> +	if (IS_ERR(adv7511->gpio_pd)) {
> +		ret = PTR_ERR(adv7511->gpio_pd);
> +		goto uninit_regulators;
> +	}
> 
>  	if (adv7511->gpio_pd) {
>  		mdelay(5);
> @@ -970,12 +1030,14 @@ static int adv7511_probe(struct i2c_client *i2c,
> const struct i2c_device_id *id) }
> 
>  	adv7511->regmap = devm_regmap_init_i2c(i2c, &adv7511_regmap_config);
> -	if (IS_ERR(adv7511->regmap))
> -		return PTR_ERR(adv7511->regmap);
> +	if (IS_ERR(adv7511->regmap)) {
> +		ret = PTR_ERR(adv7511->regmap);
> +		goto uninit_regulators;
> +	}
> 
>  	ret = regmap_read(adv7511->regmap, ADV7511_REG_CHIP_REVISION, &val);
>  	if (ret)
> -		return ret;
> +		goto uninit_regulators;
>  	dev_dbg(dev, "Rev. %d\n", val);
> 
>  	if (adv7511->type == ADV7511)
> @@ -985,7 +1047,7 @@ static int adv7511_probe(struct i2c_client *i2c, const
> struct i2c_device_id *id) else
>  		ret = adv7533_patch_registers(adv7511);
>  	if (ret)
> -		return ret;
> +		goto uninit_regulators;
> 
>  	regmap_write(adv7511->regmap, ADV7511_REG_EDID_I2C_ADDR, 
edid_i2c_addr);
>  	regmap_write(adv7511->regmap, ADV7511_REG_PACKET_I2C_ADDR,
> @@ -995,10 +1057,11 @@ static int adv7511_probe(struct i2c_client *i2c,
> const struct i2c_device_id *id)
> 
>  	adv7511_packet_disable(adv7511, 0xffff);
> 
> -	adv7511->i2c_main = i2c;
>  	adv7511->i2c_edid = i2c_new_dummy(i2c->adapter, edid_i2c_addr >> 1);
> -	if (!adv7511->i2c_edid)
> -		return -ENOMEM;
> +	if (!adv7511->i2c_edid) {
> +		ret = -ENOMEM;
> +		goto uninit_regulators;
> +	}
> 
>  	if (adv7511->type == ADV7533) {
>  		ret = adv7533_init_cec(adv7511);
> @@ -1043,6 +1106,8 @@ err_unregister_cec:
>  	adv7533_uninit_cec(adv7511);
>  err_i2c_unregister_edid:
>  	i2c_unregister_device(adv7511->i2c_edid);
> +uninit_regulators:
> +	adv7511_uninit_regulators(adv7511);
> 
>  	return ret;
>  }
> @@ -1056,6 +1121,8 @@ static int adv7511_remove(struct i2c_client *i2c)
>  		adv7533_uninit_cec(adv7511);
>  	}
> 
> +	adv7511_uninit_regulators(adv7511);
> +
>  	drm_bridge_remove(&adv7511->bridge);
> 
>  	i2c_unregister_device(adv7511->i2c_edid);

-- 
Regards,

Laurent Pinchart