From: Biju Das <biju.das.jz@bp.renesas.com> To: Andrzej Hajda <andrzej.hajda@intel.com>, Neil Armstrong <neil.armstrong@linaro.org>, Robert Foss <rfoss@kernel.org>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch> Cc: "Laurent Pinchart" <laurent.pinchart+renesas@ideasonboard.com>, "Ahmad Fatoum" <a.fatoum@pengutronix.de>, "Geert Uytterhoeven" <geert+renesas@glider.be>, "Jonas Karlman" <jonas@kwiboo.se>, dri-devel@lists.freedesktop.org, "Abhinav Kumar" <quic_abhinavk@quicinc.com>, "Jernej Skrabec" <jernej.skrabec@gmail.com>, "Javier Martinez Canillas" <javierm@redhat.com>, linux-renesas-soc@vger.kernel.org, "Andy Shevchenko" <andy.shevchenko@gmail.com>, "Laurent Pinchart" <Laurent.pinchart@ideasonboard.com>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Biju Das" <biju.das.jz@bp.renesas.com>, "Adam Ford" <aford173@gmail.com>, "Bogdan Togorean" <bogdan.togorean@analog.com> Subject: [PATCH v2 4/8] drm: adv7511: Add supply_names and num_supplies variables to struct adv7511_chip_info Date: Wed, 30 Aug 2023 15:23:54 +0100 [thread overview] Message-ID: <20230830142358.275459-5-biju.das.jz@bp.renesas.com> (raw) In-Reply-To: <20230830142358.275459-1-biju.das.jz@bp.renesas.com> 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> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- v1->v2: * Added Rb tag from Laurent. * Added trailing commas for num_supplies in adv753{3,5}_chip_info. --- drivers/gpu/drm/bridge/adv7511/adv7511.h | 3 ++- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 27 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h index f8d61f2fa30e..edf7be9c21d3 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 int max_mode_clock_khz; unsigned int max_lane_freq_khz; + 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 1c76aa5a5d5b..2bcd17953221 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) @@ -1365,18 +1358,24 @@ static void adv7511_remove(struct i2c_client *i2c) static const struct adv7511_chip_info adv7511_chip_info = { .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_khz = 80000, .max_lane_freq_khz = 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_khz = 148500, .max_lane_freq_khz = 891000, + .supply_names = adv7533_supply_names, + .num_supplies = ARRAY_SIZE(adv7533_supply_names), }; static const struct i2c_device_id adv7511_i2c_ids[] = { -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Biju Das <biju.das.jz@bp.renesas.com> To: Andrzej Hajda <andrzej.hajda@intel.com>, Neil Armstrong <neil.armstrong@linaro.org>, Robert Foss <rfoss@kernel.org>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch> Cc: "Biju Das" <biju.das.jz@bp.renesas.com>, "Laurent Pinchart" <Laurent.pinchart@ideasonboard.com>, "Jonas Karlman" <jonas@kwiboo.se>, "Jernej Skrabec" <jernej.skrabec@gmail.com>, "Abhinav Kumar" <quic_abhinavk@quicinc.com>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>, "Andy Shevchenko" <andy.shevchenko@gmail.com>, "Javier Martinez Canillas" <javierm@redhat.com>, "Ahmad Fatoum" <a.fatoum@pengutronix.de>, "Rob Herring" <robh@kernel.org>, "Bogdan Togorean" <bogdan.togorean@analog.com>, "Adam Ford" <aford173@gmail.com>, dri-devel@lists.freedesktop.org, "Geert Uytterhoeven" <geert+renesas@glider.be>, linux-renesas-soc@vger.kernel.org, "Laurent Pinchart" <laurent.pinchart+renesas@ideasonboard.com> Subject: [PATCH v2 4/8] drm: adv7511: Add supply_names and num_supplies variables to struct adv7511_chip_info Date: Wed, 30 Aug 2023 15:23:54 +0100 [thread overview] Message-ID: <20230830142358.275459-5-biju.das.jz@bp.renesas.com> (raw) In-Reply-To: <20230830142358.275459-1-biju.das.jz@bp.renesas.com> 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> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- v1->v2: * Added Rb tag from Laurent. * Added trailing commas for num_supplies in adv753{3,5}_chip_info. --- drivers/gpu/drm/bridge/adv7511/adv7511.h | 3 ++- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 27 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h index f8d61f2fa30e..edf7be9c21d3 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 int max_mode_clock_khz; unsigned int max_lane_freq_khz; + 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 1c76aa5a5d5b..2bcd17953221 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) @@ -1365,18 +1358,24 @@ static void adv7511_remove(struct i2c_client *i2c) static const struct adv7511_chip_info adv7511_chip_info = { .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_khz = 80000, .max_lane_freq_khz = 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_khz = 148500, .max_lane_freq_khz = 891000, + .supply_names = adv7533_supply_names, + .num_supplies = ARRAY_SIZE(adv7533_supply_names), }; static const struct i2c_device_id adv7511_i2c_ids[] = { -- 2.25.1
next prev parent reply other threads:[~2023-08-30 14:24 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-08-30 14:23 [PATCH v2 0/8] ADV7511 driver enhancements Biju Das 2023-08-30 14:23 ` Biju Das 2023-08-30 14:23 ` [PATCH v2 1/8] drm: adv7511: Add struct adv7511_chip_info and use i2c_get_match_data() Biju Das 2023-08-30 14:23 ` Biju Das 2023-10-16 9:07 ` Robert Foss 2023-10-16 9:07 ` Robert Foss 2023-08-30 14:23 ` [PATCH v2 2/8] drm: adv7511: Add max_mode_clock_khz variable to struct adv7511_chip_info Biju Das 2023-08-30 14:23 ` Biju Das 2023-10-16 9:06 ` Robert Foss 2023-10-16 9:06 ` Robert Foss 2023-08-30 14:23 ` [PATCH v2 3/8] drm: adv7511: Add max_lane_freq_khz " Biju Das 2023-08-30 14:23 ` Biju Das 2023-10-16 9:05 ` Robert Foss 2023-10-16 9:05 ` Robert Foss 2023-08-30 14:23 ` Biju Das [this message] 2023-08-30 14:23 ` [PATCH v2 4/8] drm: adv7511: Add supply_names and num_supplies variables " Biju Das 2023-10-16 9:03 ` Robert Foss 2023-10-16 9:03 ` Robert Foss 2023-08-30 14:23 ` [PATCH v2 5/8] drm: adv7511: Add reg_cec_offset variable " Biju Das 2023-08-30 14:23 ` Biju Das 2023-10-16 8:58 ` Robert Foss 2023-10-16 8:58 ` Robert Foss 2023-10-16 9:37 ` Biju Das 2023-10-16 9:37 ` Biju Das 2023-08-30 14:23 ` [PATCH v2 6/8] drm: adv7511: Add has_dsi " Biju Das 2023-08-30 14:23 ` Biju Das 2023-10-16 9:01 ` Robert Foss 2023-10-16 9:01 ` Robert Foss 2023-08-30 14:23 ` [PATCH v2 7/8] drm: adv7511: Add link_config " Biju Das 2023-08-30 14:23 ` Biju Das 2023-10-16 8:59 ` Robert Foss 2023-10-16 8:59 ` Robert Foss 2023-08-30 14:23 ` [PATCH v2 8/8] drm: adv7511: Add hpd_override_enable " Biju Das 2023-08-30 14:23 ` Biju Das 2023-10-16 8:59 ` Robert Foss 2023-10-16 8:59 ` Robert Foss 2023-10-02 7:14 ` [PATCH v2 0/8] ADV7511 driver enhancements Biju Das 2023-10-02 7:14 ` Biju Das 2023-10-09 7:04 ` Biju Das 2023-10-09 7:04 ` Biju Das 2023-10-16 9:12 ` Robert Foss 2023-10-16 9:12 ` Robert Foss 2023-10-16 9:28 ` Biju Das 2023-10-16 9:28 ` Biju Das
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230830142358.275459-5-biju.das.jz@bp.renesas.com \ --to=biju.das.jz@bp.renesas.com \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=a.fatoum@pengutronix.de \ --cc=aford173@gmail.com \ --cc=airlied@gmail.com \ --cc=andrzej.hajda@intel.com \ --cc=andy.shevchenko@gmail.com \ --cc=bogdan.togorean@analog.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=geert+renesas@glider.be \ --cc=javierm@redhat.com \ --cc=jernej.skrabec@gmail.com \ --cc=jonas@kwiboo.se \ --cc=laurent.pinchart+renesas@ideasonboard.com \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=neil.armstrong@linaro.org \ --cc=quic_abhinavk@quicinc.com \ --cc=rfoss@kernel.org \ --cc=u.kleine-koenig@pengutronix.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.