From: Sui Jingfeng <sui.jingfeng@linux.dev>
To: Neil Armstrong <neil.armstrong@linaro.org>
Cc: Robert Foss <rfoss@kernel.org>,
Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
Andrzej Hajda <andrzej.hajda@intel.com>,
Jonas Karlman <jonas@kwiboo.se>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Phong LE <ple@baylibre.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Sui Jingfeng <sui.jingfeng@linux.dev>
Subject: [PATCH v4 6/9] drm-bridge: sii902x: Use fwnode API to acquire device properties
Date: Tue, 23 Apr 2024 03:19:00 +0800 [thread overview]
Message-ID: <20240422191903.255642-7-sui.jingfeng@linux.dev> (raw)
In-Reply-To: <20240422191903.255642-1-sui.jingfeng@linux.dev>
Make this driver less DT-dependent by calling the freshly created helper
functions, which reduce boilerplate. Should be no functional changes for
DT based systems.
Signed-off-by: Sui Jingfeng <sui.jingfeng@linux.dev>
---
drivers/gpu/drm/bridge/sii902x.c | 43 +++++++++++---------------------
1 file changed, 14 insertions(+), 29 deletions(-)
diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c
index 8f84e98249c7..04436f318c7f 100644
--- a/drivers/gpu/drm/bridge/sii902x.c
+++ b/drivers/gpu/drm/bridge/sii902x.c
@@ -827,20 +827,19 @@ static int sii902x_audio_codec_init(struct sii902x *sii902x,
.spdif = 0,
.max_i2s_channels = 0,
};
+ struct fwnode_handle *fwnode = dev_fwnode(dev);
u8 lanes[4];
int num_lanes, i;
- if (!of_property_read_bool(dev->of_node, "#sound-dai-cells")) {
+ if (!fwnode_property_present(fwnode, "#sound-dai-cells")) {
dev_dbg(dev, "%s: No \"#sound-dai-cells\", no audio\n",
__func__);
return 0;
}
- num_lanes = of_property_read_variable_u8_array(dev->of_node,
- "sil,i2s-data-lanes",
- lanes, 1,
- ARRAY_SIZE(lanes));
-
+ num_lanes = fwnode_property_read_u8_array(fwnode,
+ "sil,i2s-data-lanes",
+ lanes, ARRAY_SIZE(lanes));
if (num_lanes == -EINVAL) {
dev_dbg(dev,
"%s: No \"sil,i2s-data-lanes\", use default <0>\n",
@@ -1097,13 +1096,13 @@ static int sii902x_init(struct sii902x *sii902x)
goto err_unreg_audio;
sii902x->bridge.funcs = &sii902x_bridge_funcs;
- sii902x->bridge.of_node = dev->of_node;
sii902x->bridge.timings = &default_sii902x_timings;
sii902x->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID;
if (sii902x->i2c->irq > 0)
sii902x->bridge.ops |= DRM_BRIDGE_OP_HPD;
+ drm_bridge_set_node(&sii902x->bridge, dev_fwnode(dev));
drm_bridge_add(&sii902x->bridge);
return 0;
@@ -1118,7 +1117,6 @@ static int sii902x_init(struct sii902x *sii902x)
static int sii902x_probe(struct i2c_client *client)
{
struct device *dev = &client->dev;
- struct device_node *endpoint;
struct sii902x *sii902x;
static const char * const supplies[] = {"iovcc", "cvcc12"};
int ret;
@@ -1147,27 +1145,14 @@ static int sii902x_probe(struct i2c_client *client)
return PTR_ERR(sii902x->reset_gpio);
}
- endpoint = of_graph_get_endpoint_by_regs(dev->of_node, 1, -1);
- if (endpoint) {
- struct device_node *remote = of_graph_get_remote_port_parent(endpoint);
-
- of_node_put(endpoint);
- if (!remote) {
- dev_err(dev, "Endpoint in port@1 unconnected\n");
- return -ENODEV;
- }
-
- if (!of_device_is_available(remote)) {
- dev_err(dev, "port@1 remote device is disabled\n");
- of_node_put(remote);
- return -ENODEV;
- }
-
- sii902x->next_bridge = of_drm_find_bridge(remote);
- of_node_put(remote);
- if (!sii902x->next_bridge)
- return dev_err_probe(dev, -EPROBE_DEFER,
- "Failed to find remote bridge\n");
+ sii902x->next_bridge = drm_bridge_find_next_bridge_by_fwnode(dev_fwnode(dev), 1);
+ if (!sii902x->next_bridge) {
+ return dev_err_probe(dev, -EPROBE_DEFER,
+ "Failed to find the next bridge\n");
+ } else if (IS_ERR(sii902x->next_bridge)) {
+ ret = PTR_ERR(sii902x->next_bridge);
+ dev_err(dev, "Error on find the next bridge: %d\n", ret);
+ return ret;
}
mutex_init(&sii902x->mutex);
--
2.34.1
next prev parent reply other threads:[~2024-04-22 19:19 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-22 19:18 [PATCH v4 0/9] drm/bridge: Allow using fwnode API to get the next bridge Sui Jingfeng
2024-04-22 19:18 ` [PATCH v4 1/9] " Sui Jingfeng
2024-04-22 19:51 ` Dmitry Baryshkov
2024-04-23 6:21 ` Sui Jingfeng
2024-04-22 19:18 ` [PATCH v4 2/9] drm/bridge: simple-bridge: Use fwnode API to acquire device properties Sui Jingfeng
2024-04-22 19:56 ` Dmitry Baryshkov
2024-04-22 19:18 ` [PATCH v4 3/9] drm/bridge: simple-bridge: Add platform module alias Sui Jingfeng
2024-04-22 19:58 ` Dmitry Baryshkov
2024-04-22 19:18 ` [PATCH v4 4/9] drm-bridge: display-connector: Use fwnode API to acquire device properties Sui Jingfeng
2024-04-22 20:00 ` Dmitry Baryshkov
2024-04-22 19:18 ` [PATCH v4 5/9] drm/bridge: display-connector: Add platform module alias Sui Jingfeng
2024-04-22 20:01 ` Dmitry Baryshkov
2024-04-22 19:19 ` Sui Jingfeng [this message]
2024-04-22 20:02 ` [PATCH v4 6/9] drm-bridge: sii902x: Use fwnode API to acquire device properties Dmitry Baryshkov
2024-04-22 19:19 ` [PATCH v4 7/9] drm-bridge: it66121: " Sui Jingfeng
2024-04-22 20:06 ` Dmitry Baryshkov
2024-04-27 13:11 ` Sui Jingfeng
2024-04-22 19:19 ` [PATCH v4 8/9] drm/bridge: tfp410: " Sui Jingfeng
2024-04-22 20:08 ` Dmitry Baryshkov
2024-04-27 18:43 ` Sui Jingfeng
2024-04-27 19:17 ` Dmitry Baryshkov
2024-04-27 20:10 ` Sui Jingfeng
2024-04-22 19:19 ` [PATCH v4 9/9] drm/bridge: tfp410: Add platform module alias Sui Jingfeng
2024-04-23 8:05 ` Krzysztof Kozlowski
2024-04-23 10:12 ` Sui Jingfeng
2024-04-23 10:20 ` Krzysztof Kozlowski
2024-04-23 10:44 ` Sui Jingfeng
2024-04-23 10:49 ` Krzysztof Kozlowski
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=20240422191903.255642-7-sui.jingfeng@linux.dev \
--to=sui.jingfeng@linux.dev \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=airlied@gmail.com \
--cc=andrzej.hajda@intel.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=jernej.skrabec@gmail.com \
--cc=jonas@kwiboo.se \
--cc=linux-kernel@vger.kernel.org \
--cc=mripard@kernel.org \
--cc=neil.armstrong@linaro.org \
--cc=ple@baylibre.com \
--cc=rfoss@kernel.org \
--cc=tzimmermann@suse.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 read-only IMAP folder(s) and NNTP newsgroup(s).