From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH v3 2/2] drm/bridge: adv7511: Initialize regulators Date: Tue, 29 Nov 2016 08:28:11 +0200 Message-ID: <2872169.aDPOZ5Qke8@avalon> References: <1474622430-6704-1-git-send-email-architt@codeaurora.org> <1480399662-8858-1-git-send-email-architt@codeaurora.org> <1480399662-8858-3-git-send-email-architt@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: Received: from galahad.ideasonboard.com ([185.26.127.97]:58999 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317AbcK2G2A (ORCPT ); Tue, 29 Nov 2016 01:28:00 -0500 In-Reply-To: <1480399662-8858-3-git-send-email-architt@codeaurora.org> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: Archit Taneja Cc: linux-arm-msm@vger.kernel.org, robh@kernel.org, dri-devel@lists.freedesktop.org Hi Archit, Thank you for the patch. On Tuesday 29 Nov 2016 11:37:42 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. > > Signed-off-by: Archit Taneja > --- > v3: > - Drop the additional 1.8V supply names > > drivers/gpu/drm/bridge/adv7511/adv7511.h | 4 ++ > drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 79 +++++++++++++++++++++---- > 2 files changed, 74 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h > b/drivers/gpu/drm/bridge/adv7511/adv7511.h index 992d76c..18ec627 100644 > --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h > @@ -12,6 +12,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -329,6 +330,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 2177440..f123fbb > 100644 > --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > @@ -843,6 +843,51 @@ static int adv7511_bridge_attach(struct drm_bridge > *bridge) * Probe & remove > */ > > +static const char * const adv7511_supply_names[] = { > + "avdd", > + "v3p3", > +}; > + > +static const char * const adv7533_supply_names[] = { > + "avdd", > + "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; Same comment for i. Apart from that, Reviewed-by: Laurent Pinchart > + > + 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) > { > @@ -943,6 +988,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; > > @@ -960,13 +1006,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); > @@ -974,12 +1028,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) > @@ -989,7 +1045,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, > @@ -999,10 +1055,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); > @@ -1049,6 +1106,8 @@ static int adv7511_probe(struct i2c_client *i2c, const > struct i2c_device_id *id) adv7533_uninit_cec(adv7511); > err_i2c_unregister_edid: > i2c_unregister_device(adv7511->i2c_edid); > +uninit_regulators: > + adv7511_uninit_regulators(adv7511); > > return ret; > } > @@ -1062,6 +1121,8 @@ static int adv7511_remove(struct i2c_client *i2c) > adv7533_uninit_cec(adv7511); > } > > + adv7511_uninit_regulators(adv7511); > + > drm_bridge_remove(&adv7511->bridge); > > adv7511_audio_exit(adv7511); -- Regards, Laurent Pinchart