All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jernej Skrabec <jernej.skrabec@siol.net>
To: maxime.ripard@bootlin.com, wens@csie.org, robh+dt@kernel.org
Cc: airlied@linux.ie, mark.rutland@arm.com,
	dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com
Subject: [PATCH 09/17] drm/sun4i: mixer: Read id from DT
Date: Fri,  6 Jul 2018 19:51:05 +0200	[thread overview]
Message-ID: <20180706175113.26698-10-jernej.skrabec@siol.net> (raw)
In-Reply-To: <20180706175113.26698-1-jernej.skrabec@siol.net>

Currently, TCON supports 2 ways to match TCON with engine (mixer in this
case). Old way is to just traverse of graph backwards and compare node
pointer. New way is to match TCON and engine by their respective ids.
All SoCs with DE2 enabled till now used the old way, which means mixer
id was never used and thus never implemented.

However, for R40, only the new way will be used. To prepare for that,
implemend fetching mixer id from DT.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
 drivers/gpu/drm/sun4i/sun8i_mixer.c | 35 +++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index ee8febb25903..11221f96746d 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -23,6 +23,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/reset.h>
 #include <linux/of_device.h>
+#include <linux/of_graph.h>
 
 #include "sun4i_drv.h"
 #include "sun8i_mixer.h"
@@ -322,6 +323,37 @@ static struct regmap_config sun8i_mixer_regmap_config = {
 	.max_register	= 0xbfffc, /* guessed */
 };
 
