From: "Alex G." <mr.nuke.me@gmail.com>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org,
Jernej Skrabec <jernej.skrabec@siol.net>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Neil Armstrong <narmstrong@baylibre.com>,
David Airlie <airlied@linux.ie>, Mark Brown <broonie@kernel.org>,
Jonas Karlman <jonas@kwiboo.se>,
open list <linux-kernel@vger.kernel.org>,
Andrzej Hajda <a.hajda@samsung.com>,
Rob Herring <robh+dt@kernel.org>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Subject: Re: [PATCH v2 1/2] drm/bridge: sii902x: Enable I/O and core VCC supplies if present
Date: Tue, 20 Oct 2020 09:01:27 -0500 [thread overview]
Message-ID: <5c21a4a4-717c-9f8a-9764-6e3fb9554e46@gmail.com> (raw)
In-Reply-To: <20201020071628.GA1737816@ravnborg.org>
On 10/20/20 2:16 AM, Sam Ravnborg wrote:
> Hi Alex.
[snip]
>>
>>
>>> diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
>>> index 33fd33f953ec..d15e9f2c0d8a 100644
>>> --- a/drivers/gpu/drm/bridge/sii902x.c
>>> +++ b/drivers/gpu/drm/bridge/sii902x.c
>>> @@ -17,6 +17,7 @@
>>> #include <linux/i2c.h>
>>> #include <linux/module.h>
>>> #include <linux/regmap.h>
>>> +#include <linux/regulator/consumer.h>
>>> #include <linux/clk.h>
>>> #include <drm/drm_atomic_helper.h>
>>> @@ -168,6 +169,8 @@ struct sii902x {
>>> struct drm_connector connector;
>>> struct gpio_desc *reset_gpio;
>>> struct i2c_mux_core *i2cmux;
>>> + struct regulator *iovcc;
>>> + struct regulator *cvcc12;
>>> /*
>>> * Mutex protects audio and video functions from interfering
>>> * each other, by keeping their i2c command sequences atomic.
>>> @@ -954,13 +957,13 @@ static const struct drm_bridge_timings default_sii902x_timings = {
>>> | DRM_BUS_FLAG_DE_HIGH,
>>> };
>>> +static int sii902x_init(struct sii902x *sii902x);
> Please re-arrange the code so this prototype is not needed.
I'd be happy to re-arrange things. It will make the diff look a lot
bigger than what it is. Is that okay?
Alex
>>> +
>>> static int sii902x_probe(struct i2c_client *client,
>>> const struct i2c_device_id *id)
>>> {
>>> struct device *dev = &client->dev;
>>> - unsigned int status = 0;
>>> struct sii902x *sii902x;
>>> - u8 chipid[4];
>>> int ret;
>>> ret = i2c_check_functionality(client->adapter,
>>> @@ -989,6 +992,43 @@ static int sii902x_probe(struct i2c_client *client,
>>> mutex_init(&sii902x->mutex);
>>> + sii902x->iovcc = devm_regulator_get(dev, "iovcc");
>>> + if (IS_ERR(sii902x->iovcc))
>>> + return PTR_ERR(sii902x->iovcc);
>>> +
>>> + sii902x->cvcc12 = devm_regulator_get(dev, "cvcc12");
>>> + if (IS_ERR(sii902x->cvcc12))
>>> + return PTR_ERR(sii902x->cvcc12);
>>> +
>>> + ret = regulator_enable(sii902x->iovcc);
>>> + if (ret < 0) {
>>> + dev_err_probe(dev, ret, "Failed to enable iovcc supply");
>>> + return ret;
>>> + }
>>> +
>>> + ret = regulator_enable(sii902x->cvcc12);
>>> + if (ret < 0) {
>>> + dev_err_probe(dev, ret, "Failed to enable cvcc12 supply");
>>> + regulator_disable(sii902x->iovcc);
>>> + return ret;
>>> + }
>>> +
>>> + ret = sii902x_init(sii902x);
>>> + if (ret < 0) {
>>> + regulator_disable(sii902x->cvcc12);
>>> + regulator_disable(sii902x->iovcc);
>>> + }
>>> +
>>> + return ret;
>>> +}
>>> +
>>> +static int sii902x_init(struct sii902x *sii902x)
>>> +{
>>> + struct device *dev = &sii902x->i2c->dev;
>>> + unsigned int status = 0;
>>> + u8 chipid[4];
>>> + int ret;
>>> +
>>> sii902x_reset(sii902x);
>>> ret = regmap_write(sii902x->regmap, SII902X_REG_TPI_RQB, 0x0);
>>> @@ -1012,11 +1052,11 @@ static int sii902x_probe(struct i2c_client *client,
>>> regmap_read(sii902x->regmap, SII902X_INT_STATUS, &status);
>>> regmap_write(sii902x->regmap, SII902X_INT_STATUS, status);
>>> - if (client->irq > 0) {
>>> + if (sii902x->i2c->irq > 0) {
>>> regmap_write(sii902x->regmap, SII902X_INT_ENABLE,
>>> SII902X_HOTPLUG_EVENT);
>>> - ret = devm_request_threaded_irq(dev, client->irq, NULL,
>>> + ret = devm_request_threaded_irq(dev, sii902x->i2c->irq, NULL,
>>> sii902x_interrupt,
>>> IRQF_ONESHOT, dev_name(dev),
>>> sii902x);
>>> @@ -1031,9 +1071,9 @@ static int sii902x_probe(struct i2c_client *client,
>>> sii902x_audio_codec_init(sii902x, dev);
>>> - i2c_set_clientdata(client, sii902x);
>>> + i2c_set_clientdata(sii902x->i2c, sii902x);
>>> - sii902x->i2cmux = i2c_mux_alloc(client->adapter, dev,
>>> + sii902x->i2cmux = i2c_mux_alloc(sii902x->i2c->adapter, dev,
>>> 1, 0, I2C_MUX_GATE,
>>> sii902x_i2c_bypass_select,
>>> sii902x_i2c_bypass_deselect);
>>> @@ -1051,6 +1091,8 @@ static int sii902x_remove(struct i2c_client *client)
>>> i2c_mux_del_adapters(sii902x->i2cmux);
>>> drm_bridge_remove(&sii902x->bridge);
>>> + regulator_disable(sii902x->cvcc12);
>>> + regulator_disable(sii902x->iovcc);
>>> return 0;
>>> }
>>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-10-20 14:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 20:05 [PATCH 1/2] drm/bridge: sii902x: Enable I/O and core VCC supplies if present Alexandru Gagniuc
2020-09-24 20:05 ` [PATCH 2/2] dt-bindings: display: sii902x: Add supply bindings Alexandru Gagniuc
2020-09-26 18:42 ` Sam Ravnborg
2020-09-24 20:22 ` [PATCH 1/2] drm/bridge: sii902x: Enable I/O and core VCC supplies if present Fabio Estevam
2020-09-24 20:34 ` Alex G.
2020-09-26 18:49 ` Sam Ravnborg
2020-09-28 17:35 ` Alex G.
2020-09-28 19:03 ` Sam Ravnborg
2020-09-28 17:30 ` [PATCH v2 " Alexandru Gagniuc
2020-09-28 17:30 ` [PATCH v2 2/2] dt-bindings: display: sii902x: Add supply bindings Alexandru Gagniuc
2020-09-29 20:17 ` Rob Herring
2020-10-20 1:24 ` [PATCH v2 1/2] drm/bridge: sii902x: Enable I/O and core VCC supplies if present Alex G.
2020-10-20 7:16 ` Sam Ravnborg
2020-10-20 14:01 ` Alex G. [this message]
2020-10-20 15:08 ` Sam Ravnborg
2020-10-20 22:14 ` [PATCH v3 1/3] drm/bridge: sii902x: Refactor init code into separate function Alexandru Gagniuc
2020-10-20 22:14 ` [PATCH v3 2/3] drm/bridge: sii902x: Enable I/O and core VCC supplies if present Alexandru Gagniuc
2020-11-08 10:55 ` Sam Ravnborg
2020-10-20 22:14 ` [PATCH v3 3/3] dt-bindings: display: sii902x: Add supply bindings Alexandru Gagniuc
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=5c21a4a4-717c-9f8a-9764-6e3fb9554e46@gmail.com \
--to=mr.nuke.me@gmail.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jernej.skrabec@siol.net \
--cc=jonas@kwiboo.se \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=narmstrong@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sam@ravnborg.org \
--cc=tsbogend@alpha.franken.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).