All of lore.kernel.org
 help / color / mirror / Atom feed
From: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
To: hjc-TNX95d0MmH7DzftRWevZcw@public.gmane.org,
	architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org,
	a.hajda-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org,
	kishon-l0cyMroinI0@public.gmane.org
Cc: robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
	mark.rutland-5wv7dgnIgG8@public.gmane.org,
	airlied-cv59FeDIM0c@public.gmane.org,
	Laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org,
	zhengyang-TNX95d0MmH7DzftRWevZcw@public.gmane.org,
	Jose.Abreu-HKixBCOQz3hWk0Htik3J/w@public.gmane.org,
	algea.cao-TNX95d0MmH7DzftRWevZcw@public.gmane.org,
	dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
Subject: [PATCH v2 6/8] drm/rockchip: dw_hdmi: allow including external phys
Date: Fri, 16 Feb 2018 21:41:56 +0100	[thread overview]
Message-ID: <20180216204158.29839-7-heiko@sntech.de> (raw)
In-Reply-To: <20180216204158.29839-1-heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>

Some variants of the dw-hdmi on Rockchip socs use a separate phy block
accessed via the generic phy framework, so allow them to be included
if such a phy reference is found.

Signed-off-by: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
---
 drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index 6dc03f1a5709..305b68d223d7 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -11,6 +11,7 @@
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/phy/phy.h>
 #include <linux/regmap.h>
 
 #include <drm/drm_of.h>
@@ -49,6 +50,7 @@ struct rockchip_hdmi {
 	struct clk *vpll_clk;
 	struct clk *grf_clk;
 	struct dw_hdmi *hdmi;
+	struct phy *phy;
 };
 
 #define to_rockchip_hdmi(x)	container_of(x, struct rockchip_hdmi, x)
@@ -377,6 +379,14 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
 		return ret;
 	}
 
+	hdmi->phy = devm_phy_optional_get(dev, "hdmi");
+	if (IS_ERR(hdmi->phy)) {
+		ret = PTR_ERR(hdmi->phy);
+		if (ret != -EPROBE_DEFER)
+			DRM_DEV_ERROR(hdmi->dev, "failed to get phy\n");
+		return ret;
+	}
+
 	drm_encoder_helper_add(encoder, &dw_hdmi_rockchip_encoder_helper_funcs);
 	drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs,
 			 DRM_MODE_ENCODER_TMDS, NULL);
-- 
2.15.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

WARNING: multiple messages have this Message-ID (diff)
From: heiko@sntech.de (Heiko Stuebner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 6/8] drm/rockchip: dw_hdmi: allow including external phys
Date: Fri, 16 Feb 2018 21:41:56 +0100	[thread overview]
Message-ID: <20180216204158.29839-7-heiko@sntech.de> (raw)
In-Reply-To: <20180216204158.29839-1-heiko@sntech.de>

Some variants of the dw-hdmi on Rockchip socs use a separate phy block
accessed via the generic phy framework, so allow them to be included
if such a phy reference is found.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
index 6dc03f1a5709..305b68d223d7 100644
--- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
+++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
@@ -11,6 +11,7 @@
 #include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/phy/phy.h>
 #include <linux/regmap.h>
 
 #include <drm/drm_of.h>
@@ -49,6 +50,7 @@ struct rockchip_hdmi {
 	struct clk *vpll_clk;
 	struct clk *grf_clk;
 	struct dw_hdmi *hdmi;
+	struct phy *phy;
 };
 
 #define to_rockchip_hdmi(x)	container_of(x, struct rockchip_hdmi, x)
@@ -377,6 +379,14 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,
 		return ret;
 	}
 
+	hdmi->phy = devm_phy_optional_get(dev, "hdmi");
+	if (IS_ERR(hdmi->phy)) {
+		ret = PTR_ERR(hdmi->phy);
+		if (ret != -EPROBE_DEFER)
+			DRM_DEV_ERROR(hdmi->dev, "failed to get phy\n");
+		return ret;
+	}
+
 	drm_encoder_helper_add(encoder, &dw_hdmi_rockchip_encoder_helper_funcs);
 	drm_encoder_init(drm, encoder, &dw_hdmi_rockchip_encoder_funcs,
 			 DRM_MODE_ENCODER_TMDS, NULL);