+static int sun8i_mixer_of_get_id(struct device_node *node)
+{
+	struct device_node *port, *ep;
+	int ret = -EINVAL;
+
+	/* output is port 1 */
+	port = of_graph_get_port_by_id(node, 1);
+	if (!port)
+		return -EINVAL;
+
+	/* try finding an upstream endpoint */
+	for_each_available_child_of_node(port, ep) {
+		struct device_node *remote;
+		u32 reg;
+
+		remote = of_graph_get_remote_endpoint(ep);
+		if (!remote)
+			continue;
+
+		ret = of_property_read_u32(remote, "reg", &reg);
+		if (ret)
+			continue;
+
+		ret = reg;
+	}
+
+	of_node_put(port);
+
+	return ret;
+}
+
 static int sun8i_mixer_bind(struct device *dev, struct device *master,
 			      void *data)
 {
@@ -353,8 +385,7 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
 	dev_set_drvdata(dev, mixer);
 	mixer->engine.ops = &sun8i_engine_ops;
 	mixer->engine.node = dev->of_node;
-	/* The ID of the mixer currently doesn't matter */
-	mixer->engine.id = -1;
+	mixer->engine.id = sun8i_mixer_of_get_id(dev->of_node);
 
 	mixer->cfg = of_device_get_match_data(dev);
 	if (!mixer->cfg)
-- 
2.18.0


WARNING: multiple messages have this Message-ID (diff)
From: Jernej Skrabec <jernej.skrabec-gGgVlfcn5nU@public.gmane.org>
To: maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org,
	wens-jdAy2FN1RRM@public.gmane.org,
	robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Cc: airlied-cv59FeDIM0c@public.gmane.org,
	mark.rutland-5wv7dgnIgG8@public.gmane.org,
	dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
Subject: [PATCH 09/17] drm/sun4i: mixer: Read id from DT
Date: Fri,  6 Jul 2018 19:51:05 +0200	[thread overview]
Message-ID: <20180706175113.26698-10-jernej.skrabec@siol.net> (raw)
In-Reply-To: <20180706175113.26698-1-jernej.skrabec-gGgVlfcn5nU@public.gmane.org>

Currently, TCON supports 2 ways to match TCON with engine (mixer in this
case). Old way is to just traverse of graph backwards and compare node
pointer. New way is to match TCON and engine by their respective ids.
All SoCs with DE2 enabled till now used the old way, which means mixer
id was never used and thus never implemented.

However, for R40, only the new way will be used. To prepare for that,
implemend fetching mixer id from DT.

Signed-off-by: Jernej Skrabec <jernej.skrabec-gGgVlfcn5nU@public.gmane.org>
---
 drivers/gpu/drm/sun4i/sun8i_mixer.c | 35 +++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index ee8febb25903..11221f96746d 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -23,6 +23,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/reset.h>
 #include <linux/of_device.h>
+#include <linux/of_graph.h>
 
 #include "sun4i_drv.h"
 #include "sun8i_mixer.h"
@@ -322,6 +323,37 @@ static struct regmap_config sun8i_mixer_regmap_config = {
 	.max_register	= 0xbfffc, /* guessed */
 };
 
+static int sun8i_mixer_of_get_id(struct device_node *node)
+{
+	struct device_node *port, *ep;
+	int ret = -EINVAL;
+
+	/* output is port 1 */
+	port = of_graph_get_port_by_id(node, 1);
+	if (!port)
+		return -EINVAL;
+
+	/* try finding an upstream endpoint */
+	for_each_available_child_of_node(port, ep) {
+		struct device_node *remote;
+		u32 reg;
+
+		remote = of_graph_get_remote_endpoint(ep);
+		if (!remote)
+			continue;
+
+		ret = of_property_read_u32(remote, "reg", &reg);
+		if (ret)
+			continue;
+
+		ret = reg;
+	}
+
+	of_node_put(port);
+
+	return ret;
+}
+
 static int sun8i_mixer_bind(struct device *dev, struct device *master,
 			      void *data)
 {
@@ -353,8 +385,7 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
 	dev_set_drvdata(dev, mixer);
 	mixer->engine.ops = &sun8i_engine_ops;
 	mixer->engine.node = dev->of_node;
-	/* The ID of the mixer currently doesn't matter */
-	mixer->engine.id = -1;
+	mixer->engine.id = sun8i_mixer_of_get_id(dev->of_node);
 
 	mixer->cfg = of_device_get_match_data(dev);
 	if (!mixer->cfg)
-- 
2.18.0

WARNING: multiple messages have this Message-ID (diff)
From: jernej.skrabec@siol.net (Jernej Skrabec)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 09/17] drm/sun4i: mixer: Read id from DT
Date: Fri,  6 Jul 2018 19:51:05 +0200	[thread overview]
Message-ID: <20180706175113.26698-10-jernej.skrabec@siol.net> (raw)
In-Reply-To: <20180706175113.26698-1-jernej.skrabec@siol.net>

Currently, TCON supports 2 ways to match TCON with engine (mixer in this
case). Old way is to just traverse of graph backwards and compare node
pointer. New way is to match TCON and engine by their respective ids.
All SoCs with DE2 enabled till now used the old way, which means mixer
id was never used and thus never implemented.

However, for R40, only the new way will be used. To prepare for that,
implemend fetching mixer id from DT.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
 drivers/gpu/drm/sun4i/sun8i_mixer.c | 35 +++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c
index ee8febb25903..11221f96746d 100644
--- a/drivers/gpu/drm/sun4i/sun8i_mixer.c
+++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c
@@ -23,6 +23,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/reset.h>
 #include <linux/of_device.h>
+#include <linux/of_graph.h>
 
 #include "sun4i_drv.h"
 #include "sun8i_mixer.h"
@@ -322,6 +323,37 @@ static struct regmap_config sun8i_mixer_regmap_config = {
 	.max_register	= 0xbfffc, /* guessed */
 };
 
+static int sun8i_mixer_of_get_id(struct device_node *node)
+{
+	struct device_node *port, *ep;
+	int ret = -EINVAL;
+
+	/* output is port 1 */
+	port = of_graph_get_port_by_id(node, 1);
+	if (!port)
+		return -EINVAL;
+
+	/* try finding an upstream endpoint */
+	for_each_available_child_of_node(port, ep) {
+		struct device_node *remote;
+		u32 reg;
+
+		remote = of_graph_get_remote_endpoint(ep);
+		if (!remote)
+			continue;
+
+		ret = of_property_read_u32(remote, "reg", &reg);
+		if (ret)
+			continue;
+
+		ret = reg;
+	}
+
+	of_node_put(port);
+
+	return ret;
+}
+
 static int sun8i_mixer_bind(struct device *dev, struct device *master,
 			      void *data)
 {
@@ -353,8 +385,7 @@ static int sun8i_mixer_bind(struct device *dev, struct device *master,
 	dev_set_drvdata(dev, mixer);
 	mixer->engine.ops = &sun8i_engine_ops;
 	mixer->engine.node = dev->of_node;
-	/* The ID of the mixer currently doesn't matter */
-	mixer->engine.id = -1;
+	mixer->engine.id = sun8i_mixer_of_get_id(dev->of_node);
 
 	mixer->cfg = of_device_get_match_data(dev);
 	if (!mixer->cfg)
-- 
2.18.0

  parent reply	other threads:[~2018-07-06 17:53 UTC|newest]

Thread overview: 119+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-06 17:50 [PATCH 00/17] Allwinner R40 HDMI refactoring Jernej Skrabec
2018-07-06 17:50 ` Jernej Skrabec
2018-07-06 17:50 ` Jernej Skrabec
2018-07-06 17:50 ` [PATCH 01/17] dt-bindings: display: sun4i-drm: Add R40 display engine compatible Jernej Skrabec
2018-07-06 17:50   ` Jernej Skrabec
2018-07-06 17:50   ` Jernej Skrabec
2018-07-10 15:20   ` Chen-Yu Tsai
2018-07-10 15:20     ` Chen-Yu Tsai
2018-07-10 15:20     ` Chen-Yu Tsai
2018-07-06 17:50 ` [PATCH 02/17] drm/sun4i: " Jernej Skrabec
2018-07-06 17:50   ` Jernej Skrabec
2018-07-06 17:50   ` Jernej Skrabec
2018-07-10 15:20   ` Chen-Yu Tsai
2018-07-10 15:20     ` Chen-Yu Tsai
2018-07-10 15:20     ` Chen-Yu Tsai
2018-07-06 17:50 ` [PATCH 03/17] ARM: dts: sun8i: r40: Remove fallback " Jernej Skrabec
2018-07-06 17:50   ` Jernej Skrabec
2018-07-06 17:50   ` Jernej Skrabec
2018-07-10 15:21   ` Chen-Yu Tsai
2018-07-10 15:21     ` Chen-Yu Tsai
2018-07-10 15:21     ` Chen-Yu Tsai
2018-07-06 17:51 ` [PATCH 04/17] drm/sun4i: tcon-top: Cleanup clock handling Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 15:23   ` Chen-Yu Tsai
2018-07-10 15:23     ` Chen-Yu Tsai
2018-07-10 15:23     ` Chen-Yu Tsai
2018-07-06 17:51 ` [PATCH 05/17] drm/sun4i: tcon: Release node when traversing of graph Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 15:23   ` Chen-Yu Tsai
2018-07-10 15:23     ` Chen-Yu Tsai
2018-07-10 15:23     ` Chen-Yu Tsai
2018-07-06 17:51 ` [PATCH 06/17] dt-bindings: display: sun4i-drm: Add R40 TV TCON description Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 20:40   ` Rob Herring
2018-07-06 20:40     ` Rob Herring
2018-07-06 20:40     ` Rob Herring
2018-07-06 20:44     ` Jernej Škrabec
2018-07-06 20:44       ` Jernej Škrabec
2018-07-06 20:44       ` Jernej Škrabec
2018-07-09 14:16       ` Rob Herring
2018-07-09 14:16         ` Rob Herring
2018-07-09 14:16         ` Rob Herring
2018-07-10 15:26   ` Chen-Yu Tsai
2018-07-10 15:26     ` Chen-Yu Tsai
2018-07-10 15:26     ` Chen-Yu Tsai
2018-07-06 17:51 ` [PATCH 07/17] drm/sun4i: DW HDMI: Release nodes if error happens during CRTC search Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 15:31   ` Chen-Yu Tsai
2018-07-10 15:31     ` Chen-Yu Tsai
2018-07-10 15:31     ` Chen-Yu Tsai
2018-07-06 17:51 ` [PATCH 08/17] ARM: dts: sun8i: r40: Add mixer ids to TCON TOP Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 15:35   ` Chen-Yu Tsai
2018-07-10 15:35     ` Chen-Yu Tsai
2018-07-10 15:35     ` Chen-Yu Tsai
2018-07-06 17:51 ` Jernej Skrabec [this message]
2018-07-06 17:51   ` [PATCH 09/17] drm/sun4i: mixer: Read id from DT Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 15:40   ` Chen-Yu Tsai
2018-07-10 15:40     ` Chen-Yu Tsai
2018-07-06 17:51 ` [PATCH 10/17] drm/sun4i: tcon-top: Add helpers for switching mux Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 15:56   ` Chen-Yu Tsai
2018-07-10 15:56     ` Chen-Yu Tsai
2018-07-10 15:56     ` Chen-Yu Tsai
2018-07-06 17:51 ` [PATCH 11/17] drm/sun4i: tcon: Add another way for matching mixers with tcon Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 16:12   ` Chen-Yu Tsai
2018-07-10 16:12     ` Chen-Yu Tsai
2018-07-10 16:12     ` Chen-Yu Tsai
2018-07-06 17:51 ` [PATCH 12/17] drm/sun4i: tcon: Add support for R40 TCON Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 16:14   ` Chen-Yu Tsai
2018-07-10 16:14     ` Chen-Yu Tsai
2018-07-10 16:14     ` Chen-Yu Tsai
2018-07-06 17:51 ` [PATCH 13/17] ARM: dts: sun8i: r40: Remove fallback compatible for TCON TV Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 15:49   ` Chen-Yu Tsai
2018-07-10 15:49     ` Chen-Yu Tsai
2018-07-10 15:49     ` Chen-Yu Tsai
2018-07-06 17:51 ` [PATCH 14/17] ARM: dts: sun8i: r40: Add missing TCON-TOP - TCON connections Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 15:53   ` Chen-Yu Tsai
2018-07-10 15:53     ` Chen-Yu Tsai
2018-07-10 15:53     ` Chen-Yu Tsai
2018-07-06 17:51 ` [PATCH 15/17] ARM: dts: sun8i: r40: Disable TCONs by default Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 16:16   ` Chen-Yu Tsai
2018-07-10 16:16     ` Chen-Yu Tsai
2018-07-10 16:16     ` Chen-Yu Tsai
2018-07-06 17:51 ` [PATCH 16/17] drm/sun4i: tcon-top: Remove mux configuration at probe time Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 16:09   ` Chen-Yu Tsai
2018-07-10 16:09     ` Chen-Yu Tsai
2018-07-10 16:09     ` Chen-Yu Tsai
2018-07-10 16:18     ` Jernej Škrabec
2018-07-10 16:18       ` Jernej Škrabec
2018-07-10 16:18       ` Jernej Škrabec
2018-07-10 19:41       ` [linux-sunxi] " Jernej Škrabec
2018-07-10 19:41         ` Jernej Škrabec
2018-07-10 19:41         ` Jernej Škrabec
2018-07-06 17:51 ` [PATCH 17/17] dt-bindings: display: sun4i-drm: Fix order of DW HDMI PHY compatibles Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-06 17:51   ` Jernej Skrabec
2018-07-10 16:09   ` Chen-Yu Tsai
2018-07-10 16:09     ` Chen-Yu Tsai
2018-07-10 16:09     ` Chen-Yu Tsai

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=20180706175113.26698-10-jernej.skrabec@siol.net \
    --to=jernej.skrabec@siol.net \
    --cc=airlied@linux.ie \
    --cc=devicetree@vger.kernel.org \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=mark.rutland@arm.com \
    --cc=maxime.ripard@bootlin.com \
    --cc=robh+dt@kernel.org \
    --cc=wens@csie.org \
    /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 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.