-- 
2.15.1

  parent reply	other threads:[~2018-02-16 20:41 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-16 20:41 [PATCH v2 0/8] drm/rockchip: hdmi support for rk3328 Heiko Stuebner
2018-02-16 20:41 ` Heiko Stuebner
2018-02-16 20:41 ` [PATCH v2 1/8] dt-bindings: add binding for Rockchip hdmi phy using an Innosilicon IP Heiko Stuebner
2018-02-16 20:41   ` Heiko Stuebner
2018-02-16 20:43   ` Heiko Stuebner
2018-02-16 20:43     ` Heiko Stuebner
     [not found] ` <20180216204158.29839-1-heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
2018-02-16 20:41   ` [PATCH v2 2/8] phy: add Rockchip Innosilicon hdmi phy Heiko Stuebner
2018-02-16 20:41     ` Heiko Stuebner
2018-02-16 20:41   ` [PATCH v2 3/8] drm/bridge: dw-hdmi: allow overriding of phy-type reading Heiko Stuebner
2018-02-16 20:41     ` Heiko Stuebner
2018-02-19 16:59     ` Laurent Pinchart
2018-02-19 16:59       ` Laurent Pinchart
2018-02-19 18:46       ` Heiko Stuebner
2018-02-19 18:46         ` Heiko Stuebner
2018-02-19 19:06         ` Laurent Pinchart
2018-02-19 19:06           ` Laurent Pinchart
2018-02-21 18:55           ` Heiko Stuebner
2018-02-21 18:55             ` Heiko Stuebner
2018-02-21 19:15             ` Laurent Pinchart
2018-02-21 19:15               ` Laurent Pinchart
2018-02-16 20:41   ` [PATCH v2 4/8] drm/rockchip: dw_hdmi: Allow outputs that don't need output switching Heiko Stuebner
2018-02-16 20:41     ` Heiko Stuebner
2018-02-19 11:43     ` Robin Murphy
2018-02-19 11:43       ` Robin Murphy
2018-02-19 11:49       ` Heiko Stuebner
2018-02-19 11:49         ` Heiko Stuebner
2018-02-16 20:41   ` [PATCH v2 5/8] dt-bindings: allow optional phys in Rockchip dw_hdmi binding Heiko Stuebner
2018-02-16 20:41     ` Heiko Stuebner
2018-02-19 20:26     ` Rob Herring
2018-02-19 20:26       ` Rob Herring
2018-02-16 20:41   ` Heiko Stuebner [this message]
2018-02-16 20:41     ` [PATCH v2 6/8] drm/rockchip: dw_hdmi: allow including external phys Heiko Stuebner
2018-02-16 20:41   ` [PATCH v2 7/8] drm/rockchip: dw_hdmi: store rockchip_hdmi reference in phy_data object Heiko Stuebner
2018-02-16 20:41     ` Heiko Stuebner
2018-02-19 11:46     ` Robin Murphy
2018-02-19 11:46       ` Robin Murphy
2018-02-16 20:41   ` [PATCH v2 8/8] drm/rockchip: dw_hdmi: add dw-hdmi support for the rk3328 Heiko Stuebner
2018-02-16 20:41     ` Heiko Stuebner
2018-02-19 20:28     ` Rob Herring
2018-02-19 20:28       ` Rob Herring
2018-02-19 20:46       ` Heiko Stuebner
2018-02-19 20:46         ` Heiko Stuebner
2018-02-20 14:32         ` Rob Herring
2018-02-20 14:32           ` Rob Herring
2018-02-21 12:07 ` [PATCH v2 0/8] drm/rockchip: hdmi support for rk3328 Robin Murphy
2018-02-21 12:07   ` Robin Murphy

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=20180216204158.29839-7-heiko@sntech.de \
    --to=heiko-4mtyjxux2i+zqb+pc5nmwq@public.gmane.org \
    --cc=Jose.Abreu-HKixBCOQz3hWk0Htik3J/w@public.gmane.org \
    --cc=Laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org \
    --cc=a.hajda-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org \
    --cc=airlied-cv59FeDIM0c@public.gmane.org \
    --cc=algea.cao-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
    --cc=architt-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
    --cc=hjc-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
    --cc=kishon-l0cyMroinI0@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
    --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=zhengyang-TNX95d0MmH7DzftRWevZcw@public.gmane.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.